diff --git a/src/EvoSC/InternalModules.cs b/src/EvoSC/InternalModules.cs
index ace73bb6b..94a92fd39 100644
--- a/src/EvoSC/InternalModules.cs
+++ b/src/EvoSC/InternalModules.cs
@@ -67,7 +67,7 @@ public static class InternalModules
         typeof(ServerManagementModule),
         typeof(TeamInfoModule),
         typeof(TeamChatModule),
-        typeof(RoundRankingModule)
+        // typeof(RoundRankingModule)
     ];
 
     /// <summary>
diff --git a/src/Modules/ScoreboardModule/Templates/Components/Header/HeaderContent.mt b/src/Modules/ScoreboardModule/Templates/Components/Header/HeaderContent.mt
index 9c8b76f11..b4fbf8827 100644
--- a/src/Modules/ScoreboardModule/Templates/Components/Header/HeaderContent.mt
+++ b/src/Modules/ScoreboardModule/Templates/Components/Header/HeaderContent.mt
@@ -52,68 +52,5 @@
         </frame>
     </template>
 
-    <script once="true"><!--
-    declare Integer HeaderContentFrameLastUpdate;
-    declare CMlFrame HeaderContentFrame;
-    declare CMlLabel HeaderContentFrame_TextLeft;
-    declare CMlLabel HeaderContentFrame_TextLeftSmall;
-    declare CMlLabel HeaderContentFrame_TextRight;
-    declare CMlLabel HeaderContentFrame_TextRightSmall;
-    
-    Text GetRoundsLabelText() {
-        declare Integer EvoSC_RoundNumber for UI = -1;
-        declare Integer EvoSC_RoundsPerMap for UI = -1;
-        return TL::ToUpperCase("Round " ^ EvoSC_RoundNumber ^ " of " ^ EvoSC_RoundsPerMap);
-    }
-    
-    Text GetRoundsLabelWarmUpText() {
-        declare Integer EvoSC_RoundNumber for UI = -1;
-        declare Integer EvoSC_WarmUpCount for UI = -1;
-        return "$f90" ^ TL::ToUpperCase("Round " ^ EvoSC_RoundNumber ^ " of " ^ EvoSC_WarmUpCount);
-    }
-    
-    Text GetPointsLimitText() {
-        declare Integer EvoSC_PointsLimit for UI = -1;
-        return TL::ToUpperCase("Points Limit " ^ EvoSC_PointsLimit);
-    }
-    
-    Text GetPointsLimitWarmUpText() {
-        return "$f90WARM UP";
-    }
-    
-    Void UpdateHeader() {
-        declare Boolean EvoSC_WarmUpActive for UI = False;
-        
-        HeaderContentFrame_TextLeft.Value = TL::StripFormatting(CurrentServerName);
-        HeaderContentFrame_TextRight.Value = TL::StripFormatting(TL::Trim(Map.MapName ^ " by " ^ Map.AuthorNickName));
-        
-        if(EvoSC_WarmUpActive){
-            HeaderContentFrame_TextLeftSmall.Value = GetPointsLimitWarmUpText();
-            HeaderContentFrame_TextRightSmall.Value = GetRoundsLabelWarmUpText();
-        }else{
-            HeaderContentFrame_TextLeftSmall.Value = GetPointsLimitText();
-            HeaderContentFrame_TextRightSmall.Value = GetRoundsLabelText();
-        }
-    }
-    --></script>
-
-    <script><!--
-        *** OnInitialization ***
-        ***
-            HeaderContentFrameLastUpdate = 0;
-            HeaderContentFrame <=> (Page.MainFrame.GetFirstChild("header_content") as CMlFrame);
-            HeaderContentFrame_TextLeft <=> (HeaderContentFrame.GetFirstChild("header_text_left") as CMlLabel);
-            HeaderContentFrame_TextLeftSmall <=> (HeaderContentFrame.GetFirstChild("header_text_left_small") as CMlLabel);
-            HeaderContentFrame_TextRight <=> (HeaderContentFrame.GetFirstChild("header_text_right") as CMlLabel);
-            HeaderContentFrame_TextRightSmall <=> (HeaderContentFrame.GetFirstChild("header_text_right_small") as CMlLabel);
-        ***
-        
-        *** OnLoop *** 
-        ***
-            if(Now > HeaderContentFrameLastUpdate + 1000){
-                HeaderContentFrameLastUpdate = Now;
-                UpdateHeader();
-            }
-        ***
-    --></script>
+    <script resource="ScoreboardModule.Scripts.Header" />
 </component>
diff --git a/src/Modules/ScoreboardModule/Templates/Components/Row/Framemodel.mt b/src/Modules/ScoreboardModule/Templates/Components/Row/Framemodel.mt
index e38ae2fbe..61b87b4df 100644
--- a/src/Modules/ScoreboardModule/Templates/Components/Row/Framemodel.mt
+++ b/src/Modules/ScoreboardModule/Templates/Components/Row/Framemodel.mt
@@ -142,103 +142,5 @@
         </framemodel>
     </template>
 
-    <script once="true">
-        <!--
-        Void ShowPlayerActions(CMlFrame playerRow) {
-            declare playerActions = (playerRow.GetFirstChild("player_actions") as CMlFrame);
-            declare detailsWrapper = (playerRow.GetFirstChild("details_wrapper") as CMlFrame);
-            declare backgroundWrapper = (playerRow.GetFirstChild("player_row_bg") as CMlFrame);
-            playerActions.Show();
-            detailsWrapper.Hide();
-            backgroundWrapper.Size.X = ({{ (w - positionBoxWidth) - actionButtonCount*(rowHeight*1.2) - actionButtonCount*rowSpacing - 0.1 }}) * 1.0;
-        }
-        
-        Void HidePlayerActions(CMlFrame playerRow) {
-            declare playerActions = (playerRow.GetFirstChild("player_actions") as CMlFrame);
-            declare detailsWrapper = (playerRow.GetFirstChild("details_wrapper") as CMlFrame);
-            declare backgroundWrapper = (playerRow.GetFirstChild("player_row_bg") as CMlFrame);
-            playerActions.Hide();
-            detailsWrapper.Show();
-            backgroundWrapper.Size.X = {{ (w - positionBoxWidth) }} * 1.0;
-        }
-        
-        Void ResetPlayerActions() {
-            declare playerRows <=> (Page.MainFrame.GetFirstChild("frame_scroll") as CMlFrame);
-            foreach(playerRowControl in playerRows.Controls){
-                declare playerRow = (playerRowControl as CMlFrame);
-                HidePlayerActions(playerRow);
-                declare Boolean RowIsLocked for playerRow = False;
-                RowIsLocked = False;
-            }
-        }
-        
-        Void TogglePlayerActions(CMlFrame playerRow) {
-            declare Boolean RowIsLocked for playerRow = False;
-            
-            if(RowIsLocked){
-                RowIsLocked = False;
-                HidePlayerActions(playerRow);
-            }else{
-                ResetPlayerActions();
-                RowIsLocked = True;
-                ShowPlayerActions(playerRow);
-            }
-        }
-        
-        Vec3 GetCustomLabelColor(Text value, Text defaultColorHex){
-            declare customLabelColorHex = "";
-            switch(value){
-                case _("|Status|Winner"): customLabelColorHex = "{{ Theme.ScoreboardModule_WinnerColor }}";
-                case _("|Status|Finalist"): customLabelColorHex = "{{ Theme.ScoreboardModule_FinalistColor }}";
-            }
-            
-            if(customLabelColorHex == ""){
-                customLabelColorHex = defaultColorHex;
-            }
-            
-            return CL::HexToRgb(customLabelColorHex);
-        }
-        
-        Void SetCustomLabel(CMlFrame playerRow, Text value, Text hexColor){
-            declare customLabel = (playerRow.GetFirstChild("custom_label") as CMlLabel);
-            customLabel.Value = value;
-            customLabel.TextColor = GetCustomLabelColor(value, hexColor);
-            SetPlayerHighlightColor(playerRow, customLabel.TextColor);
-        }
-        
-        Void HideCustomLabel(CMlFrame playerRow){
-            declare customLabel = (playerRow.GetFirstChild("custom_label") as CMlLabel);
-            customLabel.Value = "";
-            ResetPlayerHighlightColor(playerRow);
-        }
-        
-        *** OnMouseClick ***
-        ***
-            if(Event.Control.ControlId == "player_row_trigger"){
-                TogglePlayerActions(Event.Control.Parent as CMlFrame);
-                continue;
-            }
-        ***
-        
-        *** OnMouseOver ***
-        ***
-            if(Event.Control.ControlId == "player_row_trigger"){
-                declare parentFrame = (Event.Control.Parent as CMlFrame);
-                declare backgroundFrame <=> (parentFrame.GetFirstChild("player_row_bg") as CMlFrame);
-                RowMouseOver(backgroundFrame);
-                continue;
-            }
-        ***
-        
-        *** OnMouseOut ***
-        ***
-            if(Event.Control.ControlId == "player_row_trigger"){
-                declare parentFrame = (Event.Control.Parent as CMlFrame);
-                declare backgroundFrame <=> (parentFrame.GetFirstChild("player_row_bg") as CMlFrame);
-                RowMouseOut(backgroundFrame);
-                continue;
-            }
-        ***
-        -->
-    </script>
+    <script resource="ScoreboardModule.Scripts.Framemodel" once="true" />
 </component>
diff --git a/src/Modules/ScoreboardModule/Templates/Components/Row/PlayerRowBackground.mt b/src/Modules/ScoreboardModule/Templates/Components/Row/PlayerRowBackground.mt
index 8499ed831..830638aca 100644
--- a/src/Modules/ScoreboardModule/Templates/Components/Row/PlayerRowBackground.mt
+++ b/src/Modules/ScoreboardModule/Templates/Components/Row/PlayerRowBackground.mt
@@ -28,30 +28,5 @@
         </frame>
     </template>
 
-    <script once="true">
-        <!--
-        Void RowMouseOver(CMlFrame backgroundFrame) {
-            declare backgroundQuad = (backgroundFrame.Controls[0] as CMlQuad);
-            backgroundQuad.BgColor = {! Color.ToMlColor(Theme.ScoreboardModule_Background_Hover_Color) !};
-            backgroundQuad.Opacity = {{ Theme.ScoreboardModule_Background_Hover_Opacity }};
-        }
-        
-        Void RowMouseOut(CMlFrame backgroundFrame) {
-            declare backgroundQuad = (backgroundFrame.Controls[0] as CMlQuad);
-            backgroundQuad.BgColor = {! Color.ToMlColor(Theme.ScoreboardModule_Background_Row_Color) !};
-            backgroundQuad.Opacity = {{ Theme.ScoreboardModule_Background_Row_Opacity }};
-        }
-        
-        Void SetPlayerHighlightColor(CMlFrame playerRow, Vec3 color) {
-            declare customGradient = (playerRow.GetFirstChild("custom_gradient") as CMlQuad);
-            customGradient.ModulateColor = color;
-            customGradient.Show();
-        }
-        
-        Void ResetPlayerHighlightColor(CMlFrame playerRow) {
-            declare customGradient = (playerRow.GetFirstChild("custom_gradient") as CMlQuad);
-            customGradient.Hide();
-        }
-        -->
-    </script>
+    <script resource="ScoreboardModule.Scripts.PlayerRowBg" once="true" />
 </component>
\ No newline at end of file
diff --git a/src/Modules/ScoreboardModule/Templates/Components/ScoreboardHeader.mt b/src/Modules/ScoreboardModule/Templates/Components/ScoreboardHeader.mt
index fabf87301..94afd30df 100644
--- a/src/Modules/ScoreboardModule/Templates/Components/ScoreboardHeader.mt
+++ b/src/Modules/ScoreboardModule/Templates/Components/ScoreboardHeader.mt
@@ -1,6 +1,6 @@
 <component>
-    <import component="ScoreboardModule.Components.Header.HeaderBackground" as="Background"/>
-    <import component="ScoreboardModule.Components.Header.HeaderContent" as="Content"/>
+    <import component="ScoreboardModule.Components.Header.HeaderBackground" as="HeaderBackground"/>
+    <import component="ScoreboardModule.Components.Header.HeaderContent" as="HeaderContent"/>
 
     <property type="int" name="maxPlayers" default="0"/>
     <property type="int" name="pointsLimit" default="0"/>
@@ -9,9 +9,12 @@
     <property type="double" name="height"/>
 
     <template>
-        <Background width="{{ width }}" height="{{ height }}"/>
-        <Content 
-                width="{{ width }}" 
+        <HeaderBackground
+                width="{{ width }}"
+                height="{{ height }}"
+        />
+        <HeaderContent
+                width="{{ width }}"
                 height="{{ height }}"
         />
     </template>
diff --git a/src/Modules/ScoreboardModule/Templates/Components/Settings/Form.mt b/src/Modules/ScoreboardModule/Templates/Components/Settings/Form.mt
deleted file mode 100644
index c112b4beb..000000000
--- a/src/Modules/ScoreboardModule/Templates/Components/Settings/Form.mt
+++ /dev/null
@@ -1,62 +0,0 @@
-<component>
-    <import component="EvoSC.Controls.Checkbox" as="Checkbox" />
-    <import component="EvoSC.Style.UIStyle" as="UIStyle" />
-    
-    <property type="double" name="w" default="140"/>
-    <property type="double" name="h" default="80"/>
-
-    <template>
-        <UIStyle />
-      
-        <label text="SCOREBOARD SETTINGS"
-               textsize="5"
-               textfont="{{ Font.ExtraBold }}" 
-               textcolor="{{ Theme.ScoreboardModule_Settings_Text }}"/>
-        <frame pos="0 -8">
-            <label text="Player Settings"
-                   textsize="2"
-                   textfont="{{ Font.Regular }}"
-                   textcolor="{{ Theme.ScoreboardModule_Settings_Text }}"/>
-            <Checkbox id="show_flags" y="-6" text="Show country flags" isChecked="{{ true }}" />
-            <Checkbox id="show_club_tags" y="-11" text="Show club tags" isChecked="{{ true }}" />
-            <Checkbox id="show_spectators" y="-16" text="Show spectators" isChecked="{{ true }}" />
-            <Checkbox id="show_disconnected" y="-21" text="Show disconnected" isChecked="{{ true }}" />
-        </frame>
-    </template>
-    
-    <script>
-        <!--
-        *** OnCheckboxToggle ***
-        ***
-            if(ControlId == "show_flags"){
-                declare persistent Boolean SB_Setting_ShowFlags for LocalUser = True;
-                SB_Setting_ShowFlags = IsChecked;
-                UpdateScoreboardLayout();
-            }else if(ControlId == "show_club_tags"){
-                declare persistent Boolean SB_Setting_ShowClubTags for LocalUser = True;
-                SB_Setting_ShowClubTags = IsChecked;
-                UpdateScoreboardLayout();
-            }else if(ControlId == "show_spectators"){
-                declare persistent Boolean SB_Setting_ShowSpectators for LocalUser = True;
-                SB_Setting_ShowSpectators = IsChecked;
-            }else if(ControlId == "show_disconnected"){
-                declare persistent Boolean SB_Setting_ShowDisconnected for LocalUser = True;
-                SB_Setting_ShowDisconnected = IsChecked;
-            }
-        ***
-        
-        *** OnInitialization ***
-        ***
-            declare persistent Boolean SB_Setting_ShowFlags for LocalUser = True;
-            declare persistent Boolean SB_Setting_ShowClubTags for LocalUser = True;
-            declare persistent Boolean SB_Setting_ShowSpectators for LocalUser = True;
-            declare persistent Boolean SB_Setting_ShowDisconnected for LocalUser = True;
-            
-            SetCheckboxState("show_flags", SB_Setting_ShowFlags);
-            SetCheckboxState("show_club_tags", SB_Setting_ShowClubTags);
-            SetCheckboxState("show_spectators", SB_Setting_ShowSpectators);
-            SetCheckboxState("show_disconnected", SB_Setting_ShowDisconnected);
-        ***
-        -->
-    </script>
-</component>
\ No newline at end of file
diff --git a/src/Modules/ScoreboardModule/Templates/Components/Settings/Wrapper.mt b/src/Modules/ScoreboardModule/Templates/Components/Settings/Wrapper.mt
deleted file mode 100644
index 7d196ac87..000000000
--- a/src/Modules/ScoreboardModule/Templates/Components/Settings/Wrapper.mt
+++ /dev/null
@@ -1,12 +0,0 @@
-<component>
-    <property type="double" name="h" />
-    <property type="double" name="padding" />
-    
-    <template>
-        <frame pos="{{ padding }} {{ h + padding }}">
-            <frame pos="{{ padding }} {{ -padding }}">
-                <slot />
-            </frame>
-        </frame>
-    </template>
-</component>
\ No newline at end of file
diff --git a/src/Modules/ScoreboardModule/Templates/Scoreboard.mt b/src/Modules/ScoreboardModule/Templates/Scoreboard.mt
index 5a21a0915..54a0b60d1 100644
--- a/src/Modules/ScoreboardModule/Templates/Scoreboard.mt
+++ b/src/Modules/ScoreboardModule/Templates/Scoreboard.mt
@@ -3,7 +3,7 @@
     <using namespace="System.Linq"/>
 
     <import component="EvoSC.Style.UIStyle" as="UIStyle"/>
-    <import component="ScoreboardModule.Components.ScoreboardHeader" as="Header"/>
+    <import component="ScoreboardModule.Components.ScoreboardHeader" as="ScoreboardHeader"/>
     <import component="ScoreboardModule.Components.ScoreboardBody" as="Body"/>
     <import component="ScoreboardModule.Components.ScoreboardBg" as="ScoreboardBg"/>
     <import component="ScoreboardModule.Components.Row.Framemodel" as="PlayerRowFramemodel"/>
@@ -43,12 +43,14 @@
         <!-- Scoreboard Content -->
         <frame pos="{{ settings.Width / -2.0 }} {{ settings.Height / 2.0 }}">
             <!-- Background -->
-            <ScoreboardBg width="{{ settings.Width }}"
-                          height="{{ settings.Height }}"
+            <ScoreboardBg
+                    width="{{ settings.Width }}"
+                    height="{{ settings.Height }}"
             />
 
             <!-- Header -->
-            <Header width="{{ settings.Width }}"
+            <ScoreboardHeader
+                    width="{{ settings.Width }}"
                     height="{{ headerHeight }}"
             />
 
diff --git a/src/Modules/ScoreboardModule/Templates/Scripts/Framemodel.ms b/src/Modules/ScoreboardModule/Templates/Scripts/Framemodel.ms
new file mode 100644
index 000000000..a66450b35
--- /dev/null
+++ b/src/Modules/ScoreboardModule/Templates/Scripts/Framemodel.ms
@@ -0,0 +1,97 @@
+<!--
+Void ShowPlayerActions(CMlFrame playerRow) {
+    declare playerActions = (playerRow.GetFirstChild("player_actions") as CMlFrame);
+    declare detailsWrapper = (playerRow.GetFirstChild("details_wrapper") as CMlFrame);
+    declare backgroundWrapper = (playerRow.GetFirstChild("player_row_bg") as CMlFrame);
+    playerActions.Show();
+    detailsWrapper.Hide();
+    backgroundWrapper.Size.X = ({{ (w - positionBoxWidth) - actionButtonCount*(rowHeight*1.2) - actionButtonCount*rowSpacing - 0.1 }}) * 1.0;
+}
+
+Void HidePlayerActions(CMlFrame playerRow) {
+    declare playerActions = (playerRow.GetFirstChild("player_actions") as CMlFrame);
+    declare detailsWrapper = (playerRow.GetFirstChild("details_wrapper") as CMlFrame);
+    declare backgroundWrapper = (playerRow.GetFirstChild("player_row_bg") as CMlFrame);
+    playerActions.Hide();
+    detailsWrapper.Show();
+    backgroundWrapper.Size.X = {{ (w - positionBoxWidth) }} * 1.0;
+}
+
+Void ResetPlayerActions() {
+    declare playerRows <=> (Page.MainFrame.GetFirstChild("frame_scroll") as CMlFrame);
+    foreach(playerRowControl in playerRows.Controls){
+        declare playerRow = (playerRowControl as CMlFrame);
+        HidePlayerActions(playerRow);
+        declare Boolean RowIsLocked for playerRow = False;
+        RowIsLocked = False;
+    }
+}
+
+Void TogglePlayerActions(CMlFrame playerRow) {
+    declare Boolean RowIsLocked for playerRow = False;
+    
+    if(RowIsLocked){
+        RowIsLocked = False;
+        HidePlayerActions(playerRow);
+    }else{
+        ResetPlayerActions();
+        RowIsLocked = True;
+        ShowPlayerActions(playerRow);
+    }
+}
+
+Vec3 GetCustomLabelColor(Text value, Text defaultColorHex){
+    declare customLabelColorHex = "";
+    switch(value){
+        case _("|Status|Winner"): customLabelColorHex = "{{ Theme.ScoreboardModule_WinnerColor }}";
+        case _("|Status|Finalist"): customLabelColorHex = "{{ Theme.ScoreboardModule_FinalistColor }}";
+    }
+    
+    if(customLabelColorHex == ""){
+        customLabelColorHex = defaultColorHex;
+    }
+    
+    return CL::HexToRgb(customLabelColorHex);
+}
+
+Void SetCustomLabel(CMlFrame playerRow, Text value, Text hexColor){
+    declare customLabel = (playerRow.GetFirstChild("custom_label") as CMlLabel);
+    customLabel.Value = value;
+    customLabel.TextColor = GetCustomLabelColor(value, hexColor);
+    SetPlayerHighlightColor(playerRow, customLabel.TextColor);
+}
+
+Void HideCustomLabel(CMlFrame playerRow){
+    declare customLabel = (playerRow.GetFirstChild("custom_label") as CMlLabel);
+    customLabel.Value = "";
+    ResetPlayerHighlightColor(playerRow);
+}
+
+*** OnMouseClick ***
+***
+    if(Event.Control.ControlId == "player_row_trigger"){
+        TogglePlayerActions(Event.Control.Parent as CMlFrame);
+        continue;
+    }
+***
+
+*** OnMouseOver ***
+***
+    if(Event.Control.ControlId == "player_row_trigger"){
+        declare parentFrame = (Event.Control.Parent as CMlFrame);
+        declare backgroundFrame <=> (parentFrame.GetFirstChild("player_row_bg") as CMlFrame);
+        RowMouseOver(backgroundFrame);
+        continue;
+    }
+***
+
+*** OnMouseOut ***
+***
+    if(Event.Control.ControlId == "player_row_trigger"){
+        declare parentFrame = (Event.Control.Parent as CMlFrame);
+        declare backgroundFrame <=> (parentFrame.GetFirstChild("player_row_bg") as CMlFrame);
+        RowMouseOut(backgroundFrame);
+        continue;
+    }
+***
+-->
diff --git a/src/Modules/ScoreboardModule/Templates/Scripts/Header.ms b/src/Modules/ScoreboardModule/Templates/Scripts/Header.ms
new file mode 100644
index 000000000..37a49d79c
--- /dev/null
+++ b/src/Modules/ScoreboardModule/Templates/Scripts/Header.ms
@@ -0,0 +1,62 @@
+<!--
+declare Integer HeaderContentFrameLastUpdate;
+declare CMlFrame HeaderContentFrame;
+declare CMlLabel HeaderContentFrame_TextLeft;
+declare CMlLabel HeaderContentFrame_TextLeftSmall;
+declare CMlLabel HeaderContentFrame_TextRight;
+declare CMlLabel HeaderContentFrame_TextRightSmall;
+
+Text GetRoundsLabelText() {
+    declare Integer EvoSC_RoundNumber for UI = -1;
+    declare Integer EvoSC_RoundsPerMap for UI = -1;
+    return TL::ToUpperCase("Round " ^ EvoSC_RoundNumber ^ " of " ^ EvoSC_RoundsPerMap);
+}
+
+Text GetRoundsLabelWarmUpText() {
+    declare Integer EvoSC_RoundNumber for UI = -1;
+    declare Integer EvoSC_WarmUpCount for UI = -1;
+    return "$f90" ^ TL::ToUpperCase("Round " ^ EvoSC_RoundNumber ^ " of " ^ EvoSC_WarmUpCount);
+}
+
+Text GetPointsLimitText() {
+    declare Integer EvoSC_PointsLimit for UI = -1;
+    return TL::ToUpperCase("Points Limit " ^ EvoSC_PointsLimit);
+}
+
+Text GetPointsLimitWarmUpText() {
+    return "$f90WARM UP";
+}
+
+Void UpdateHeader() {
+    declare Boolean EvoSC_WarmUpActive for UI = False;
+    
+    HeaderContentFrame_TextLeft.Value = TL::StripFormatting(CurrentServerName);
+    HeaderContentFrame_TextRight.Value = TL::StripFormatting(TL::Trim(Map.MapName ^ " by " ^ Map.AuthorNickName));
+    
+    if(EvoSC_WarmUpActive){
+        HeaderContentFrame_TextLeftSmall.Value = GetPointsLimitWarmUpText();
+        HeaderContentFrame_TextRightSmall.Value = GetRoundsLabelWarmUpText();
+    }else{
+        HeaderContentFrame_TextLeftSmall.Value = GetPointsLimitText();
+        HeaderContentFrame_TextRightSmall.Value = GetRoundsLabelText();
+    }
+}
+
+*** OnInitialization ***
+***
+    HeaderContentFrameLastUpdate = 0;
+    HeaderContentFrame <=> (Page.MainFrame.GetFirstChild("header_content") as CMlFrame);
+    HeaderContentFrame_TextLeft <=> (HeaderContentFrame.GetFirstChild("header_text_left") as CMlLabel);
+    HeaderContentFrame_TextLeftSmall <=> (HeaderContentFrame.GetFirstChild("header_text_left_small") as CMlLabel);
+    HeaderContentFrame_TextRight <=> (HeaderContentFrame.GetFirstChild("header_text_right") as CMlLabel);
+    HeaderContentFrame_TextRightSmall <=> (HeaderContentFrame.GetFirstChild("header_text_right_small") as CMlLabel);
+***
+
+*** OnLoop *** 
+***
+    if(Now > HeaderContentFrameLastUpdate + 1000){
+        HeaderContentFrameLastUpdate = Now;
+        UpdateHeader();
+    }
+***
+-->
diff --git a/src/Modules/ScoreboardModule/Templates/Scripts/PlayerRowBg.ms b/src/Modules/ScoreboardModule/Templates/Scripts/PlayerRowBg.ms
new file mode 100644
index 000000000..88a4e7456
--- /dev/null
+++ b/src/Modules/ScoreboardModule/Templates/Scripts/PlayerRowBg.ms
@@ -0,0 +1,24 @@
+<!--
+Void RowMouseOver(CMlFrame backgroundFrame) {
+    declare backgroundQuad = (backgroundFrame.Controls[0] as CMlQuad);
+    backgroundQuad.BgColor = {! Color.ToMlColor(Theme.ScoreboardModule_Background_Hover_Color) !};
+    backgroundQuad.Opacity = {{ Theme.ScoreboardModule_Background_Hover_Opacity }};
+}
+
+Void RowMouseOut(CMlFrame backgroundFrame) {
+    declare backgroundQuad = (backgroundFrame.Controls[0] as CMlQuad);
+    backgroundQuad.BgColor = {! Color.ToMlColor(Theme.ScoreboardModule_Background_Row_Color) !};
+    backgroundQuad.Opacity = {{ Theme.ScoreboardModule_Background_Row_Opacity }};
+}
+
+Void SetPlayerHighlightColor(CMlFrame playerRow, Vec3 color) {
+    declare customGradient = (playerRow.GetFirstChild("custom_gradient") as CMlQuad);
+    customGradient.ModulateColor = color;
+    customGradient.Show();
+}
+
+Void ResetPlayerHighlightColor(CMlFrame playerRow) {
+    declare customGradient = (playerRow.GetFirstChild("custom_gradient") as CMlQuad);
+    customGradient.Hide();
+}
+-->