diff --git a/EvoSC.sln b/EvoSC.sln
index 2ec61fa13..767003d64 100644
--- a/EvoSC.sln
+++ b/EvoSC.sln
@@ -84,7 +84,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatchTrackerModule", "src\M
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatchReadyModule", "src\Modules\MatchReadyModule\MatchReadyModule.csproj", "{0538B9AB-B556-45BF-8230-53087BA9D353}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Scoreboard", "src\Modules\Scoreboard\Scoreboard.csproj", "{CD032D37-3BC8-4DE8-8C5B-45A0DE36932E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScoreboardModule", "src\Modules\ScoreboardModule\ScoreboardModule.csproj", "{CD032D37-3BC8-4DE8-8C5B-45A0DE36932E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NextMapModule", "src\Modules\NextMapModule\NextMapModule.csproj", "{64688FA7-136C-4BB9-B716-4E96DD0AA82F}"
 EndProject
diff --git a/src/EvoSC/EvoSC.csproj b/src/EvoSC/EvoSC.csproj
index 844ecefc8..86b39b074 100644
--- a/src/EvoSC/EvoSC.csproj
+++ b/src/EvoSC/EvoSC.csproj
@@ -34,7 +34,7 @@
         <ProjectReference Include="..\Modules\MatchReadyModule\MatchReadyModule.csproj" />
         <ProjectReference Include="..\Modules\MatchTrackerModule\MatchTrackerModule.csproj" />
         <ProjectReference Include="..\Modules\NextMapModule\NextMapModule.csproj" />
-        <ProjectReference Include="..\Modules\Scoreboard\Scoreboard.csproj" />
+        <ProjectReference Include="..\Modules\ScoreboardModule\ScoreboardModule.csproj" />
         <ProjectReference Include="..\Modules\MapsModule\MapsModule.csproj" />
         <ProjectReference Include="..\Modules\MatchManagerModule\MatchManagerModule.csproj" />
         <ProjectReference Include="..\Modules\MatchReadyModule\MatchReadyModule.csproj" />
diff --git a/src/EvoSC/InternalModules.cs b/src/EvoSC/InternalModules.cs
index a7fa2c43b..5b5c3b2f7 100644
--- a/src/EvoSC/InternalModules.cs
+++ b/src/EvoSC/InternalModules.cs
@@ -20,7 +20,7 @@
 using EvoSC.Modules.Official.OpenPlanetModule;
 using EvoSC.Modules.Official.Player;
 using EvoSC.Modules.Official.PlayerRecords;
-using EvoSC.Modules.Official.Scoreboard;
+using EvoSC.Modules.Official.ScoreboardModule;
 using EvoSC.Modules.Official.ServerManagementModule;
 using EvoSC.Modules.Official.SetName;
 using EvoSC.Modules.Official.SpectatorCamModeModule;
diff --git a/src/Modules/Scoreboard/Controllers/ScoreboardCommandsController.cs b/src/Modules/Scoreboard/Controllers/ScoreboardCommandsController.cs
deleted file mode 100644
index e36e18395..000000000
--- a/src/Modules/Scoreboard/Controllers/ScoreboardCommandsController.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using EvoSC.Commands.Attributes;
-using EvoSC.Commands.Interfaces;
-using EvoSC.Common.Controllers;
-using EvoSC.Common.Controllers.Attributes;
-using EvoSC.Modules.Official.Scoreboard.Interfaces;
-
-namespace EvoSC.Modules.Official.Scoreboard.Controllers;
-
-[Controller]
-public class ScoreboardCommandsController(IScoreboardService scoreboardService) : EvoScController<ICommandInteractionContext>
-{
-    [ChatCommand("scoreboard", "[Command.ShowScoreboard]")]
-    public async Task ShowScoreboardAsync()
-    {
-        await scoreboardService.ShowScoreboardAsync(Context.Player);
-    }
-}
diff --git a/src/Modules/Scoreboard/Controllers/ScoreboardEventController.cs b/src/Modules/Scoreboard/Controllers/ScoreboardEventController.cs
deleted file mode 100644
index 466a5545f..000000000
--- a/src/Modules/Scoreboard/Controllers/ScoreboardEventController.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using EvoSC.Common.Controllers;
-using EvoSC.Common.Controllers.Attributes;
-using EvoSC.Common.Events.Attributes;
-using EvoSC.Common.Interfaces.Controllers;
-using EvoSC.Common.Remote;
-using EvoSC.Common.Remote.EventArgsModels;
-using EvoSC.Modules.Official.MatchManagerModule.Events;
-using EvoSC.Modules.Official.MatchManagerModule.Events.EventArgObjects;
-using EvoSC.Modules.Official.Scoreboard.Interfaces;
-using GbxRemoteNet.Events;
-
-namespace EvoSC.Modules.Official.Scoreboard.Controllers;
-
-[Controller]
-public class ScoreboardEventController(IScoreboardService scoreboardService) : EvoScController<IEventControllerContext>
-{
-    [Subscribe(GbxRemoteEvent.BeginMap)]
-    public async Task OnBeginMapAsync(object sender, MapGbxEventArgs args)
-    {
-        await scoreboardService.LoadAndSendRequiredAdditionalInfoAsync();
-        await scoreboardService.ShowScoreboardToAllAsync();
-    }
-
-    [Subscribe(MatchSettingsEvent.MatchSettingsLoaded)]
-    public async Task OnMatchSettingsLoadedAsync(object sender, MatchSettingsLoadedEventArgs args)
-    {
-        await scoreboardService.LoadAndSendRequiredAdditionalInfoAsync();
-        await scoreboardService.ShowScoreboardToAllAsync();
-    }
-
-    [Subscribe(ModeScriptEvent.StartRoundStart)]
-    public async Task OnRoundStartAsync(object sender, RoundEventArgs args)
-    {
-        scoreboardService.SetCurrentRound(args.Count);
-        await scoreboardService.SendRequiredAdditionalInfoAsync();
-    }
-}
diff --git a/src/Modules/Scoreboard/Controllers/ScoreboardManialinkController.cs b/src/Modules/Scoreboard/Controllers/ScoreboardManialinkController.cs
deleted file mode 100644
index 70be12211..000000000
--- a/src/Modules/Scoreboard/Controllers/ScoreboardManialinkController.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using EvoSC.Common.Controllers.Attributes;
-using EvoSC.Manialinks;
-using EvoSC.Modules.Official.Scoreboard.Interfaces;
-
-namespace EvoSC.Modules.Official.Scoreboard.Controllers;
-
-[Controller]
-public class ScoreboardManialinkController(IScoreboardService scoreboardService) : ManialinkController
-{
-    public Task ResendScoreboardAsync() => scoreboardService.ShowScoreboardAsync(Context.Player);
-}
diff --git a/src/Modules/Scoreboard/Interfaces/IScoreboardService.cs b/src/Modules/Scoreboard/Interfaces/IScoreboardService.cs
deleted file mode 100644
index 2e6a4d11f..000000000
--- a/src/Modules/Scoreboard/Interfaces/IScoreboardService.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using EvoSC.Common.Interfaces.Models;
-
-namespace EvoSC.Modules.Official.Scoreboard.Interfaces;
-
-public interface IScoreboardService
-{
-    /// <summary>
-    /// Sends the scoreboard manialink to all players.
-    /// </summary>
-    public Task ShowScoreboardToAllAsync();
-    
-    /// <summary>
-    /// Sends the scoreboard manialink to a specific players.
-    /// </summary>
-    public Task ShowScoreboardAsync(IPlayer playerLogin);
-    
-    /// <summary>
-    /// Hide the default game scoreboard.
-    /// </summary>
-    public Task HideNadeoScoreboardAsync();
-    
-    /// <summary>
-    /// Shows the default game scoreboard.
-    /// </summary>
-    public Task ShowNadeoScoreboardAsync();
-    
-    /// <summary>
-    /// Sends the manialink with additional values used by the scoreboard.
-    /// </summary>
-    public Task SendRequiredAdditionalInfoAsync();
-    
-    /// <summary>
-    /// Refreshes the additionally required data and sends the manialink.
-    /// </summary>
-    public Task LoadAndSendRequiredAdditionalInfoAsync();
-    
-    /// <summary>
-    /// Sets the current round.
-    /// </summary>
-    public void SetCurrentRound(int round);
-}
diff --git a/src/Modules/Scoreboard/Interfaces/IScoreboardTrackerService.cs b/src/Modules/Scoreboard/Interfaces/IScoreboardTrackerService.cs
deleted file mode 100644
index c00c7d63a..000000000
--- a/src/Modules/Scoreboard/Interfaces/IScoreboardTrackerService.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace EvoSC.Modules.Official.Scoreboard.Interfaces;
-
-public interface IScoreboardTrackerService
-{
-    public int RoundsPerMap { get; set; }
-    
-    public int PointsLimit { get; set; }
-    
-    public int CurrentRound { get; set; }
-    
-    public int MaxPlayers { get; set; }
-}
diff --git a/src/Modules/Scoreboard/ScoreboardModule.cs b/src/Modules/Scoreboard/ScoreboardModule.cs
deleted file mode 100644
index 95bf6804a..000000000
--- a/src/Modules/Scoreboard/ScoreboardModule.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using EvoSC.Modules.Attributes;
-using EvoSC.Modules.Interfaces;
-using EvoSC.Modules.Official.Scoreboard.Interfaces;
-
-namespace EvoSC.Modules.Official.Scoreboard;
-
-[Module(IsInternal = true)]
-public class ScoreboardModule(IScoreboardService scoreboardService) : EvoScModule, IToggleable
-{
-    public Task EnableAsync()
-    {
-        scoreboardService.LoadAndSendRequiredAdditionalInfoAsync();
-        scoreboardService.HideNadeoScoreboardAsync();
-        
-        return scoreboardService.ShowScoreboardToAllAsync();
-    }
-
-    public Task DisableAsync()
-    {
-        return scoreboardService.ShowNadeoScoreboardAsync();
-    }
-}
diff --git a/src/Modules/Scoreboard/Services/ScoreboardTrackerService.cs b/src/Modules/Scoreboard/Services/ScoreboardTrackerService.cs
deleted file mode 100644
index bbf52a0e6..000000000
--- a/src/Modules/Scoreboard/Services/ScoreboardTrackerService.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using EvoSC.Common.Services.Attributes;
-using EvoSC.Common.Services.Models;
-using EvoSC.Modules.Official.Scoreboard.Interfaces;
-
-namespace EvoSC.Modules.Official.Scoreboard.Services;
-
-[Service(LifeStyle = ServiceLifeStyle.Singleton)]
-public class ScoreboardTrackerService : IScoreboardTrackerService
-{
-    private int _roundsPerMap = -1;
-    private readonly object _roundsPerMapLock = new();
-    
-    private int _pointsLimit = -1;
-    private readonly object _pointsLimitLock = new();
-    
-    private int _currentRound = -1;
-    private readonly object _currentRoundLock = new();
-    
-    private int _maxPlayers = -1;
-    private readonly object _maxPlayersLock = new();
-
-    public int RoundsPerMap
-    {
-        get
-        {
-            lock (_roundsPerMapLock)
-            {
-                return _roundsPerMap;
-            }
-        }
-
-        set
-        {
-            lock (_roundsPerMapLock)
-            {
-                _roundsPerMap = value;
-            }
-        }
-    }
-    
-    public int PointsLimit
-    {
-        get
-        {
-            lock (_pointsLimitLock)
-            {
-                return _pointsLimit;
-            }
-        }
-
-        set
-        {
-            lock (_pointsLimitLock)
-            {
-                _pointsLimit = value;
-            }
-        }
-    }
-    
-    public int CurrentRound
-    {
-        get
-        {
-            lock (_currentRoundLock)
-            {
-                return _currentRound;
-            }
-        }
-
-        set
-        {
-            lock (_currentRoundLock)
-            {
-                _currentRound = value;
-            }
-        }
-    }
-    
-    public int MaxPlayers
-    {
-        get
-        {
-            lock (_maxPlayersLock)
-            {
-                return _maxPlayers;
-            }
-        }
-
-        set
-        {
-            lock (_maxPlayersLock)
-            {
-                _maxPlayers = value;
-            }
-        }
-    }
-}
diff --git a/src/Modules/Scoreboard/Templates/Components/BackgroundBox.mt b/src/Modules/Scoreboard/Templates/Components/BackgroundBox.mt
deleted file mode 100644
index 55fbe511d..000000000
--- a/src/Modules/Scoreboard/Templates/Components/BackgroundBox.mt
+++ /dev/null
@@ -1,46 +0,0 @@
-<component>
-    <property type="double" name="w" default="140"/>
-    <property type="double" name="h" default="80"/>
-    <property type="double" name="radius" default="3.0"/>
-    <property type="double" name="headerHeight" default="14.0"/>
-
-    <template>
-        <framemodel id="Scoreboard_RoundedCorner_Header">
-            <frame size="{{ radius }} {{ radius }}">
-                <quad size="{{ radius * 2.0 }} {{ radius * 2.0 }}"
-                      modulatecolor="{{ Theme.ScoreboardModule_BackgroundBox_BgHeader }}"
-                      image="file:///Media/Painter/Stencils/01-EllipseRound/Brush.tga"
-                      opacity="0.99"/>
-            </frame>
-        </framemodel>
-        <framemodel id="Scoreboard_RoundedCorner_Header_Primary">
-            <frame size="{{ radius }} {{ radius }}">
-                <quad size="{{ radius * 2.0 }} {{ radius * 2.0 }}"
-                      modulatecolor="{{ Theme.ScoreboardModule_BackgroundBox_BgHeaderGrad }}"
-                      image="file:///Media/Painter/Stencils/01-EllipseRound/Brush.tga"/>
-            </frame>
-        </framemodel>
-
-        <!-- Top bar -->
-        <frameinstance modelid="Scoreboard_RoundedCorner_Header"/>
-        <quad pos="{{ radius }} 0" size="{{ w - radius * 2.0 }} {{ radius }}" bgcolor="{{ Theme.ScoreboardModule_BackgroundBox_BgHeader }}"
-              opacity="0.99"/>
-        <quad pos="0 {{ -radius }}" size="{{ w - radius }} {{ headerHeight - radius }}" bgcolor="{{ Theme.ScoreboardModule_BackgroundBox_BgHeader }}"
-              opacity="0.99"/>
-        <frameinstance modelid="Scoreboard_RoundedCorner_Header_Primary" pos="{{ w }}" rot="90"/>
-        <quad pos="{{ w - radius }} {{ -radius }}" size="{{ radius }} {{ headerHeight - radius }}"
-              bgcolor="{{ Theme.ScoreboardModule_BackgroundBox_BgHeaderGrad }}"/>
-
-        <!-- Gradient -->
-        <frame pos="{{ -radius }} {{ -headerHeight }}">
-            <quad size="{{ headerHeight }} {{ w }}"
-                  rot="270"
-                  modulatecolor="{{ Theme.ScoreboardModule_BackgroundBox_BgHeaderGrad }}"
-                  image="file:///Media/Painter/Stencils/04-SquareGradient/Brush.tga"
-            />
-        </frame>
-
-        <!-- Middle part -->
-        <quad pos="0 {{ -headerHeight }}" size="{{ w }} {{ h + radius }}" bgcolor="{{ Theme.ScoreboardModule_BackgroundBox_BgList }}" opacity="0.9"/>
-    </template>
-</component>
\ No newline at end of file
diff --git a/src/Modules/Scoreboard/Templates/Components/PlayerRow/CustomLabelBackground.mt b/src/Modules/Scoreboard/Templates/Components/PlayerRow/CustomLabelBackground.mt
deleted file mode 100644
index c21412bdf..000000000
--- a/src/Modules/Scoreboard/Templates/Components/PlayerRow/CustomLabelBackground.mt
+++ /dev/null
@@ -1,51 +0,0 @@
-<component>
-    <property type="string" name="id" />
-    <property type="double" name="rowHeight"/>
-    <property type="double" name="x" default="0.0"/>
-    <property type="double" name="y" default="0.0"/>
-    <property type="double" name="w" default="0.0"/>
-    <property type="double" name="widthMultiplier" default="0.63"/>
-    <property type="int" name="zIndex" default="0"/>
-    
-    <template>
-        <frame id="{{ id }}" pos="{{ x }} {{ y }}" z-index="{{ zIndex }}">
-            <frame size="1 1" pos="0 {{ -rowHeight }}" rot="180">
-                <!-- bottom right corner -->
-                <quad size="2 2"
-                      class="modulate"
-                      modulatecolor="{{ Theme.ScoreboardModule_PlayerRow_CustomLabelBackground_Bg }}"
-                      image="file:///Media/Painter/Stencils/01-EllipseRound/Brush.tga"
-                      opacity="0.25"
-                />
-            </frame>
-            <frame size="1 1" pos="0 0" rot="90">
-                <!-- top right corner -->
-                <quad size="2 2"
-                      class="modulate"
-                      modulatecolor="{{ Theme.ScoreboardModule_PlayerRow_CustomLabelBackground_Bg }}"
-                      image="file:///Media/Painter/Stencils/01-EllipseRound/Brush.tga"
-                      opacity="0.25"
-                />
-            </frame>
-
-            <!-- right bar -->
-            <quad 
-                    class="set"
-                    pos="-1 -1.05"
-                    size="1 {{ rowHeight - 2.1 }}"
-                    bgcolor="{{ Theme.ScoreboardModule_PlayerRow_CustomLabelBackground_Bg }}" 
-                    z-index="2"
-                    opacity="0.25"/> 
-          
-            <frame pos="-1 {{ -rowHeight }}">
-                <quad size="{{ rowHeight }} {{ w * widthMultiplier }}"
-                      pos="{{ w * -widthMultiplier }} 0"
-                      rot="-90"
-                      class="modulate"
-                      modulatecolor="{{ Theme.ScoreboardModule_PlayerRow_CustomLabelBackground_Bg }}"
-                      opacity="0.25"
-                      image="file:///Media/Painter/Stencils/04-SquareGradient/Brush.tga"/>
-            </frame>
-        </frame>
-    </template>
-</component>
\ No newline at end of file
diff --git a/src/Modules/Scoreboard/Templates/Components/PlayerRow/Framemodel.mt b/src/Modules/Scoreboard/Templates/Components/PlayerRow/Framemodel.mt
deleted file mode 100644
index 37cdafd0d..000000000
--- a/src/Modules/Scoreboard/Templates/Components/PlayerRow/Framemodel.mt
+++ /dev/null
@@ -1,195 +0,0 @@
-<component>
-    <import component="Scoreboard.Components.PlayerRow.CustomLabelBackground" as="CustomLabelBackground"/>
-    <import component="Scoreboard.Components.PlayerRow.PlayerRowBackground" as="PlayerRowBackground"/>
-    <import component="Scoreboard.Components.PlayerRow.PointsBox" as="PointsBox"/>
-    <import component="Scoreboard.Components.PlayerRow.PositionBox" as="Position"/>
-    <import component="Scoreboard.Components.PlayerRow.PlayerActions" as="PlayerActions"/>
-    <import component="EvoSC.Advanced.ClubTag" as="ClubTag"/>
-
-    <property type="double" name="w"/>
-    <property type="double" name="padding"/>
-    <property type="double" name="rowHeight"/>
-    <property type="double" name="rowSpacing"/>
-    <property type="double" name="innerSpacing"/>
-    <property type="double" name="rowInnerHeight"/>
-    <property type="double" name="pointsWidth"/>
-    <property type="double" name="scrollBarWidth"/>
-
-    <property type="double" name="textSize" default="2.4"/>
-    <property type="double" name="positionBoxWidth" default="9.6"/>
-
-    <template>
-        <framemodel id="player_row">
-            <!-- Scroll activation -->
-            <quad id="player_row_trigger" size="{{ w }} {{ rowHeight + rowSpacing }}" ScriptEvents="1"/>
-
-            <!-- Player Row Background -->
-            <PlayerRowBackground id="player_row_bg"
-                                 rowHeight="{{ rowHeight }}"
-                                 padding="{{ padding }}"
-                                 w="{{ w - scrollBarWidth - rowSpacing - positionBoxWidth - rowSpacing }}"
-                                 x="{{ positionBoxWidth + rowSpacing }}"
-            />
-
-            <!-- Position Box -->
-            <Position id="position_box"
-                      w="{{ positionBoxWidth }}"
-                      h="{{ rowHeight }}"
-                      z-index="5"
-            />
-
-            <!-- Custom Label Background -->
-            <CustomLabelBackground id="custom_gradient"
-                                   x="{{ w - padding }}"
-                                   rowHeight="{{ rowHeight }}"
-                                   w="{{ w }}"
-            />
-
-            <frame pos="{{ innerSpacing + positionBoxWidth + innerSpacing * 1.5 }} {{ rowHeight / -2.0 }}" z-index="10">
-                <!-- Flag -->
-                <quad id="flag"
-                      size="{{ rowInnerHeight * 2 }} {{ rowInnerHeight }}"
-                      valign="center"
-                      image="file://Media/Manialinks/Nadeo/Trackmania/Menus/PageClub/ClubActivities/Clubs_ActivityIcon_Mask.dds"
-                      alphamask="file://Media/Manialinks/Nadeo/Trackmania/Menus/PageClub/ClubActivities/Clubs_ActivityIcon_Mask.dds"
-                />
-
-               <ClubTag h="{{ rowInnerHeight }}" />
-
-                <!-- Player Name -->
-                <label id="name"
-                       pos="{{ rowInnerHeight * 4 + innerSpacing }} 0.4"
-                       size="{{ w / 3.0 }} {{ rowHeight }}"
-                       valign="center"
-                       textsize="2.6"
-                       textfont="{{ Font.Regular }}"
-                       textcolor="{{ Theme.ScoreboardModule_PlayerRow_Text }}"/>
-            </frame>
-            <frame id="details_wrapper" z-index="10">
-                <!-- Spec/Disconnected -->
-                <label id="spec_disconnected_label" pos="0 {{ rowHeight / -2.0 + 0.3 }}"
-                       valign="center"
-                       halign="right"
-                       textsize="{{ textSize }}"
-                       textcolor="{{ Theme.ScoreboardModule_PlayerRow_FrameModel_Text }}"
-                       opacity="0.5"
-                       textfont="{{ Font.Regular }}"/>
-
-                <!-- Round Points -->
-                <label id="round_points" pos="0 {{ rowHeight / -2.0 + 0.3 }}"
-                       valign="center"
-                       halign="right"
-                       textsize="{{ textSize }}"
-                       textcolor="{{ Theme.ScoreboardModule_PlayerRow_FrameModel_TextRoundPoints }}"
-                       textfont="{{ Font.Regular }}"/>
-
-                <!-- Custom Label (FINALIST, etc) -->
-                <label id="custom_label"
-                       pos="0 {{ rowHeight / -2.0 + 0.3 }}"
-                       valign="center"
-                       halign="right"
-                       textsize="{{ textSize }}"
-                       textfont="{{ Font.Thin }}"
-                       textcolor="{{ Theme.ScoreboardModule_PlayerRow_Text }}"/>
-
-                <!-- Player Score -->
-                <label id="score"
-                       pos="0 {{ rowHeight / -2.0 + 0.4 }}"
-                       valign="center"
-                       halign="right"
-                       textsize="{{ textSize }}"
-                       textfont="{{ Font.Thin }}"
-                       textcolor="{{ Theme.ScoreboardModule_PlayerRow_Text }}"/>
-
-                <!-- Points Box -->
-                <PointsBox id="points_box"
-                           x="{{ w - padding - pointsWidth * 0.65 - rowHeight * 0.4 * 0.5 }}"
-                           y="{{ rowHeight * 0.33 * -0.5 }}"
-                           w="{{ pointsWidth }}"
-                           h="{{ rowHeight }}"
-                           scale="0.65"
-                           hidden="1"
-                           z-index="10"
-                           rowHeight="{{ rowHeight }}"
-                           pointsWidth="{{ pointsWidth }}"
-                           padding="{{ padding }}"
-                />
-            </frame>
-            <PlayerActions x="{{ w - padding }}" 
-                           y="{{ rowHeight / -2.0 }}" 
-                           rowHeight="{{ rowHeight }}"
-                           innerSpacing="{{ innerSpacing }}"
-                           textsize="{{ textSize }}"
-            />
-        </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);
-            playerActions.Show();
-            detailsWrapper.Hide();
-        }
-        
-        Void HidePlayerActions(CMlFrame playerRow) {
-            declare playerActions = (playerRow.GetFirstChild("player_actions") as CMlFrame);
-            declare detailsWrapper = (playerRow.GetFirstChild("details_wrapper") as CMlFrame);
-            playerActions.Hide();
-            detailsWrapper.Show();
-        }
-        
-        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);
-            }
-        }
-        
-        *** 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);
-                SetPlayerBackgroundColor(backgroundFrame, CL::HexToRgb("{{ Theme.ScoreboardModule_PlayerRow_FrameModel_BgRow }}"));
-                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);
-                continue;
-                ResetPlayerBackgroundColor(backgroundFrame);
-            }
-        ***
-        -->
-    </script>
-</component>
diff --git a/src/Modules/Scoreboard/Templates/Components/PlayerRow/PlayerRowBackground.mt b/src/Modules/Scoreboard/Templates/Components/PlayerRow/PlayerRowBackground.mt
deleted file mode 100644
index ad4154156..000000000
--- a/src/Modules/Scoreboard/Templates/Components/PlayerRow/PlayerRowBackground.mt
+++ /dev/null
@@ -1,139 +0,0 @@
-<component>
-    <property type="string" name="id" />
-    <property type="double" name="rowHeight" />
-    <property type="double" name="padding" />
-    <property type="double" name="w" />
-    <property type="double" name="x" />
-    
-    <template>
-        <frame id="{{ id }}" pos="{{ x }}">
-            <!-- START BG 1 (Default) -->
-            <frame>
-                <!-- center -->
-                <quad size="{{ w - 1.0 }} {{ rowHeight }}"
-                      pos="0.5 0"
-                      bgcolor="{{ Theme.ScoreboardModule_PlayerRow_PlayerRowBackground_Bg }}"
-                      opacity="0.25"/>
-
-                <!-- bar left -->
-                <quad pos="0 -0.53"
-                      size="0.5 {{ rowHeight - 1.06 }}"
-                      bgcolor="{{ Theme.ScoreboardModule_PlayerRow_PlayerRowBackground_Bg }}"
-                      opacity="0.25"/>
-
-                <!-- bar right -->
-                <quad pos="{{ w - 0.5 }} -0.53"
-                      size="0.5 {{ rowHeight - 1.06 }}"
-                      bgcolor="{{ Theme.ScoreboardModule_PlayerRow_PlayerRowBackground_Bg }}"
-                      opacity="0.25"
-                />
-                
-                <!-- corner top left -->
-                <frame size="0.5 0.5">
-                    <quad size="1 1"
-                          modulatecolor="{{ Theme.ScoreboardModule_PlayerRow_PlayerRowBackground_Bg }}"
-                          opacity="0.25"
-                          image="file:///Media/Painter/Stencils/01-EllipseRound/Brush.tga"/>
-                </frame>
-
-                <!-- corner top right -->
-                <frame size="0.5 0.5" pos="{{ w }}" rot="90">
-                    <quad size="1 1"
-                          modulatecolor="{{ Theme.ScoreboardModule_PlayerRow_PlayerRowBackground_Bg }}"
-                          opacity="0.25"
-                          image="file:///Media/Painter/Stencils/01-EllipseRound/Brush.tga"/>
-                </frame>
-
-                <!-- corner bottom right -->
-                <frame size="0.5 0.5" pos="{{ w }} {{ -rowHeight }}" rot="180">
-                    <quad size="1 1"
-                          modulatecolor="{{ Theme.ScoreboardModule_PlayerRow_PlayerRowBackground_Bg }}"
-                          opacity="0.25"
-                          image="file:///Media/Painter/Stencils/01-EllipseRound/Brush.tga"/>
-                </frame>
-
-                <!-- corner bottom left -->
-                <frame size="0.5 0.5" pos="0 {{ -rowHeight }}" rot="270">
-                    <quad size="1 1"
-                          modulatecolor="{{ Theme.ScoreboardModule_PlayerRow_PlayerRowBackground_Bg }}"
-                          opacity="0.25"
-                          image="file:///Media/Painter/Stencils/01-EllipseRound/Brush.tga"/>
-                </frame>
-            </frame>
-            <!-- END BG 1 -->
-            
-            <!-- START BG 2 (Highlight) -->
-            <frame>
-                <!-- 0: bar left -->
-                <quad pos="0 -0.54"
-                      size="0.5 {{ rowHeight - 1.07 }}"
-                      bgcolor="{{ Theme.ScoreboardModule_PlayerRow_PlayerRowBackground_Bg }}"
-                      opacity="0.75"
-                />
-                
-                <!-- 1: corner top left -->
-                <frame size="0.43 0.45">
-                    <quad size="1 1"
-                          modulatecolor="{{ Theme.ScoreboardModule_PlayerRow_PlayerRowBackground_Bg }}"
-                          class="modulate"
-                          image="file:///Media/Painter/Stencils/01-EllipseRound/Brush.tga"
-                          opacity="0.75"
-                    />
-                </frame>
-
-                <!-- 2: corner bottom left -->
-                <frame size="0.43 0.5" pos="0 {{ -rowHeight }}" rot="270">
-                    <quad size="1 1"
-                          modulatecolor="{{ Theme.ScoreboardModule_PlayerRow_PlayerRowBackground_Bg }}"
-                          class="modulate"
-                          image="file:///Media/Painter/Stencils/01-EllipseRound/Brush.tga"
-                          opacity="0.75"
-                    />
-                </frame>
-
-                <!-- 3: gradient -->
-                <frame pos="0.5 0">
-                    <quad size="{{ rowHeight }} {{ w / 2.0 }}"
-                          rot="90"
-                          pos="{{ w / 2.0 }} 0"
-                          modulatecolor="{{ Theme.ScoreboardModule_PlayerRow_PlayerRowBackground_Bg }}"
-                          class="modulate"
-                          opacity="0.75"
-                          image="file:///Media/Painter/Stencils/04-SquareGradient/Brush.tga"
-                    />
-                </frame>
-            </frame>
-            <!-- END BG 2 -->
-        </frame>
-    </template>
-    
-    <script once="true">
-        <!--
-        Void SetPlayerBackgroundColor(CMlFrame backgroundFrame, Vec3 color) {
-            declare targetFrame = (backgroundFrame.Controls[0] as CMlFrame);
-            (targetFrame.Controls[0] as CMlQuad).BgColor = color;
-            (targetFrame.Controls[1] as CMlQuad).BgColor = color;
-            (targetFrame.Controls[2] as CMlQuad).BgColor = color;
-            
-            Page.GetClassChildren("modulate", targetFrame, True);
-            foreach(Control in Page.GetClassChildren_Result){
-                (Control as CMlQuad).ModulateColor = color;
-            }
-        }
-        
-        Void ResetPlayerBackgroundColor(CMlFrame backgroundFrame){
-            SetPlayerBackgroundColor(backgroundFrame, CL::HexToRgb("{{ Theme.ScoreboardModule_PlayerRow_PlayerRowBackground_Bg }}"));
-        }
-        
-        Void SetPlayerHighlightColor(CMlFrame backgroundFrame, Vec3 color) {
-            declare targetFrame = (backgroundFrame.Controls[1] as CMlFrame);
-            (targetFrame.Controls[0] as CMlQuad).BgColor = color;
-            
-            Page.GetClassChildren("modulate", targetFrame, True);
-            foreach(Control in Page.GetClassChildren_Result){
-                (Control as CMlQuad).ModulateColor = color;
-            }
-        }
-        -->
-    </script>
-</component>
\ No newline at end of file
diff --git a/src/Modules/Scoreboard/Templates/Components/PlayerRow/PointsBox.mt b/src/Modules/Scoreboard/Templates/Components/PlayerRow/PointsBox.mt
deleted file mode 100644
index fcabef295..000000000
--- a/src/Modules/Scoreboard/Templates/Components/PlayerRow/PointsBox.mt
+++ /dev/null
@@ -1,65 +0,0 @@
-<component>
-    <property type="string" name="id" />
-    <property type="double" name="rowHeight"/>
-    <property type="double" name="pointsWidth"/>
-    <property type="double" name="padding"/>
-    <property type="double" name="x" default="0.0"/>
-    <property type="double" name="y" default="0.0"/>
-    <property type="double" name="w" default="0.0"/>
-    <property type="double" name="h" default="0.0"/>
-    <property type="double" name="scale" default="1.0"/>
-    <property type="int" name="zIndex" default="0"/>
-    <property type="int" name="hidden" default="0"/>
-    
-    <template>
-        <frame id="{{ id }}" pos="{{ x }} {{ y }}" size="{{ w }} {{ h }}" scale="{{ scale }}" z-index="{{ zIndex }}" hidden="{{ hidden }}">
-            <frame size="1 1">
-                <!-- top left corner -->
-                <quad size="2 2"
-                      class="modulate"
-                      modulatecolor="{{ Theme.ScoreboardModule_PlayerRow_PointsBox_Bg }}"
-                      image="file:///Media/Painter/Stencils/01-EllipseRound/Brush.tga"/>
-            </frame>
-            <frame size="1 1" pos="{{ pointsWidth }} {{ -rowHeight }}" rot="180">
-                <!-- bottom right corner -->
-                <quad size="2 2"
-                      class="modulate"
-                      modulatecolor="{{ Theme.ScoreboardModule_PlayerRow_PointsBox_Bg }}"
-                      image="file:///Media/Painter/Stencils/01-EllipseRound/Brush.tga"/>
-            </frame>
-            <frame size="1 1" pos="{{ pointsWidth }} 0" rot="90">
-                <!-- top right corner -->
-                <quad size="2 2"
-                      class="modulate"
-                      modulatecolor="{{ Theme.ScoreboardModule_PlayerRow_PointsBox_Bg }}"
-                      image="file:///Media/Painter/Stencils/01-EllipseRound/Brush.tga"/>
-            </frame>
-            <frame size="1 1" pos="0 {{ -rowHeight }}" rot="-90">
-                <!-- bottom left -->
-                <quad size="2 2"
-                      class="modulate"
-                      modulatecolor="{{ Theme.ScoreboardModule_PlayerRow_PointsBox_Bg }}"
-                      image="file:///Media/Painter/Stencils/01-EllipseRound/Brush.tga"/>
-            </frame>
-            <quad class="set" pos="1 0" size="{{ pointsWidth - 2.0 }} 1" bgcolor="{{ Theme.ScoreboardModule_PlayerRow_PointsBox_Bg }}"/> <!-- top bar -->
-            <quad class="set" pos="1 {{ 1.0 - rowHeight }}" size="{{ pointsWidth - 2.0 }} 1"
-                  bgcolor="{{ Theme.ScoreboardModule_PlayerRow_PointsBox_Bg }}"/> <!-- bottom bar -->
-            <quad class="set" pos="0 -1" size="1 {{ rowHeight - 2.0 }}" bgcolor="{{ Theme.ScoreboardModule_PlayerRow_PointsBox_Bg }}"/> <!-- left bar -->
-            <quad class="set" pos="{{ pointsWidth - 1.0 }} -1" size="1 {{ rowHeight - 2.0 }}"
-                  bgcolor="{{ Theme.ScoreboardModule_PlayerRow_PointsBox_Bg }}"/> <!-- right bar -->
-            <quad class="set" pos="1 -1" size="{{ pointsWidth - 2.0 }} {{ rowHeight - 2.0 }}"
-                  bgcolor="{{ Theme.ScoreboardModule_PlayerRow_PointsBox_Bg }}"/> <!-- center quad -->
-        </frame>
-        
-        <label id="points"
-               pos="{{ x + (pointsWidth * scale) / 2.0 }} {{ rowHeight / -2.0 + 0.4 }}"
-               text="x"
-               valign="center"
-               halign="center"
-               textsize="2"
-               textcolor="{{ Theme.ScoreboardModule_PlayerRow_PointsBox_Text }}"
-               textfont="{{ Font.Regular }}"
-               z-index="11"
-        />
-    </template>
-</component>
\ No newline at end of file
diff --git a/src/Modules/Scoreboard/Templates/Components/PlayerRow/PositionBox.mt b/src/Modules/Scoreboard/Templates/Components/PlayerRow/PositionBox.mt
deleted file mode 100644
index 9af6a75eb..000000000
--- a/src/Modules/Scoreboard/Templates/Components/PlayerRow/PositionBox.mt
+++ /dev/null
@@ -1,58 +0,0 @@
-<component>
-    <property type="string" name="id"/>
-    <property type="double" name="w" default="0.0"/>
-    <property type="double" name="h" default="0.0"/>
-    <property type="double" name="x" default="0.0"/>
-    <property type="double" name="y" default="0.0"/>
-    <property type="int" name="zIndex" default="0"/>
-
-    <template>
-        <frame id="{{ id }}" pos="{{ x }} {{ y }}" z-index="{{ zIndex }}">
-            <!-- 0: bottom right corner -->
-            <frame size="0.5 0.5" pos="{{ w }} {{ -h }}" rot="180">
-                <quad size="1 1"
-                      class="modulate"
-                      modulatecolor="{{ Theme.ScoreboardModule_PlayerRow_PositionBox_Bg }}"
-                      image="file:///Media/Painter/Stencils/01-EllipseRound/Brush.tga"/>
-            </frame>
-
-            <!-- 1: top right corner -->
-            <frame size="0.5 0.5" pos="{{ w }} 0" rot="90">
-                <quad size="1 1"
-                      class="modulate"
-                      modulatecolor="{{ Theme.ScoreboardModule_PlayerRow_PositionBox_Bg }}"
-                      image="file:///Media/Painter/Stencils/01-EllipseRound/Brush.tga"/>
-            </frame>
-
-            <!-- 2: right bar -->
-            <quad pos="{{ w - 0.5 }} -0.5" size="0.5 {{ h - 1.0 }}" bgcolor="{{ Theme.ScoreboardModule_PlayerRow_PositionBox_Bg }}"/>
-
-            <!-- 3: center quad -->
-            <quad pos="0 0" size="{{ w - 0.5 }} {{ h }}" bgcolor="{{ Theme.ScoreboardModule_PlayerRow_PositionBox_Bg }}"/>
-        </frame>
-
-        <label id="position"
-               pos="{{ x + h * 0.6 }} {{ h / -2.0 + 0.25 }}"
-               valign="center"
-               halign="center"
-               textsize="2.6"
-               textfont="{{ Font.ExtraBold }}"
-               z-index="5"
-               textcolor="{{ Theme.ScoreboardModule_PlayerRow_Text }}"
-        />
-    </template>
-
-    <script once="true">
-        <!--
-        Void SetPositionBackgroundColor(CMlFrame backgroundFrame, Vec3 color) {
-            (backgroundFrame.Controls[2] as CMlQuad).BgColor = color;
-            (backgroundFrame.Controls[3] as CMlQuad).BgColor = color;
-            
-            Page.GetClassChildren("modulate", backgroundFrame, True);
-            foreach(Control in Page.GetClassChildren_Result){
-                (Control as CMlQuad).ModulateColor = color;
-            }
-        }
-        -->
-    </script>
-</component>
\ No newline at end of file
diff --git a/src/Modules/Scoreboard/Templates/Components/ScoreboardHeader.mt b/src/Modules/Scoreboard/Templates/Components/ScoreboardHeader.mt
deleted file mode 100644
index 3ddbd19e8..000000000
--- a/src/Modules/Scoreboard/Templates/Components/ScoreboardHeader.mt
+++ /dev/null
@@ -1,62 +0,0 @@
-<component>
-    <property type="double" name="w" />
-    <property type="double" name="headerHeight" />
-    
-    <template>
-        <frame pos="1 {{ headerHeight / -2.0 }}">
-            <label id="map_name" pos="5 2" text="MAP NAME" valign="center" textsize="2.8" textfont="{{ Font.Regular }}"
-                   textcolor="{{ Theme.ScoreboardModule_ScoreboardHeader_Text }}"/>
-            <label id="author_name" pos="5 -2.5" textprefix="by " text="AUTHOR NAME" valign="center" textsize="1.6" textfont="{{ Font.Thin }}"
-                   textcolor="{{ Theme.ScoreboardModule_ScoreboardHeader_Text }}"/>
-        </frame>
-
-        <frame pos="{{ w - 1.0 }} {{ headerHeight / -2.0 }}">
-            <frame pos="0 2.5">
-                <label id="round_label"
-                       pos="-4 0"
-                       valign="center"
-                       halign="right"
-                       textsize="2.2"
-                       textcolor="{{ Theme.ScoreboardModule_ScoreboardHeader_Text }}"
-                       textfont="{{ Font.Regular }}"/>
-            </frame>
-
-            <!-- Sub Text (Below highlighted box) -->
-            <label id="sub_text"
-                   pos="-8 -2.25"
-                   textcolor="{{ Theme.ScoreboardModule_ScoreboardHeader_Text }}"
-                   valign="center"
-                   halign="right"
-                   textsize="1.1"
-                   textfont="{{ Font.Thin }}"
-                   opacity="0.85"
-            />
-
-            <!-- Settings Icon -->
-            <label id="settings_icon"
-                   pos="-5.5 -2.45"
-                   size="5 5"
-                   textcolor="{{ Theme.ScoreboardModule_ScoreboardHeader_Text }}"
-                   valign="center"
-                   halign="center"
-                   textsize="1.1"
-                   text="{{ Icons.Cog }}"
-                   textfont="{{ Font.Thin }}"
-                   ScriptEvents="1"
-                   focusareacolor1="0000"
-                   focusareacolor2="0000"
-                   opacity="0.65"
-            />
-        </frame>
-
-        <quad if='Theme.ScoreboardModule_ScoreboardHeader_Logo  != ""'
-              pos="{{ w / 2.0 }} 0"
-              image="{{ Theme.ScoreboardModule_ScoreboardHeader_Logo }}"
-              valign="center"
-              halign="center"
-              size="32 32"
-              keepratio="Fit"
-              z-index="50"
-        />
-    </template>
-</component>
\ No newline at end of file
diff --git a/src/Modules/Scoreboard/Templates/Components/Scrollbar.mt b/src/Modules/Scoreboard/Templates/Components/Scrollbar.mt
deleted file mode 100644
index 61d55dddb..000000000
--- a/src/Modules/Scoreboard/Templates/Components/Scrollbar.mt
+++ /dev/null
@@ -1,73 +0,0 @@
-<component>
-    <property type="string" name="id"/>
-    <property type="string" name="accentColor"/>
-    <property type="int" name="visiblePlayers"/>
-    <property type="double" name="w" default="0.0"/>
-    <property type="double" name="h" default="0.0"/>
-    <property type="double" name="x" default="0.0"/>
-    <property type="double" name="y" default="0.0"/>
-    <property type="double" name="opacity" default="1.0"/>
-    <property type="int" name="zIndex" default="0"/>
-    <property type="double" name="rowHeight" default="-1.0"/>
-
-    <template>
-        <frame id="{{ id }}" pos="{{ x }} {{ y }}" size="{{ w }} {{ h }}" z-index="{{ zIndex }}">
-            <!-- 0: top left corner -->
-            <frame size="0.5 0.5">
-                <quad size="1 1"
-                      modulatecolor="{{ accentColor }}"
-                      image="file:///Media/Painter/Stencils/01-EllipseRound/Brush.tga"
-                      opacity="{{ opacity }}"/>
-            </frame>
-
-            <!-- 1: bottom left corner -->
-            <frame size="0.5 0.5" pos="0 {{ -h }}" rot="270">
-                <quad size="1 1"
-                      modulatecolor="{{ accentColor }}"
-                      image="file:///Media/Painter/Stencils/01-EllipseRound/Brush.tga"
-                      opacity="{{ opacity }}"
-                />
-            </frame>
-
-            <!-- 2: center quad -->
-            <quad pos="0.5 0" size="{{ w - 0.5 }} {{ h }}" bgcolor="{{ accentColor }}" opacity="{{ opacity }}"/>
-
-            <!-- 3: right bar -->
-            <quad pos="0 -0.5" size="0.5 {{ h - 1.0 }}" bgcolor="{{ accentColor }}" opacity="{{ opacity }}"/>
-        </frame>
-    </template>
-
-    <script once="true">
-        <!--        
-        declare CMlFrame ScrollHandleFrame;
-        declare CMlFrame ScrollBgFrame;
-        
-        Void SetScrollbarPosition(CMlFrame rowsFrame, Integer playerRowsFilled, Integer rowsShown) {
-            if(playerRowsFilled > {{ visiblePlayers }}){
-                ScrollHandleFrame.Show();
-            }else{
-                ScrollHandleFrame.Hide();
-                return;
-            }
-            
-            declare Real maxScroll = playerRowsFilled * {{ rowHeight }};
-            declare Real adjustedViewPortHeight = maxScroll - (rowsShown * {{ rowHeight }});
-            declare Real scrollOffset = rowsFrame.ScrollOffset.Y;
-            declare Real scrollableHeight = ScrollBgFrame.Size.Y - ScrollHandleFrame.Size.Y;
-            declare Real ratio = scrollOffset / adjustedViewPortHeight;
-            ScrollHandleFrame.RelativePosition_V3.Y = ratio * scrollableHeight * -1.0;
-        }
-        
-        *** OnInitialization *** 
-        ***
-            ScrollHandleFrame <=> (Page.MainFrame.GetFirstChild("scrollbar_handle") as CMlFrame);
-            ScrollBgFrame <=> (Page.MainFrame.GetFirstChild("scrollbar_bg") as CMlFrame);
-        ***
-        
-        *** OnLoop *** 
-        ***
-            SetScrollbarPosition(RowsFrame, PlayerRowsFilled, PlayerRowsVisible);
-        ***
-        -->
-    </script>
-</component>
\ No newline at end of file
diff --git a/src/Modules/Scoreboard/Themes/DefaultScoreboardTheme.cs b/src/Modules/Scoreboard/Themes/DefaultScoreboardTheme.cs
deleted file mode 100644
index e9a88b652..000000000
--- a/src/Modules/Scoreboard/Themes/DefaultScoreboardTheme.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using EvoSC.Common.Interfaces.Themes;
-using EvoSC.Common.Themes;
-using EvoSC.Common.Themes.Attributes;
-using EvoSC.Common.Util;
-
-namespace EvoSC.Modules.Official.Scoreboard.Themes;
-
-[Theme(Name = "Scoreboard", Description = "Default theme for the scoreboard.")]
-public class DefaultScoreboardTheme(IThemeManager theme) : Theme<DefaultScoreboardTheme>
-{
-    private readonly dynamic _theme = theme.Theme;
-
-    public override Task ConfigureAsync()
-    {
-        Set("ScoreboardModule.BackgroundBox.BgHeader").To(_theme.UI_BgPrimary);
-        Set("ScoreboardModule.BackgroundBox.BgHeaderGrad").To(ColorUtils.Darken(_theme.UI_BgPrimary));
-        Set("ScoreboardModule.BackgroundBox.BgList").To(_theme.UI_BgHighlight);
-        
-        Set("ScoreboardModule.ScoreboardHeader.Text").To(_theme.UI_TextPrimary);
-        Set("ScoreboardModule.ScoreboardHeader.Logo").To(_theme.UI_LogoLight);
-        
-        Set("ScoreboardModule.ClubTag.Bg").To(_theme.UI_BgHighlight);
-        
-        Set("ScoreboardModule.PlayerRow.Text").To(_theme.UI_TextPrimary);
-        Set("ScoreboardModule.PlayerRow.CustomLabelBackground.Bg").To(_theme.Black);
-        
-        Set("ScoreboardModule.PlayerRow.PlayerActions.BgHighlight").To(_theme.UI_BgHighlight);
-        
-        Set("ScoreboardModule.PlayerRow.PlayerRowBackground.Bg").To(ColorUtils.Lighten(_theme.UI_BgHighlight));
-        Set("ScoreboardModule.PlayerRow.PlayerRowBackground.BgHighlight").To(ColorUtils.SetLightness(_theme.UI_BgHighlight, 70));
-
-        Set("ScoreboardModule.PlayerRow.PointsBox.Bg").To(ColorUtils.SetLightness(_theme.UI_BgHighlight, 70));
-        Set("ScoreboardModule.PlayerRow.PointsBox.Text").To(ColorUtils.SetLightness(_theme.UI_BgHighlight, 20));
-        
-        Set("ScoreboardModule.PlayerRow.PositionBox.Bg").To(_theme.UI_BgHighlight);
-        
-        Set("ScoreboardModule.PlayerRow.FrameModel.Bg").To(_theme.UI_BgHighlight);
-        
-        Set("ScoreboardModule.PlayerRow.FrameModel.Text").To(_theme.UI_TextPrimary);
-        Set("ScoreboardModule.PlayerRow.FrameModel.BgRow").To(_theme.UI_BgHighlight);
-        Set("ScoreboardModule.PlayerRow.FrameModel.TextRoundPoints").To(_theme.UI_TextSecondary);
-        
-        Set("ScoreboardModule.Scoreboard.BgPosition").To(_theme.UI_BgHighlight);
-        
-        Set("ScoreboardModule.Settings.Text").To(_theme.UI_TextPrimary);
-
-        return Task.CompletedTask;
-    }
-}
diff --git a/src/Modules/ScoreboardModule/Config/IScoreboardSettings.cs b/src/Modules/ScoreboardModule/Config/IScoreboardSettings.cs
new file mode 100644
index 000000000..60b50627b
--- /dev/null
+++ b/src/Modules/ScoreboardModule/Config/IScoreboardSettings.cs
@@ -0,0 +1,15 @@
+using System.ComponentModel;
+using Config.Net;
+using EvoSC.Modules.Attributes;
+
+namespace EvoSC.Modules.Official.ScoreboardModule.Config;
+
+[Settings]
+public interface IScoreboardSettings
+{
+    [Option(DefaultValue = 160.0), Description("Sets the width of the scoreboard.")]
+    public double Width { get; }
+
+    [Option(DefaultValue = 80.0), Description("Sets the height of the scoreboard.")]
+    public double Height { get; }
+}
diff --git a/src/Modules/ScoreboardModule/Controllers/ScoreboardEventController.cs b/src/Modules/ScoreboardModule/Controllers/ScoreboardEventController.cs
new file mode 100644
index 000000000..9943a7af6
--- /dev/null
+++ b/src/Modules/ScoreboardModule/Controllers/ScoreboardEventController.cs
@@ -0,0 +1,28 @@
+using EvoSC.Common.Controllers;
+using EvoSC.Common.Controllers.Attributes;
+using EvoSC.Common.Events.Attributes;
+using EvoSC.Common.Interfaces.Controllers;
+using EvoSC.Common.Remote;
+using EvoSC.Modules.Official.ScoreboardModule.Interfaces;
+using GbxRemoteNet.Events;
+
+namespace EvoSC.Modules.Official.ScoreboardModule.Controllers;
+
+[Controller]
+public class ScoreboardEventController(
+    IScoreboardService scoreboardService,
+    IScoreboardNicknamesService nicknamesService
+)
+    : EvoScController<IEventControllerContext>
+{
+    [Subscribe(GbxRemoteEvent.PlayerConnect)]
+    public Task OnPlayerConnectAsync(object sender, PlayerGbxEventArgs args) =>
+        nicknamesService.AddNicknameByLoginAsync(args.Login);
+
+    [Subscribe(GbxRemoteEvent.BeginMap)]
+    public async Task OnBeginMapAsync(object sender, MapGbxEventArgs args)
+    {
+        await nicknamesService.LoadNicknamesAsync();
+        await scoreboardService.SendScoreboardAsync();
+    }
+}
diff --git a/src/Modules/ScoreboardModule/Interfaces/IScoreboardNicknamesService.cs b/src/Modules/ScoreboardModule/Interfaces/IScoreboardNicknamesService.cs
new file mode 100644
index 000000000..a3023558b
--- /dev/null
+++ b/src/Modules/ScoreboardModule/Interfaces/IScoreboardNicknamesService.cs
@@ -0,0 +1,50 @@
+namespace EvoSC.Modules.Official.ScoreboardModule.Interfaces;
+
+public interface IScoreboardNicknamesService
+{
+    /// <summary>
+    /// Gets the online player by login and then sets their custom nickname in the repo.
+    /// </summary>
+    /// <param name="login"></param>
+    /// <returns></returns>
+    public Task AddNicknameByLoginAsync(string login);
+    
+    /// <summary>
+    /// Clears the nicknames repo.
+    /// </summary>
+    /// <returns></returns>
+    public Task ClearNicknamesAsync();
+    
+    /// <summary>
+    /// Gets all online players and sets their custom nicknames in the repo.
+    /// </summary>
+    /// <returns></returns>
+    public Task LoadNicknamesAsync();
+
+    /// <summary>
+    /// Sends the manialink containing the nicknames in the repo.
+    /// </summary>
+    /// <returns></returns>
+    public Task SendNicknamesManialinkAsync();
+    
+    /// <summary>
+    /// Converts the nickname repo to a ManiaScript array.
+    /// </summary>
+    /// <param name="nicknameMap"></param>
+    /// <returns></returns>
+    public string ToManiaScriptArray(Dictionary<string, string> nicknameMap);
+
+    /// <summary>
+    /// Converts an entry of the nickname repo to a ManiaScript array entry.
+    /// </summary>
+    /// <param name="loginNickname"></param>
+    /// <returns></returns>
+    public string ToManiaScriptArrayEntry(KeyValuePair<string, string> loginNickname);
+
+    /// <summary>
+    /// Escapes a nickname to be safely inserted into a XMl comment.
+    /// </summary>
+    /// <param name="nickname"></param>
+    /// <returns></returns>
+    public string EscapeNickname(string nickname);
+}
diff --git a/src/Modules/ScoreboardModule/Interfaces/IScoreboardService.cs b/src/Modules/ScoreboardModule/Interfaces/IScoreboardService.cs
new file mode 100644
index 000000000..9dc5c0624
--- /dev/null
+++ b/src/Modules/ScoreboardModule/Interfaces/IScoreboardService.cs
@@ -0,0 +1,19 @@
+namespace EvoSC.Modules.Official.ScoreboardModule.Interfaces;
+
+public interface IScoreboardService
+{
+    /// <summary>
+    /// Sends the scoreboard manialink to all players.
+    /// </summary>
+    public Task SendScoreboardAsync();
+    
+    /// <summary>
+    /// Hide the default game scoreboard.
+    /// </summary>
+    public Task HideNadeoScoreboardAsync();
+    
+    /// <summary>
+    /// Shows the default game scoreboard.
+    /// </summary>
+    public Task ShowNadeoScoreboardAsync();
+}
diff --git a/src/Modules/Scoreboard/Localization.resx b/src/Modules/ScoreboardModule/Localization.resx
similarity index 100%
rename from src/Modules/Scoreboard/Localization.resx
rename to src/Modules/ScoreboardModule/Localization.resx
diff --git a/src/Modules/ScoreboardModule/ScoreboardModule.cs b/src/Modules/ScoreboardModule/ScoreboardModule.cs
new file mode 100644
index 000000000..6d8235ca3
--- /dev/null
+++ b/src/Modules/ScoreboardModule/ScoreboardModule.cs
@@ -0,0 +1,20 @@
+using EvoSC.Modules.Attributes;
+using EvoSC.Modules.Interfaces;
+using EvoSC.Modules.Official.ScoreboardModule.Interfaces;
+
+namespace EvoSC.Modules.Official.ScoreboardModule;
+
+[Module(IsInternal = true)]
+public class ScoreboardModule(IScoreboardService scoreboardService, IScoreboardNicknamesService nicknamesService)
+    : EvoScModule, IToggleable
+{
+    public async Task EnableAsync()
+    {
+        await nicknamesService.LoadNicknamesAsync();
+        await scoreboardService.HideNadeoScoreboardAsync();
+        await scoreboardService.SendScoreboardAsync();
+    }
+
+    public Task DisableAsync() =>
+        scoreboardService.ShowNadeoScoreboardAsync();
+}
diff --git a/src/Modules/Scoreboard/Scoreboard.csproj b/src/Modules/ScoreboardModule/ScoreboardModule.csproj
similarity index 93%
rename from src/Modules/Scoreboard/Scoreboard.csproj
rename to src/Modules/ScoreboardModule/ScoreboardModule.csproj
index b1ff40dea..456dbbf3f 100644
--- a/src/Modules/Scoreboard/Scoreboard.csproj
+++ b/src/Modules/ScoreboardModule/ScoreboardModule.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <RootNamespace>EvoSC.Modules.Official.Scoreboard</RootNamespace>
+        <RootNamespace>EvoSC.Modules.Official.ScoreboardModule</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Modules/ScoreboardModule/Services/ScoreboardNicknamesService.cs b/src/Modules/ScoreboardModule/Services/ScoreboardNicknamesService.cs
new file mode 100644
index 000000000..7619688c8
--- /dev/null
+++ b/src/Modules/ScoreboardModule/Services/ScoreboardNicknamesService.cs
@@ -0,0 +1,68 @@
+using EvoSC.Common.Interfaces.Services;
+using EvoSC.Common.Services.Attributes;
+using EvoSC.Common.Services.Models;
+using EvoSC.Common.Util;
+using EvoSC.Manialinks.Interfaces;
+using EvoSC.Modules.Official.ScoreboardModule.Interfaces;
+
+namespace EvoSC.Modules.Official.ScoreboardModule.Services;
+
+[Service(LifeStyle = ServiceLifeStyle.Singleton)]
+public class ScoreboardNicknamesService(
+    IPlayerManagerService playerManagerService,
+    IManialinkManager manialinkManager
+) : IScoreboardNicknamesService
+{
+    private readonly Dictionary<string, string> _nicknames = new();
+
+    public async Task AddNicknameByLoginAsync(string login)
+    {
+        var player = await playerManagerService.GetOnlinePlayerAsync(PlayerUtils.ConvertLoginToAccountId(login));
+
+        if (player.NickName == player.UbisoftName)
+        {
+            return;
+        }
+
+        _nicknames[login] = player.NickName;
+    }
+
+    public Task ClearNicknamesAsync()
+    {
+        _nicknames.Clear();
+
+        return Task.CompletedTask;
+    }
+
+    public async Task LoadNicknamesAsync()
+    {
+        var onlinePlayers = await playerManagerService.GetOnlinePlayersAsync();
+        foreach (var player in onlinePlayers.Where(player => player.NickName != player.UbisoftName))
+        {
+            _nicknames[player.GetLogin()] = player.NickName;
+        }
+    }
+
+    public Task SendNicknamesManialinkAsync() =>
+        manialinkManager.SendPersistentManialinkAsync("ScoreboardModule.PlayerNicknames",
+            new { nicknames = ToManiaScriptArray(_nicknames) });
+
+    public string ToManiaScriptArray(Dictionary<string, string> nicknameMap)
+    {
+        var entriesList = nicknameMap.Select(ToManiaScriptArrayEntry).ToList();
+        var joinedEntries = string.Join(",\n", entriesList);
+
+        return $"[{joinedEntries}]";
+    }
+
+    public string ToManiaScriptArrayEntry(KeyValuePair<string, string> loginNickname)
+    {
+        return $"\"{loginNickname.Key}\" => \"{EscapeNickname(loginNickname.Value)}\"";
+    }
+
+    public string EscapeNickname(string nickname)
+    {
+        return nickname.Replace("-->", "-\u2192", StringComparison.OrdinalIgnoreCase)
+            .Replace("\"", "\\\"", StringComparison.OrdinalIgnoreCase);
+    }
+}
diff --git a/src/Modules/ScoreboardModule/Services/ScoreboardService.cs b/src/Modules/ScoreboardModule/Services/ScoreboardService.cs
new file mode 100644
index 000000000..941f496fc
--- /dev/null
+++ b/src/Modules/ScoreboardModule/Services/ScoreboardService.cs
@@ -0,0 +1,58 @@
+using EvoSC.Common.Interfaces;
+using EvoSC.Common.Services.Attributes;
+using EvoSC.Common.Services.Models;
+using EvoSC.Manialinks.Interfaces;
+using EvoSC.Modules.Official.GameModeUiModule.Enums;
+using EvoSC.Modules.Official.GameModeUiModule.Interfaces;
+using EvoSC.Modules.Official.ScoreboardModule.Config;
+using EvoSC.Modules.Official.ScoreboardModule.Interfaces;
+
+namespace EvoSC.Modules.Official.ScoreboardModule.Services;
+
+[Service(LifeStyle = ServiceLifeStyle.Transient)]
+public class ScoreboardService(
+    IManialinkManager manialinks,
+    IServerClient server,
+    IScoreboardNicknamesService nicknamesService,
+    IScoreboardSettings settings,
+    IGameModeUiModuleService gameModeUiModuleService
+)
+    : IScoreboardService
+{
+    private const string ScoreboardTemplate = "ScoreboardModule.Scoreboard";
+
+    public async Task SendScoreboardAsync()
+    {
+        await manialinks.SendPersistentManialinkAsync(ScoreboardTemplate, await GetDataAsync());
+        await nicknamesService.SendNicknamesManialinkAsync();
+    }
+
+    private async Task<dynamic> GetDataAsync()
+    {
+        var currentNextMaxPlayers = await server.Remote.GetMaxPlayersAsync();
+        var currentNextMaxSpectators = await server.Remote.GetMaxSpectatorsAsync();
+
+        return new
+        {
+            settings, MaxPlayers = currentNextMaxPlayers.CurrentValue + currentNextMaxSpectators.CurrentValue
+        };
+    }
+
+    public Task HideNadeoScoreboardAsync() =>
+        gameModeUiModuleService.ApplyComponentSettingsAsync(
+            GameModeUiComponents.ScoresTable,
+            false,
+            0.0,
+            0.0,
+            1.0
+        );
+
+    public Task ShowNadeoScoreboardAsync() =>
+        gameModeUiModuleService.ApplyComponentSettingsAsync(
+            GameModeUiComponents.ScoresTable,
+            true,
+            0.0,
+            0.0,
+            1.0
+        );
+}
diff --git a/src/Modules/ScoreboardModule/Templates/Components/Body/Legend.mt b/src/Modules/ScoreboardModule/Templates/Components/Body/Legend.mt
new file mode 100644
index 000000000..b0ad6e0a8
--- /dev/null
+++ b/src/Modules/ScoreboardModule/Templates/Components/Body/Legend.mt
@@ -0,0 +1,86 @@
+<component>
+    <property type="double" name="width"/>
+    <property type="double" name="height"/>
+    <property type="double" name="columnSpacing" default="2.0"/>
+    <property type="double" name="positionBoxWidth" default="9.6"/>
+    <property type="double" name="flagWidth" default="9.6"/>
+    <property type="double" name="clubTagWidth" default="9.6"/>
+
+    <template>
+        <quad size="{{ width }} {{ height }}"
+              bgcolor="{{ Theme.ScoreboardModule_Background_Legend_Color }}"
+              opacity="{{ Theme.ScoreboardModule_Background_Legend_Opacity }}"
+        />
+        <label text="POS"
+               class="text-primary"
+               pos="{{ positionBoxWidth/2.0 }} {{ height / -2 + 0.25 }}"
+               halign="center"
+               valign="center"
+               textsize="{{ Theme.UI_FontSize*0.2 }}"
+               textcolor="{{ Theme.ScoreboardModule_Background_Legend_Text_Color }}"
+               opacity="{{ Theme.ScoreboardModule_Background_Legend_Text_Opacity }}"
+        />
+        <label text="NAT."
+               class="text-primary"
+               pos="{{ positionBoxWidth+columnSpacing+(flagWidth/2.0) }} {{ height / -2 + 0.25 }}"
+               halign="center"
+               valign="center"
+               textsize="{{ Theme.UI_FontSize*0.2 }}"
+               textcolor="{{ Theme.ScoreboardModule_Background_Legend_Text_Color }}"
+               opacity="{{ Theme.ScoreboardModule_Background_Legend_Text_Opacity }}"
+        />
+        <label text="CLUB"
+               class="text-primary"
+               pos="{{ positionBoxWidth+columnSpacing+flagWidth+columnSpacing+(clubTagWidth/2.0) }} {{ height / -2 + 0.25 }}"
+               halign="center"
+               valign="center"
+               textsize="{{ Theme.UI_FontSize*0.2 }}"
+               textcolor="{{ Theme.ScoreboardModule_Background_Legend_Text_Color }}"
+               opacity="{{ Theme.ScoreboardModule_Background_Legend_Text_Opacity }}"
+        />
+        <label text="NAME"
+               class="text-primary"
+               pos="{{ positionBoxWidth+columnSpacing+flagWidth+columnSpacing+clubTagWidth+columnSpacing }} {{ height / -2 + 0.25 }}"
+               valign="center"
+               textsize="{{ Theme.UI_FontSize*0.2 }}"
+               textcolor="{{ Theme.ScoreboardModule_Background_Legend_Text_Color }}"
+               opacity="{{ Theme.ScoreboardModule_Background_Legend_Text_Opacity }}"
+        />
+
+        <label id="legend_best_time"
+               text="BEST TIME"
+               class="text-primary"
+               pos="{{ width-columnSpacing - 55.0 }} {{ height / -2 + 0.25 }}"
+               valign="center"
+               halign="right"
+               textsize="{{ Theme.UI_FontSize*0.2 }}"
+               textcolor="{{ Theme.ScoreboardModule_Background_Legend_Text_Color }}"
+               opacity="{{ Theme.ScoreboardModule_Background_Legend_Text_Opacity }}"
+        />
+        <label id="legend_score"
+               text="SCORE"
+               class="text-primary"
+               pos="{{ width-columnSpacing }} {{ height / -2 + 0.25 }}"
+               valign="center"
+               halign="right"
+               textsize="{{ Theme.UI_FontSize*0.2 }}"
+               textcolor="{{ Theme.ScoreboardModule_Background_Legend_Text_Color }}"
+               opacity="{{ Theme.ScoreboardModule_Background_Legend_Text_Opacity }}"
+        />
+    </template>
+
+    <script><!--
+    Void UpdateLegend(Boolean isPointsBased) {
+        declare bestTimeLabel <=> (Page.MainFrame.GetFirstChild("legend_best_time") as CMlLabel);
+        declare scoreLabel <=> (Page.MainFrame.GetFirstChild("legend_score") as CMlLabel);
+        
+        if(isPointsBased){
+            bestTimeLabel.Show();
+            scoreLabel.Value = "POINTS";
+        }else{
+            bestTimeLabel.Hide();
+            scoreLabel.Value = "BEST TIME";
+        }
+    }
+    --></script>
+</component>
diff --git a/src/Modules/ScoreboardModule/Templates/Components/Header/HeaderBackground.mt b/src/Modules/ScoreboardModule/Templates/Components/Header/HeaderBackground.mt
new file mode 100644
index 000000000..78adc18e1
--- /dev/null
+++ b/src/Modules/ScoreboardModule/Templates/Components/Header/HeaderBackground.mt
@@ -0,0 +1,11 @@
+<component>
+    <property type="double" name="width" />
+    <property type="double" name="height" />
+
+    <template>
+        <quad size="{{ width }} {{ height }}"
+              bgcolor="{{ Theme.ScoreboardModule_Background_Header_Color }}"
+              opacity="{{ Theme.ScoreboardModule_Background_Header_Opacity }}"
+        />
+    </template>
+</component>
diff --git a/src/Modules/ScoreboardModule/Templates/Components/Header/HeaderContent.mt b/src/Modules/ScoreboardModule/Templates/Components/Header/HeaderContent.mt
new file mode 100644
index 000000000..728922584
--- /dev/null
+++ b/src/Modules/ScoreboardModule/Templates/Components/Header/HeaderContent.mt
@@ -0,0 +1,61 @@
+<component>
+    <using namespace="System.Globalization"/>
+
+    <import component="ScoreboardModule.Components.Header.Logo" as="Logo"/>
+
+    <property type="double" name="width"/>
+    <property type="double" name="height"/>
+    <property type="double" name="padding" default="3.4"/>
+
+    <template>
+        <frame id="header_content" pos="{{ width / 2.0 }} {{ height / -2.0 }}">
+            <label id="header_text_left"
+                   pos="{{ float.Parse(Theme.ScoreboardModule_Logo_Width, CultureInfo.InvariantCulture) * -0.5 - 4.0 }}"
+                   textcolor="{{ Theme.UI_TextPrimary }}"
+                   class="text-lg"
+                   textfont="{{ Font.Regular }}"
+                   halign="right"
+                   valign="center2"
+            />
+            <label id="header_text_right"
+                   pos="{{ float.Parse(Theme.ScoreboardModule_Logo_Width, CultureInfo.InvariantCulture) * 0.5 + 4.0 }}"
+                   textcolor="{{ Theme.UI_TextPrimary }}"
+                   class="text-lg"
+                   textfont="{{ Font.Regular }}"
+                   valign="center2"
+            />
+
+            <Logo if='Theme.ScoreboardModule_Logo_URL != ""'/>
+        </frame>
+    </template>
+
+    <script once="true"><!--
+    declare Integer HeaderContentFrameLastUpdate;
+    declare CMlFrame HeaderContentFrame;
+    declare CMlLabel HeaderContentFrame_TextLeft;
+    declare CMlLabel HeaderContentFrame_TextRight;
+    
+    Void UpdateHeader() {
+        HeaderContentFrame_TextLeft.Value = CurrentServerName;
+        HeaderContentFrame_TextRight.Value = Map.MapName ^ " by " ^ Map.AuthorNickName;
+    }
+    --></script>
+
+    <script><!--
+        *** OnInitialization ***
+        ***
+            HeaderContentFrameLastUpdate = 0;
+            HeaderContentFrame <=> (Page.MainFrame.GetFirstChild("header_content") as CMlFrame);
+            HeaderContentFrame_TextLeft <=> (HeaderContentFrame.GetFirstChild("header_text_left") as CMlLabel);
+            HeaderContentFrame_TextRight <=> (HeaderContentFrame.GetFirstChild("header_text_right") as CMlLabel);
+        ***
+        
+        *** OnLoop *** 
+        ***
+            if(Now > HeaderContentFrameLastUpdate + 2500){
+                HeaderContentFrameLastUpdate = Now;
+                UpdateHeader();
+            }
+        ***
+    --></script>
+</component>
diff --git a/src/Modules/ScoreboardModule/Templates/Components/Header/Logo.mt b/src/Modules/ScoreboardModule/Templates/Components/Header/Logo.mt
new file mode 100644
index 000000000..c1a8ad19a
--- /dev/null
+++ b/src/Modules/ScoreboardModule/Templates/Components/Header/Logo.mt
@@ -0,0 +1,14 @@
+<component>
+    <property type="double" name="x" default="0.0"/>
+    <property type="double" name="y" default="0.0"/>
+
+    <template>
+        <quad pos="{{ x }} {{ y }}"
+              size="{{ Theme.ScoreboardModule_Logo_Width }} {{ Theme.ScoreboardModule_Logo_Height }}"
+              valign="center"
+              halign="center"
+              image="{{ Theme.ScoreboardModule_Logo_URL }}"
+              keepratio="Fit"
+        />
+    </template>
+</component>
diff --git a/src/Modules/ScoreboardModule/Templates/Components/Row/CustomLabelBackground.mt b/src/Modules/ScoreboardModule/Templates/Components/Row/CustomLabelBackground.mt
new file mode 100644
index 000000000..74cf71d74
--- /dev/null
+++ b/src/Modules/ScoreboardModule/Templates/Components/Row/CustomLabelBackground.mt
@@ -0,0 +1,20 @@
+<component>
+    <property type="string" name="id" />
+    <property type="double" name="x" default="0.0"/>
+    <property type="double" name="y" default="0.0"/>
+    <property type="double" name="width" default="0.0"/>
+    <property type="double" name="height" default="0.0"/>
+    
+    <template>
+        <frame id="{{ id }}" pos="{{ x }} {{ y }}">
+            <quad size="{{ height }} {{ width }}"
+                  pos="{{ width }} 0"
+                  rot="-90"
+                  class="modulate"
+                  modulatecolor="ffffff"
+                  opacity="0.25"
+                  image="file:///Media/Painter/Stencils/04-SquareGradient/Brush.tga"
+            />
+        </frame>
+    </template>
+</component>
\ No newline at end of file
diff --git a/src/Modules/ScoreboardModule/Templates/Components/Row/Flag.mt b/src/Modules/ScoreboardModule/Templates/Components/Row/Flag.mt
new file mode 100644
index 000000000..a53876481
--- /dev/null
+++ b/src/Modules/ScoreboardModule/Templates/Components/Row/Flag.mt
@@ -0,0 +1,11 @@
+<component>
+    <property type="double" name="height" />
+    
+    <template>
+        <quad id="flag"
+              size="{{ height * 1.5 }} {{ height * 0.75 }}"
+              valign="center"
+              alphamask="{{ Theme.ScoreboardModule_Background_Row_Flag_AlphaMaskUrl }}"
+        />
+    </template>
+</component>
diff --git a/src/Modules/ScoreboardModule/Templates/Components/Row/Framemodel.mt b/src/Modules/ScoreboardModule/Templates/Components/Row/Framemodel.mt
new file mode 100644
index 000000000..e38ae2fbe
--- /dev/null
+++ b/src/Modules/ScoreboardModule/Templates/Components/Row/Framemodel.mt
@@ -0,0 +1,244 @@
+<component>
+    <using namespace="EvoSC.Modules.Official.ScoreboardModule.Config"/>
+    
+    <import component="ScoreboardModule.Components.Row.CustomLabelBackground" as="CustomLabelBackground"/>
+    <import component="ScoreboardModule.Components.Row.PlayerRowBackground" as="PlayerRowBackground"/>
+    <import component="ScoreboardModule.Components.Row.PlayerActions" as="PlayerActions"/>
+    <import component="ScoreboardModule.Components.Row.PositionBox" as="PositionBox"/>
+    <import component="ScoreboardModule.Components.Row.Flag" as="Flag"/>
+
+    <property type="IScoreboardSettings" name="settings"/>
+    <property type="double" name="w"/>
+    <property type="double" name="padding"/>
+    <property type="double" name="rowHeight"/>
+    <property type="double" name="rowSpacing"/>
+    <property type="double" name="columnSpacing"/>
+    <property type="double" name="innerSpacing"/>
+    <property type="double" name="rowInnerHeight"/>
+    <property type="double" name="pointsWidth"/>
+    <property type="int" name="actionButtonCount"/>
+
+    <property type="double" name="textSize" default="2.4"/>
+    <property type="double" name="positionBoxWidth" default="9.6"/>
+
+    <template>
+        <framemodel id="player_row">
+            <!-- Scroll activation -->
+            <quad id="player_row_trigger"
+                  size="{{ w }} {{ rowHeight + rowSpacing }}"
+                  ScriptEvents="1"
+            />
+
+            <!-- Player Row Background -->
+            <PlayerRowBackground id="player_row_bg"
+                                 rowHeight="{{ rowHeight }}"
+                                 padding="{{ padding }}"
+                                 w="{{ w - positionBoxWidth }}"
+                                 h="{{ rowHeight }}"
+                                 x="{{ positionBoxWidth }}"
+            />
+
+            <!-- Position Box -->
+            <PositionBox width="{{ positionBoxWidth }}"
+                         height="{{ rowHeight }}"
+                         settings="{{ settings }}"
+            />
+
+            <!-- Custom Label Background -->
+            <CustomLabelBackground id="custom_gradient"
+                                   x="{{ w }}"
+                                   width="{{ w }}"
+                                   height="{{ rowHeight }}"
+            />
+
+            <frame pos="{{ positionBoxWidth + columnSpacing }} {{ rowHeight / -2.0 }}" z-index="10">
+                <!-- Flag -->
+                <Flag height="{{ rowInnerHeight }}" />
+
+                <frame pos="{{ rowInnerHeight * 1.5 + columnSpacing }} 0">
+                    <quad id="club_bg"
+                          size="{{ rowInnerHeight * 1.5 }} {{ rowInnerHeight * 0.75 }}"
+                          bgcolor="f00"
+                          valign="center"
+                          hidden="1"
+                    />
+                    <label id="club"
+                           class="text-primary"
+                           text="CLUB"
+                           pos="{{ rowInnerHeight * 0.75 }} 0"
+                           size="{{ rowInnerHeight * 2.0 }} {{ rowInnerHeight }}"
+                           valign="center2"
+                           halign="center"
+                           textsize="{{ Theme.UI_FontSize*2 }}"
+                           textcolor="{{ Theme.ScoreboardModule_Text_Color }}"
+                    />
+                </frame>
+
+                <!-- Player Name -->
+                <label id="name"
+                       pos="{{ rowInnerHeight * 3.0 + columnSpacing * 2.0 }} 0"
+                       size="{{ w / 3.0 }} {{ rowHeight }}"
+                       valign="center2"
+                       textsize="{{ Theme.UI_FontSize*2 }}"
+                       textfont="{{ Font.Regular }}"
+                       textcolor="{{ Theme.ScoreboardModule_Text_Color }}"
+                />
+            </frame>
+            <frame id="details_wrapper" z-index="10">
+                <!-- Spec/Disconnected -->
+                <label id="spec_disconnected_label" pos="0 {{ rowHeight / -2.0 }}"
+                       class="text-muted"
+                       valign="center2"
+                       halign="right"
+                       textsize="{{ Theme.UI_FontSize*2 }}"
+                />
+
+                <!-- Round Points -->
+                <label id="round_points" pos="0 {{ rowHeight / -2.0 }}"
+                       class="text-primary"
+                       valign="center2"
+                       halign="right"
+                       textsize="{{ Theme.UI_FontSize*2 }}"
+                       textcolor="{{ Theme.ScoreboardModule_GainedPoints_Color }}"
+                />
+
+                <!-- Custom Label (FINALIST, etc) -->
+                <label id="custom_label"
+                       class="text-primary"
+                       pos="0 {{ rowHeight / -2.0 }}"
+                       valign="center2"
+                       halign="right"
+                       textsize="{{ Theme.UI_FontSize*2 }}"
+                       textcolor="{{ Theme.ScoreboardModule_Text_Color }}"
+                />
+
+                <!-- Best Time -->
+                <label id="best_time"
+                       class="text-primary"
+                       pos="{{ w - columnSpacing - 55.0 }} {{ rowHeight / -2.0 }}"
+                       valign="center2"
+                       halign="right"
+                       textsize="{{ Theme.UI_FontSize*2 }}"
+                       textcolor="{{ Theme.ScoreboardModule_Text_Color }}"
+                       text="0:00.000"
+                />
+
+                <!-- Player Score -->
+                <label id="score"
+                       class="text-primary"
+                       pos="{{ w - columnSpacing }} {{ rowHeight / -2.0 }}"
+                       valign="center2"
+                       halign="right"
+                       textsize="{{ Theme.UI_FontSize*2 }}"
+                       textcolor="{{ Theme.ScoreboardModule_Text_Color }}"
+                />
+            </frame>
+            <PlayerActions x="{{ w }}"
+                           y="{{ rowHeight / -2.0 }}"
+                           rowHeight="{{ rowHeight }}"
+                           rowSpacing="{{ rowSpacing }}"
+                           textsize="{{ textSize }}"
+            />
+        </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>
+</component>
diff --git a/src/Modules/Scoreboard/Templates/Components/PlayerRow/PlayerActions.mt b/src/Modules/ScoreboardModule/Templates/Components/Row/PlayerActions.mt
similarity index 59%
rename from src/Modules/Scoreboard/Templates/Components/PlayerRow/PlayerActions.mt
rename to src/Modules/ScoreboardModule/Templates/Components/Row/PlayerActions.mt
index 58ad3f4de..45d13b8a1 100644
--- a/src/Modules/Scoreboard/Templates/Components/PlayerRow/PlayerActions.mt
+++ b/src/Modules/ScoreboardModule/Templates/Components/Row/PlayerActions.mt
@@ -2,36 +2,36 @@
     <property type="double" name="x" default="0.0"/>
     <property type="double" name="y" default="0.0"/>
     <property type="double" name="rowHeight" default="0.0"/>
-    <property type="double" name="textsize" default="1.0"/>
-    <property type="double" name="innerSpacing" default="0.0"/>
+    <property type="double" name="rowSpacing" default="0.5"/>
 
     <template>
-        <frame id="player_actions" pos="{{ x }} {{ y }}" hidden="1">
+        <frame id="player_actions" pos="{{ x - (rowHeight*1.2)/2.0 }} {{ y }}" hidden="1">
             <!-- SPECTATE -->
           <label id="spectate_player"
-                 pos="{{ rowHeight * -0.5 - innerSpacing }}"
-                 size="{{ rowHeight }} {{ rowHeight }}"
+                 class="text-primary"
+                 size="{{ rowHeight*1.2 }} {{ rowHeight }}"
                  valign="center"
                  halign="center"
-                 text="{{ Icons.Eye }}"
-                 textsize="{{ textsize }}"
+                 text="{{ Icons.VideoCamera }}"
+                 textsize="{{ Theme.UI_FontSize*2 }}"
                  ScriptEvents="1"
-                 focusareacolor1="0000"
-                 focusareacolor2="{{ Theme.ScoreboardModule_PlayerRow_PlayerActions_BgHighlight }}"
-                 textcolor="{{ Theme.ScoreboardModule_PlayerRow_Text }}"/>
+                 focusareacolor1="{{ Theme.UI_HeaderBg }}"
+                 focusareacolor2="{{ Theme.ScoreboardModule_Background_Hover_Color }}"
+                 textcolor="{{ Theme.ScoreboardModule_Text_Color }}"/>
 
           <!-- PROFILE -->
           <label id="show_player_profile"
-                 pos="{{ rowHeight * -1.5 - innerSpacing }}"
-                 size="{{ rowHeight }} {{ rowHeight }}"
+                 class="text-primary"
+                 pos="{{ rowHeight*-1.2 - rowSpacing }}"
+                 size="{{ rowHeight*1.2 }} {{ rowHeight }}"
                  valign="center"
                  halign="center"
-                 text="{{ Icons.VcardO }}"
-                 textsize="{{ textsize }}"
+                 text="{{ Icons.Vcard }}"
+                 textsize="{{ Theme.UI_FontSize*2 }}"
                  ScriptEvents="1"
-                 focusareacolor1="0000"
-                 focusareacolor2="{{ Theme.ScoreboardModule_PlayerRow_PlayerActions_BgHighlight }}"
-                 textcolor="{{ Theme.ScoreboardModule_PlayerRow_Text }}"/>
+                 focusareacolor1="{{ Theme.UI_HeaderBg }}"
+                 focusareacolor2="{{ Theme.ScoreboardModule_Background_Hover_Color }}"
+                 textcolor="{{ Theme.ScoreboardModule_Text_Color }}"/>
         </frame>
     </template>
 
diff --git a/src/Modules/ScoreboardModule/Templates/Components/Row/PlayerRowBackground.mt b/src/Modules/ScoreboardModule/Templates/Components/Row/PlayerRowBackground.mt
new file mode 100644
index 000000000..8499ed831
--- /dev/null
+++ b/src/Modules/ScoreboardModule/Templates/Components/Row/PlayerRowBackground.mt
@@ -0,0 +1,57 @@
+<component>
+    <property type="string" name="id"/>
+    <property type="double" name="rowHeight"/>
+    <property type="double" name="padding"/>
+    <property type="double" name="w"/>
+    <property type="double" name="h"/>
+    <property type="double" name="x"/>
+
+    <template>
+        <frame id="{{ id }}"
+               pos="{{ x }}"
+        >
+            <quad id="background"
+                  size="{{ w }} {{ h }}"
+                  bgcolor="{{ Theme.ScoreboardModule_Background_Row_Color }}"
+                  opacity="{{ Theme.ScoreboardModule_Background_Row_Opacity }}"
+            />
+            <frame pos="{{ w / 2.0 }} {{ h / -2.0 }}">
+                <quad id="custom_gradient"
+                      size="{{ h }} {{ w }}"
+                      pos="{{ w / -2.0 }} {{ h / -2.0 }}"
+                      rot="-90"
+                      image="file:///Media/Painter/Stencils/04-SquareGradient/Brush.tga"
+                      modulatecolor="{{ Theme.UI_AccentPrimary }}"
+                      opacity="0.25"
+                />
+            </frame>
+        </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>
+</component>
\ No newline at end of file
diff --git a/src/Modules/ScoreboardModule/Templates/Components/Row/PositionBox.mt b/src/Modules/ScoreboardModule/Templates/Components/Row/PositionBox.mt
new file mode 100644
index 000000000..9286387b3
--- /dev/null
+++ b/src/Modules/ScoreboardModule/Templates/Components/Row/PositionBox.mt
@@ -0,0 +1,58 @@
+<component>
+    <using namespace="EvoSC.Modules.Official.ScoreboardModule.Config"/>
+
+    <property type="IScoreboardSettings" name="settings"/>
+    <property type="double" name="accentBarWidth" default="1.0"/>
+    <property type="double" name="x" default="0.0"/>
+    <property type="double" name="y" default="0.0"/>
+    <property type="double" name="width"/>
+    <property type="double" name="height"/>
+
+    <template>
+        <frame id="position_box" pos="{{ x }} {{ y }}">
+            <quad if='Theme.ScoreboardModule_PositionBox_ShowAccent == "True"'
+                  id="position_box_accent"
+                  class="accent-primary"
+                  size="{{ accentBarWidth }} {{ height }}"
+            />
+            <quad id="position_box_background"
+                  class="accent-secondary"
+                  pos='{{ Theme.ScoreboardModule_PositionBox_ShowAccent=="True" ? accentBarWidth : 0 }}'
+                  size='{{ Theme.ScoreboardModule_PositionBox_ShowAccent=="True" ? (width - accentBarWidth) : (width) }} {{ height }}'
+                  bgcolor="{{ Theme.ScoreboardModule_PositionBox_Color }}"
+                  opacity="{{ Theme.ScoreboardModule_PositionBox_Opacity }}"
+            />
+            <label id="position_box_position_rank"
+                   pos='{{ (width-(Theme.ScoreboardModule_PositionBox_ShowAccent=="True" ? accentBarWidth : 0)) / 2.0 + (Theme.ScoreboardModule_PositionBox_ShowAccent=="True" ? accentBarWidth : 0) }} {{ height / -2.0 + 0.25 }}'
+                   valign="center"
+                   halign="center"
+                   textsize="{{ Theme.UI_FontSize*2 }}"
+                   textfont="{{ Font.ExtraBold }}"
+                   textcolor="{{ Theme.ScoreboardModule_PositionBox_TextColor }}"
+                   opacity="{{ Theme.ScoreboardModule_PositionBox_TextOpacity }}"
+            />
+        </frame>
+    </template>
+
+    <script once="true">
+        <!--
+        Void SetPositionBoxColor(CMlFrame backgroundFrame, Vec3 accentColor, Vec3 secondaryColor) {
+            if(!{{ Theme.ScoreboardModule_PositionBox_ShowAccent }}) return;
+        
+            declare accentQuad <=> (backgroundFrame.GetFirstChild("position_box_accent") as CMlQuad);
+            declare bgQuad <=> (backgroundFrame.GetFirstChild("position_box_background") as CMlQuad);
+            if(accentQuad.BgColor != accentColor) accentQuad.BgColor = accentColor;
+            if(bgQuad.BgColor != secondaryColor) bgQuad.BgColor = secondaryColor;
+        }
+        
+        Void SetPositionBoxColor(CMlFrame backgroundFrame, Vec3 color) {
+            SetPositionBoxColor(backgroundFrame, color, {! Color.ToMlColor(Theme.UI_AccentSecondary) !});
+        }
+        
+        Void SetPlayerRank(CMlFrame pointsBoxFrame, Integer rank) {
+            declare positionLabel = (pointsBoxFrame.GetFirstChild("position_box_position_rank") as CMlLabel);
+            positionLabel.Value = rank ^ "";
+        }
+        -->
+    </script>
+</component>
diff --git a/src/Modules/ScoreboardModule/Templates/Components/ScoreboardBg.mt b/src/Modules/ScoreboardModule/Templates/Components/ScoreboardBg.mt
new file mode 100644
index 000000000..edf86e156
--- /dev/null
+++ b/src/Modules/ScoreboardModule/Templates/Components/ScoreboardBg.mt
@@ -0,0 +1,13 @@
+<component>
+    <property type="double" name="width"/>
+    <property type="double" name="height"/>
+
+    <template>
+        <quad if='Theme.ScoreboardModule_Background_Image != ""'
+              size="{{ width }} {{ height }}"
+              image="{{ Theme.ScoreboardModule_Background_Image }}"
+              opacity="{{ Theme.ScoreboardModule_Background_Opacity }}"
+              keepratio="Fill"
+        />
+    </template>
+</component>
diff --git a/src/Modules/ScoreboardModule/Templates/Components/ScoreboardBody.mt b/src/Modules/ScoreboardModule/Templates/Components/ScoreboardBody.mt
new file mode 100644
index 000000000..403d4b037
--- /dev/null
+++ b/src/Modules/ScoreboardModule/Templates/Components/ScoreboardBody.mt
@@ -0,0 +1,23 @@
+<component>
+    <import component="ScoreboardModule.Components.Body.Legend" as="Legend"/>
+
+    <property type="double" name="width"/>
+    <property type="double" name="height"/>
+    <property type="double" name="y" default="0.0"/>
+    <property type="double" name="rowSpacing" default="0.25"/>
+    <property type="double" name="columnSpacing" default="2.0"/>
+    <property type="double" name="legendHeight" default="4.0"/>
+    <property type="double" name="flagWidth" default="4.0"/>
+    <property type="double" name="clubTagWidth" default="4.0"/>
+
+    <template>
+        <frame pos="0 {{ y }}">
+            <Legend width="{{ width }}"
+                    height="{{ legendHeight }}"
+                    flagWidth="{{ flagWidth }}"
+                    clubTagWidth="{{ clubTagWidth }}"
+                    columnSpacing="{{ columnSpacing }}"
+            />
+        </frame>
+    </template>
+</component>
diff --git a/src/Modules/ScoreboardModule/Templates/Components/ScoreboardHeader.mt b/src/Modules/ScoreboardModule/Templates/Components/ScoreboardHeader.mt
new file mode 100644
index 000000000..1f726082d
--- /dev/null
+++ b/src/Modules/ScoreboardModule/Templates/Components/ScoreboardHeader.mt
@@ -0,0 +1,12 @@
+<component>
+    <import component="ScoreboardModule.Components.Header.HeaderBackground" as="Background"/>
+    <import component="ScoreboardModule.Components.Header.HeaderContent" as="Content"/>
+
+    <property type="double" name="width"/>
+    <property type="double" name="height"/>
+
+    <template>
+        <Background width="{{ width }}" height="{{ height }}"/>
+        <Content width="{{ width }}" height="{{ height }}"/>
+    </template>
+</component>
diff --git a/src/Modules/Scoreboard/Templates/Components/Settings/Form.mt b/src/Modules/ScoreboardModule/Templates/Components/Settings/Form.mt
similarity index 100%
rename from src/Modules/Scoreboard/Templates/Components/Settings/Form.mt
rename to src/Modules/ScoreboardModule/Templates/Components/Settings/Form.mt
diff --git a/src/Modules/Scoreboard/Templates/Components/Settings/Wrapper.mt b/src/Modules/ScoreboardModule/Templates/Components/Settings/Wrapper.mt
similarity index 100%
rename from src/Modules/Scoreboard/Templates/Components/Settings/Wrapper.mt
rename to src/Modules/ScoreboardModule/Templates/Components/Settings/Wrapper.mt
diff --git a/src/Modules/ScoreboardModule/Templates/PlayerNicknames.mt b/src/Modules/ScoreboardModule/Templates/PlayerNicknames.mt
new file mode 100644
index 000000000..5a252187d
--- /dev/null
+++ b/src/Modules/ScoreboardModule/Templates/PlayerNicknames.mt
@@ -0,0 +1,10 @@
+<component>
+    <property type="string" name="nicknames" />    
+    <template/>
+    <script><!--
+    main() {
+        declare Text[Text] EvoSC_Player_Nicknames for UI = [];
+        EvoSC_Player_Nicknames = {! nicknames !};
+    }
+    --></script>
+</component>
diff --git a/src/Modules/Scoreboard/Templates/RoundsInfo.mt b/src/Modules/ScoreboardModule/Templates/RoundsInfo.mt
similarity index 100%
rename from src/Modules/Scoreboard/Templates/RoundsInfo.mt
rename to src/Modules/ScoreboardModule/Templates/RoundsInfo.mt
diff --git a/src/Modules/Scoreboard/Templates/Scoreboard.mt b/src/Modules/ScoreboardModule/Templates/Scoreboard.mt
similarity index 55%
rename from src/Modules/Scoreboard/Templates/Scoreboard.mt
rename to src/Modules/ScoreboardModule/Templates/Scoreboard.mt
index ed59bcc16..5a21a0915 100644
--- a/src/Modules/Scoreboard/Templates/Scoreboard.mt
+++ b/src/Modules/ScoreboardModule/Templates/Scoreboard.mt
@@ -1,84 +1,80 @@
 <component>
+    <using namespace="EvoSC.Modules.Official.ScoreboardModule.Config"/>
     <using namespace="System.Linq"/>
 
-    <import component="Scoreboard.Components.BackgroundBox" as="ScoreboardBackground"/>
-    <import component="Scoreboard.Components.ScoreboardHeader" as="ScoreboardHeader"/>
-    <import component="Scoreboard.Components.PlayerRow.Framemodel" as="PlayerRowFramemodel"/>
-    <import component="Scoreboard.Components.Settings.Wrapper" as="SettingsWrapper"/>
-    <import component="Scoreboard.Components.Settings.Form" as="SettingsForm"/>
-    <import component="Scoreboard.Components.Scrollbar" as="Scrollbar"/>
+    <import component="EvoSC.Style.UIStyle" as="UIStyle"/>
+    <import component="ScoreboardModule.Components.ScoreboardHeader" as="Header"/>
+    <import component="ScoreboardModule.Components.ScoreboardBody" as="Body"/>
+    <import component="ScoreboardModule.Components.ScoreboardBg" as="ScoreboardBg"/>
+    <import component="ScoreboardModule.Components.Row.Framemodel" as="PlayerRowFramemodel"/>
 
+    <property type="IScoreboardSettings" name="settings"/>
     <property type="int" name="MaxPlayers" default="0"/>
-    <property type="int" name="VisiblePlayers" default="8"/>
-    <property type="Dictionary<int, string>" name="PositionColors"/>
 
-    <property type="double" name="w" default="160"/>
-    <property type="double" name="h" default="71.2"/>
     <property type="double" name="backgroundBorderRadius" default="3.0"/>
-    <property type="double" name="headerHeight" default="19.0"/>
+    <property type="double" name="headerHeight" default="14.0"/>
     <property type="double" name="rowHeight" default="8.0"/>
     <property type="double" name="rowInnerHeight" default="5.0"/>
+    <property type="double" name="rowSpacing" default="0.3"/>
+    <property type="double" name="columnSpacing" default="4.0"/>
     <property type="double" name="pointsWidth" default="16.0"/>
-    <property type="double" name="rowSpacing" default="0.8"/>
     <property type="double" name="padding" default="2.0"/>
     <property type="double" name="innerSpacing" default="1.6"/>
-    <property type="double" name="scrollBarWidth" default="1.5"/>
+    <property type="double" name="legendHeight" default="3.8"/>
+    <property type="int" name="actionButtonCount" default="2"/>
 
     <template layer="ScoresTable">
-        <frame pos="{{ w / -2.0 }} {{ h / 2.0 + 10.0 }}">
-            <ScoreboardBackground w="{{ w }}" 
-                                  h="{{ VisiblePlayers * rowHeight * rowSpacing + padding - rowSpacing + headerHeight }}"
-                                  radius="{{ backgroundBorderRadius }}"
-                                  headerHeight="{{ headerHeight }}"
+        <!-- UI Styles -->
+        <UIStyle/>
+
+        <!-- Frame Models -->
+        <PlayerRowFramemodel w="{{ settings.Width }}"
+                             padding="{{ padding }}"
+                             rowHeight="{{ rowHeight }}"
+                             rowSpacing="{{ rowSpacing }}"
+                             columnSpacing="{{ columnSpacing }}"
+                             innerSpacing="{{ innerSpacing }}"
+                             rowInnerHeight="{{ rowInnerHeight }}"
+                             pointsWidth="{{ pointsWidth }}"
+                             actionButtonCount="{{ actionButtonCount }}"
+                             settings="{{ settings }}"
+        />
+
+        <!-- Scoreboard Content -->
+        <frame pos="{{ settings.Width / -2.0 }} {{ settings.Height / 2.0 }}">
+            <!-- Background -->
+            <ScoreboardBg width="{{ settings.Width }}"
+                          height="{{ settings.Height }}"
             />
 
-            <ScoreboardHeader w="{{ w }}" headerHeight="{{ headerHeight }}" />
+            <!-- Header -->
+            <Header width="{{ settings.Width }}"
+                    height="{{ headerHeight }}"
+            />
 
-            <!-- Player Rows -->
-            <frame id="rows_wrapper" pos="0 {{ -headerHeight - padding }}" size="{{ w }} {{ VisiblePlayers * rowHeight * rowSpacing + headerHeight }}">
+            <!-- Body -->
+            <Body y="{{ -headerHeight }}"
+                  width="{{ settings.Width }}"
+                  height="{{ settings.Height - headerHeight }}"
+                  legendHeight="{{ legendHeight }}"
+                  rowSpacing="{{ rowSpacing }}"
+                  columnSpacing="{{ columnSpacing }}"
+                  flagWidth="{{ rowInnerHeight * 1.5 }}"
+                  clubTagWidth="{{ rowInnerHeight * 1.5 }}"
+            />
+            <frame id="rows_wrapper"
+                   pos="0 {{ -headerHeight-legendHeight }}"
+                   size="{{ settings.Width }} {{ settings.Height-headerHeight }}"
+            >
                 <frame id="rows_inner">
-                    <!-- Settings -->
-                    <SettingsWrapper h="{{ h }}" padding="{{ padding }}">
-                        <SettingsForm w="{{ w - padding * 2.0 }}" h="{{ h - padding * 2.0 }}"/>
-                    </SettingsWrapper>
-                    
-                    
-                    <!-- Player Rows -->
-                    <PlayerRowFramemodel
-                                         w="{{ w }}"
-                                         padding="{{ padding }}"
-                                         rowHeight="{{ rowHeight }}"
-                                         rowSpacing="{{ rowSpacing }}"
-                                         innerSpacing="{{ innerSpacing }}"
-                                         rowInnerHeight="{{ rowInnerHeight }}"
-                                         pointsWidth="{{ pointsWidth }}"
-                                         scrollBarWidth="{{ scrollBarWidth }}"
-                    />
-                    <frame id="frame_scroll" size="{{ w }} {{ VisiblePlayers * rowHeight * rowSpacing + headerHeight }}">
+                    <frame id="frame_scroll"
+                           size="{{ settings.Width }} {{ settings.Height-headerHeight-legendHeight - 0.1 }}"
+                    >
                         <frameinstance modelid="player_row"
                                        foreach="int rowId in Enumerable.Range(0, MaxPlayers * 2).ToList()"
-                                       pos="0 {{ -rowId * (rowHeight + rowSpacing) }}"
+                                       pos="0 {{ rowId * -rowHeight + (rowId+1) * -rowSpacing }}"
                         />
                     </frame>
-
-                    <!-- Scrollbar -->
-                    <Scrollbar x="{{ w - scrollBarWidth }}"
-                               w="{{ scrollBarWidth }}"
-                               h="{{ VisiblePlayers * rowHeight * rowSpacing + headerHeight - rowSpacing }}"
-                               accentColor="{{ Theme.ScoreboardModule_Scoreboard_BgPosition }}"
-                               opacity="0.25"
-                               rowHeight="{{ rowHeight + rowSpacing }}"
-                               visiblePlayers="{{ VisiblePlayers }}"
-                               id="scrollbar_bg"
-                    />
-                    <Scrollbar x="{{ w - scrollBarWidth }}"
-                               w="{{ scrollBarWidth }}"
-                               h="{{ (VisiblePlayers * rowHeight * rowSpacing + headerHeight - rowSpacing) * 0.35 }}"
-                               accentColor="{{ Theme.ScoreboardModule_Scoreboard_BgPosition }}"
-                               rowHeight="{{ rowHeight + rowSpacing }}"
-                               visiblePlayers="{{ VisiblePlayers }}"
-                               id="scrollbar_handle"
-                    />
                 </frame>
             </frame>
         </frame>
@@ -115,7 +111,6 @@
         declare Integer ScrollIndex;
         declare Integer MaxPlayers;
         declare CMlFrame RowsFrame;
-        declare Boolean SettingsVisible;
         declare Text[Integer] PositionColors;
         
         Boolean ShouldShowPointsBox() {
@@ -125,50 +120,50 @@
         }
         
         Void UpdateScoreboardLayout() {
-            declare persistent Boolean SB_Setting_ShowClubTags for LocalUser = True;
-            declare persistent Boolean SB_Setting_ShowFlags for LocalUser = True;
-            declare shouldShowPoints = ShouldShowPointsBox();
-            declare Real flagWidth = {{ rowInnerHeight }} * 2.0;
-            declare Real innerSpacing = {{ innerSpacing }} * 1.0;
+            UpdateLegend(ShouldShowPointsBox());
+        }
+        
+        Text StripLeadingZeroes(Text timeString) {
+            return TL::RegexReplace("^[0.:]+", timeString, "", "");
+        }
+        
+        Text StyleTime(Text timeString) {
+            declare mutedTextColor = "{{ Color.ToTextColor(Theme.UI_TextMuted) }}";
+            declare primaryTextColor = "{{ Color.ToTextColor(Theme.ScoreboardModule_Text_Color) }}";
+        
+            if(timeString == "0:00.000") {
+                return mutedTextColor ^ "0" ^ timeString;
+            }
+        
+            declare endPart = StripLeadingZeroes(timeString);
+            declare startPart = TL::Replace(timeString, endPart, "");
             
-            foreach(Control in RowsFrame.Controls){
-                declare Real offset = 0.0;
-                declare playerRow = (Control as CMlFrame);
-                declare pointsBoxFrame = (playerRow.GetFirstChild("points_box") as CMlFrame);
-                declare flagQuad = (playerRow.GetFirstChild("flag") as CMlQuad);
-                declare clubQuad = (playerRow.GetFirstChild("club_bg") as CMlQuad);
-                declare clubLabel = (playerRow.GetFirstChild("club") as CMlLabel);
-                declare nameLabel = (playerRow.GetFirstChild("name") as CMlLabel);
-                declare pointsLabel = (playerRow.GetFirstChild("points") as CMlLabel);
-                
-                pointsBoxFrame.Visible = shouldShowPoints;
-                pointsLabel.Visible = shouldShowPoints;
-                
-                if(SB_Setting_ShowFlags){
-                    flagQuad.RelativePosition_V3.X = offset;
-                    flagQuad.Show();
-                    offset += flagWidth;
-                }else{
-                    flagQuad.Hide();
-                }
-                
-                if(SB_Setting_ShowClubTags){
-                    clubQuad.RelativePosition_V3.X = offset;
-                    clubLabel.RelativePosition_V3.X = offset + (flagWidth / 2.0);
-                    clubQuad.Show();
-                    clubLabel.Show();
-                    offset += flagWidth;
-                }else{
-                    clubQuad.Hide();
-                    clubLabel.Hide();
-                }
-                
-                nameLabel.RelativePosition_V3.X = offset + innerSpacing;
+            return mutedTextColor ^ startPart ^ primaryTextColor ^ endPart;
+        }
+        
+        Text StylePoints(Text points, Integer padding) {
+            declare mutedTextColor = "{{ Color.ToTextColor(Theme.UI_TextMuted) }}";
+            declare primaryTextColor = "{{ Color.ToTextColor(Theme.ScoreboardModule_Text_Color) }}";
+            declare out = mutedTextColor;
+            
+            for(i, 1, padding - TL::Length(points)){
+                out ^= "0";
             }
+            
+            if(points == "0"){
+                return out ^ points;
+            }
+            
+            return out ^ primaryTextColor ^ points;
         }
         
-        Text StripLeadingZeroes(Text input) {
-            return TL::RegexReplace("^[0.:]+", input, "", "");
+        Text GetPlayerBestTimeStyled(CSmScore score) {
+            if(score.BestRaceTimes.count == 0){
+                return StyleTime("0:00.000");
+            }
+        
+            declare bestTime = score.BestRaceTimes[score.BestRaceTimes.count - 1];
+            return StyleTime(TL::TimeToText(bestTime, True, True));
         }
 
         Integer[CSmScore] GetSortedScores() {
@@ -199,39 +194,11 @@
         Void SetCountryFlag(CMlQuad flagQuad, Text login){
             if(login != "" && !TL::StartsWith("*fakeplayer", login)){
                 flagQuad.ImageUrl = "file://ZoneFlags/Login/" ^ login ^ "/country";
-                flagQuad.ModulateColor = <1.0, 1.0, 1.0>;
                 flagQuad.Opacity = 1.0;
             }else{
-                flagQuad.ImageUrl = "file://Media/Manialinks/Nadeo/TMNext/Menus/Common/Common_Flag_Mask.dds";
-                flagQuad.ModulateColor = <0.0, 0.0, 0.0>;
-                flagQuad.Opacity = 0.25;
-            }
-        }
-        
-        Void SetCustomLabel(CMlFrame playerRow, Text value, Text hexColor){
-            declare customLabel = (playerRow.GetFirstChild("custom_label") as CMlLabel);
-            declare customGradientFrame = (playerRow.GetFirstChild("custom_gradient") as CMlFrame);
-            
-            customLabel.Value = value;
-            customLabel.TextColor = CL::HexToRgb(hexColor);
-            
-            Page.GetClassChildren("modulate", customGradientFrame, True);
-            foreach(Control in Page.GetClassChildren_Result){
-                (Control as CMlQuad).ModulateColor = customLabel.TextColor;
-            }
-            Page.GetClassChildren("set", customGradientFrame, True);
-            foreach(Control in Page.GetClassChildren_Result){
-                (Control as CMlQuad).BgColor = customLabel.TextColor;
+                flagQuad.ImageUrl = "file://ZoneFlags/World";
+                flagQuad.Opacity = 1.0;
             }
-            
-            customGradientFrame.Show();
-        }
-        
-        Void HideCustomLabel(CMlFrame playerRow){
-            declare customLabel = (playerRow.GetFirstChild("custom_label") as CMlLabel);
-            declare customGradientFrame = (playerRow.GetFirstChild("custom_gradient") as CMlFrame);
-            customLabel.Value = "";
-            customGradientFrame.Hide();
         }
         
         Void UpdateScoreAndPoints(CSmScore Score, CMlFrame playerRow, Integer position){
@@ -250,11 +217,14 @@
             playerScore <=> Score;
                 
             declare scoreLabel = (playerRow.GetFirstChild("score") as CMlLabel);
+            declare bestTimeLabel = (playerRow.GetFirstChild("best_time") as CMlLabel);
             declare specDisconnectedLabel = (playerRow.GetFirstChild("spec_disconnected_label") as CMlLabel);
-            declare pointsLabel = (playerRow.GetFirstChild("points") as CMlLabel);
             declare roundPointsLabel = (playerRow.GetFirstChild("round_points") as CMlLabel);
             declare customLabel = (playerRow.GetFirstChild("custom_label") as CMlLabel);
             
+            scoreLabel.Value = "";
+            roundPointsLabel.Value = "";
+            
             if (!(CustomPointsEnabled && CurrentScoreMode != C_Mode_Trophy)) {
                 HideCustomLabel(playerRow);
             }
@@ -279,17 +249,17 @@
                 }
             } else if (CurrentScoreMode == C_Mode_Points) {
                 customLabel.Value = "";
-                pointsLabel.Value = TL::ToText(Score.Points);
+                scoreLabel.Value = TL::ToText(Score.Points);
                 colorizePosition = Score.Points > 0;
                 
-                if(Score.PrevRaceTimes.count > 0 && Score.PrevRaceTimes[Score.PrevRaceTimes.count - 1] > 0){
-                    scoreLabel.Value = TL::TimeToText(Score.PrevRaceTimes[Score.PrevRaceTimes.count - 1], True, True);
+                if(Score.BestRaceTimes.count > 0 && Score.BestRaceTimes[Score.BestRaceTimes.count - 1] > 0){
+                    bestTimeLabel.Value = TL::TimeToText(Score.BestRaceTimes[Score.BestRaceTimes.count - 1], True, True);
                 }else{
                     declare CSmPlayer::ESpawnStatus Race_ScoresTable_SpawnStatus for Score = CSmPlayer::ESpawnStatus::NotSpawned;
                     if(Race_ScoresTable_SpawnStatus == CSmPlayer::ESpawnStatus::NotSpawned && PlayerIsConnected && !Race_ScoresTable_IsSpectator){
-                        scoreLabel.Value = "DNF";
+                        roundPointsLabel.Value = "DNF";
                     }else{
-                        scoreLabel.Value = "";
+                        roundPointsLabel.Value = "";
                     }
                 }
                 
@@ -326,11 +296,11 @@
             } else if (CurrentScoreMode == C_Mode_Laps && Score.BestRaceTimes.count > 0) {
                 customLabel.Value = "";
                 scoreLabel.Value = TL::TimeToText(Score.BestRaceTimes[Score.BestRaceTimes.count - 1], True, True);
-                pointsLabel.Value = ""^Score.BestRaceTimes.count;
+                scoreLabel.Value = ""^Score.BestRaceTimes.count;
             } else if (CurrentScoreMode == C_Mode_RaceProgression) {
                 customLabel.Value = "";
                 declare netread Int2 Net_TMxSM_ScoresTable_RaceProgression for Score;
-                pointsLabel.Value = ""^Net_TMxSM_ScoresTable_RaceProgression.X;
+                scoreLabel.Value = ""^Net_TMxSM_ScoresTable_RaceProgression.X;
                 if (Net_TMxSM_ScoresTable_RaceProgression.Y > 0) {
                     scoreLabel.Value = TL::TimeToText(Net_TMxSM_ScoresTable_RaceProgression.Y, True, True);
                     colorizePosition = True;
@@ -345,29 +315,35 @@
                 scoreLabel.Value = "0:00.000";
             }
             
-            scoreLabel.Value = StripLeadingZeroes(scoreLabel.Value);
+            if(ShouldShowPointsBox()){
+                scoreLabel.Value = StylePoints(scoreLabel.Value, 3);
+                bestTimeLabel.Value = GetPlayerBestTimeStyled(Score);
+            }else{
+                scoreLabel.Value = StyleTime(scoreLabel.Value);
+                bestTimeLabel.Value = "";
+            }
             
             declare positionBox = (playerRow.GetFirstChild("position_box") as CMlFrame);
             declare playerRowBg = (playerRow.GetFirstChild("player_row_bg") as CMlFrame);
-            if(PositionColors.existskey(position) && colorizePosition){
-                declare positionColor = PositionColors[position];
-                SetPositionBackgroundColor(positionBox, CL::HexToRgb(positionColor));
-                SetPlayerHighlightColor(playerRowBg, CL::HexToRgb(positionColor));
-            }else{
-                SetPositionBackgroundColor(positionBox, CL::HexToRgb("{{ Theme.ScoreboardModule_Scoreboard_BgPosition }}"));
-                SetPlayerHighlightColor(playerRowBg, CL::HexToRgb("{{ Theme.ScoreboardModule_Scoreboard_BgPosition }}"));
+            if({{ Theme.ScoreboardModule_PositionBox_ShowAccent }}){
+                if(PositionColors.existskey(position) && colorizePosition){
+                    declare positionColor = PositionColors[position];
+                    SetPositionBoxColor(positionBox, CL::HexToRgb(positionColor));
+                }else{
+                    SetPositionBoxColor(positionBox, CL::HexToRgb("{{ Theme.UI_AccentPrimary }}"));
+                }
             }
             
             if (PlayerIsConnected) {
                 //connected
                 if(Race_ScoresTable_IsSpectator){
-                    specDisconnectedLabel.Value = "";
+                    specDisconnectedLabel.Value = "{{ Icons.VideoCamera }}";
                 }else{
                     specDisconnectedLabel.Value = "";
                 }
             }else{
                 //disconnected
-                specDisconnectedLabel.Value = "";
+                specDisconnectedLabel.Value = "{{ Icons.UserTimes }}";
             }
             
             //align items
@@ -375,27 +351,19 @@
             declare x = scoreLabel.RelativePosition_V3.X;
             
             if(scoreLabel.Value != ""){
-                offset += scoreLabel.ComputeWidth(scoreLabel.Value) + {{ innerSpacing }};
+                offset += scoreLabel.ComputeWidth(scoreLabel.Value) + {{ columnSpacing / 2.0 }};
             }
             customLabel.RelativePosition_V3.X = x - offset;
             if(customLabel.Value != ""){
-                offset += customLabel.ComputeWidth(customLabel.Value) + {{ innerSpacing }};
+                offset += customLabel.ComputeWidth(customLabel.Value) + {{ columnSpacing / 2.0 }};
             }
             roundPointsLabel.RelativePosition_V3.X = x - offset;
             if(roundPointsLabel.Value != ""){
-                offset += roundPointsLabel.ComputeWidth(roundPointsLabel.Value) + {{ innerSpacing }};
+                offset += roundPointsLabel.ComputeWidth(roundPointsLabel.Value) + {{ columnSpacing / 2.0 }};
             }
             specDisconnectedLabel.RelativePosition_V3.X = x - offset;
         }
         
-        Void SetMapAndAuthorName() {
-            declare mapNameLabel <=> (Page.MainFrame.GetFirstChild("map_name") as CMlLabel);
-            declare authorName <=> (Page.MainFrame.GetFirstChild("author_name") as CMlLabel);
-        
-            mapNameLabel.Value = Map.MapName;
-            authorName.Value = Map.AuthorNickName;
-        }
-        
         Text GetRecordText() {
             declare Integer SB_PointsLimit for UI = -2;
             
@@ -410,47 +378,26 @@
             return "AUTHOR TIME | " ^ TL::TimeToText(Map.TMObjective_AuthorTime, True, True);
         }
         
-        Void UpdateHeaderInfo() {
-            declare subTextLabel <=> (Page.MainFrame.GetFirstChild("sub_text") as CMlLabel);
-            declare roundLabel <=> (Page.MainFrame.GetFirstChild("round_label") as CMlLabel);
-            
-            subTextLabel.Value = GetRecordText();
-            
-            declare Owner <=> MV_Utils::GetOwner(This);
+        Void UpdateScrollSize(Integer playerRowsFilled) {
+            declare filledHeight = playerRowsFilled * {{ rowHeight + rowSpacing }};
+            declare contentHeight = {{ settings.Height - headerHeight - legendHeight }};
             
-            if (CurrentScoreMode == C_Mode_BestTime || CurrentScoreMode == C_Mode_PrevTime){
-                declare timeLimit = RaceHelpers::GetTimeLimit(Teams[0]);
-                roundLabel.Value = "TIME LIMIT | ";
-                if(timeLimit <= 0){
-                    roundLabel.Value ^= "UNLIMITED";
-                }else{                   
-                    roundLabel.Value ^= TL::TimeToText(timeLimit);
-                }
-            }else if (CurrentScoreMode == C_Mode_LapTime || CurrentScoreMode == C_Mode_Laps){
-				declare Integer LapCurrent = -1;
-				if(Owner != Null){
-                    declare Integer LapCurrent = RaceHelpers::GetPlayerLap(Owner);
-				}
-				declare LapsTotal = RaceHelpers::GetLapsNb(Teams[0]);
-                roundLabel.Value = TL::Compose("%1 | %2 OF %3", _("|Race|Lap"), TL::ToText(LapCurrent), TL::ToText(LapsTotal));
-            }else if (CurrentScoreMode == C_Mode_Points) {
-                declare Integer SB_CurrentRound for UI = 0;
-                declare Integer SB_RoundsPerMap for UI = 0;
-                roundLabel.Value = TL::Compose("ROUND | %1 OF %2", TL::ToText(SB_CurrentRound), TL::ToText(SB_RoundsPerMap));
+            if(filledHeight > contentHeight) {
+                RowsFrame.ScrollMax.Y = (filledHeight - contentHeight) * 1.0;
             }else{
-                roundLabel.Value = "";
+                RowsFrame.ScrollMax.Y = 0.0;
             }
-            
-            SetMapAndAuthorName();
+        
+            PlayerRowsFilled = playerRowsFilled;
         }
         
-        Void UpdateScrollSize(Integer playerRowsFilled) {
-            declare scrollN = 0;
-            if(playerRowsFilled >= 8){
-                scrollN = playerRowsFilled - 8;
+        Text GetNickname(CUser user) {
+            declare Text[Text] EvoSC_Player_Nicknames for UI = [];
+            if(EvoSC_Player_Nicknames.existskey(user.Login)){
+                return EvoSC_Player_Nicknames[user.Login];
             }
-            RowsFrame.ScrollMax = <0.0, {{ rowHeight + rowSpacing }} * scrollN * 1.0>;
-            PlayerRowsFilled = playerRowsFilled;
+            
+            return user.Name;
         }
         
         Void UpdateScoreTable() {
@@ -466,16 +413,13 @@
                 declare CSmPlayer::ESpawnStatus Race_ScoresTable_SpawnStatus for Player.Score = CSmPlayer::ESpawnStatus::NotSpawned;
                 Race_ScoresTable_SpawnStatus = Player.SpawnStatus;
             }
-        
+            
             declare cursor = 0;
-            //declare startFill = ML::Max(ScrollIndex - PlayerRowsVisible, 0);
-            //declare endFill = ML::Min(ScrollIndex + PlayerRowsVisible * 2, MaxPlayers - 1);
            
             foreach(Score => Weight in GetSortedScores()){
-                //if(cursor < startFill || cursor > endFill){
-                //    cursor += 1;
-                //    continue;
-                //}
+                if(!RowsFrame.Controls.existskey(cursor)){
+                    continue;
+                }
                 
                 declare persistent Boolean SB_Setting_ShowSpectators for LocalUser = True;
                 declare persistent Boolean SB_Setting_ShowDisconnected for LocalUser = True;
@@ -493,24 +437,18 @@
                         continue;
                     }
                 }
-            
+                
                 declare playerRow = (RowsFrame.Controls[cursor] as CMlFrame);
-                declare positionLabel = (playerRow.GetFirstChild("position") as CMlLabel);
-                declare clubBg = (playerRow.GetFirstChild("club_bg") as CMlQuad);
                 declare clubLabel = (playerRow.GetFirstChild("club") as CMlLabel);
                 declare nameLabel = (playerRow.GetFirstChild("name") as CMlLabel);
                 declare flagQuad = (playerRow.GetFirstChild("flag") as CMlQuad);
-                declare scoreLabel = (playerRow.GetFirstChild("score") as CMlLabel);
-                declare pointsBoxFrame = (playerRow.GetFirstChild("points_box") as CMlFrame);
+                declare positionBoxFrame = (playerRow.GetFirstChild("position_box") as CMlFrame);
                 
-                positionLabel.Value = (cursor + 1) ^ "";
+                SetPlayerRank(positionBoxFrame, cursor + 1);
+                nameLabel.Value = GetNickname(Score.User);
                 clubLabel.Value = Score.User.ClubTag;
-                nameLabel.Value = Score.User.Name;
-                
-                if(clubLabel.Value != ""){
-                    clubBg.Opacity = 0.95;
-                }else{
-                    clubBg.Opacity = 0.25;
+                if(clubLabel.Value == ""){
+                    clubLabel.Value = "-";
                 }
                 
                 declare Boolean CustomLabelVisible for playerRow = False;
@@ -521,14 +459,6 @@
                     SetCountryFlag(flagQuad, Score.User.Login);
                 }
                 
-                if(ShouldShowPointsBox()){
-                    scoreLabel.RelativePosition_V3.X = pointsBoxFrame.RelativePosition_V3.X - {{ innerSpacing }};
-                    pointsBoxFrame.Show();
-                }else{
-                    scoreLabel.RelativePosition_V3.X = {{ w - padding - innerSpacing }};
-                    pointsBoxFrame.Hide();
-                }
-                
                 playerRow.Show();
                 
                 cursor += 1;
@@ -536,26 +466,15 @@
             
             //Hide remaining rows
             for(i, cursor, {{ MaxPlayers - 1 }}){
+                if(!RowsFrame.Controls.existskey(i)){
+                    continue;
+                }
+            
                 declare playerRow = (RowsFrame.Controls[i] as CMlFrame);
                 playerRow.Hide();
             }
-            
-            UpdateHeaderInfo();
             UpdateScrollSize(cursor);
         }
-        
-        Void ToggleShowSettings() {
-            declare wrapperInnerFrame <=> (Page.MainFrame.GetFirstChild("rows_inner") as CMlFrame);
-            declare y = 0.0;
-            SettingsVisible = !SettingsVisible;
-        
-            if(SettingsVisible) {
-                y = {{ h + padding }} * -1.0;
-            }
-            
-            declare targetState = "<frame pos='0 " ^ y ^ "' />";
-            AnimMgr.Add(wrapperInnerFrame, targetState, 320, CAnimManager::EAnimManagerEasing::ExpInOut);
-        }
         -->
     </script>
 
@@ -572,16 +491,18 @@
             RowsFrame.DisablePreload = True;
             RowsFrame.ScrollGridSnap = True;
             RowsFrame.ScrollMin = <0.0, 0.0>;
-            RowsFrame.ScrollMax = <0.0, {{ MaxPlayers * (rowHeight + rowSpacing) - h }} * 1.0>;
             RowsFrame.ScrollGrid = <0.0, {{ rowHeight + rowSpacing }} * 1.0>;
             
             MaxPlayers = {{ MaxPlayers }};
-            PlayerRowsVisible = {{ VisiblePlayers }};
+            PlayerRowsVisible = 0;
             PlayerRowsFilled = -1;
             CurrentScoreMode = -1;
-            SettingsVisible = False;
             
-            {! string.Join("\n", PositionColors.Select(pc => $"PositionColors[{pc.Key}] = \"{pc.Value}\";")) !}
+            PositionColors = [
+                1 => "{{ Theme.Gold }}",
+                2 => "{{ Theme.Silver }}",
+                3 => "{{ Theme.Bronze }}"
+            ];
         ***
         
         *** OnLoop *** 
@@ -599,13 +520,6 @@
             }
         ***
         
-        *** OnMouseClick *** 
-        ***
-            if (Event.Control.ControlId == "settings_icon") {
-                ToggleShowSettings();
-            }
-        ***
-        
         *** OnScriptExecutionFinished *** 
         ***
             sleep(5000);
diff --git a/src/Modules/ScoreboardModule/Themes/DefaultScoreboardTheme.cs b/src/Modules/ScoreboardModule/Themes/DefaultScoreboardTheme.cs
new file mode 100644
index 000000000..c98d37b49
--- /dev/null
+++ b/src/Modules/ScoreboardModule/Themes/DefaultScoreboardTheme.cs
@@ -0,0 +1,52 @@
+using EvoSC.Common.Interfaces.Themes;
+using EvoSC.Common.Themes;
+using EvoSC.Common.Themes.Attributes;
+
+namespace EvoSC.Modules.Official.ScoreboardModule.Themes;
+
+[Theme(Name = "Scoreboard", Description = "Default theme for the scoreboard.")]
+public class DefaultScoreboardTheme(IThemeManager theme) : Theme<DefaultScoreboardTheme>
+{
+    private readonly dynamic _theme = theme.Theme;
+
+    public override Task ConfigureAsync()
+    {
+        Set("ScoreboardModule.Text_Color").To(_theme.UI_TextPrimary);
+
+        Set("ScoreboardModule.Logo_URL").To("file://Media/Manialinks/Nadeo/Trackmania/Menus/TMLogo.dds");
+        Set("ScoreboardModule.Logo_Width").To("20.0");
+        Set("ScoreboardModule.Logo_Height").To("10.0");
+        
+        Set("ScoreboardModule.Background_Opacity").To("0.0");
+        Set("ScoreboardModule.Background_Image").To("");
+        
+        Set("ScoreboardModule.Background_Header_Color").To(_theme.UI_HeaderBg);
+        Set("ScoreboardModule.Background_Header_Opacity").To("0.95");
+        
+        Set("ScoreboardModule.Background_Legend_Color").To(_theme.UI_HeaderBg);
+        Set("ScoreboardModule.Background_Legend_Opacity").To("1.0");
+        Set("ScoreboardModule.Background_Legend_Text_Color").To(_theme.UI_TextPrimary);
+        Set("ScoreboardModule.Background_Legend_Text_Opacity").To("0.75");
+        
+        Set("ScoreboardModule.Background_Row_Color").To(_theme.UI_BgPrimary);
+        Set("ScoreboardModule.Background_Row_Opacity").To("0.9");
+        
+        Set("ScoreboardModule.Background_Hover_Color").To(_theme.UI_BgHighlight);
+        Set("ScoreboardModule.Background_Hover_Opacity").To("0.9");
+        
+        Set("ScoreboardModule.PositionBox_ShowAccent").To("True");
+        Set("ScoreboardModule.PositionBox_Color").To(_theme.UI_AccentSecondary);
+        Set("ScoreboardModule.PositionBox_Opacity").To("1.0");
+        Set("ScoreboardModule.PositionBox_TextColor").To(_theme.UI_TextSecondary);
+        Set("ScoreboardModule.PositionBox_TextOpacity").To("1.0");
+        
+        Set("ScoreboardModule.GainedPoints.Color").To(_theme.UI_AccentPrimary);
+
+        Set("ScoreboardModule.Background_Row_Flag_AlphaMaskUrl").To("file://Media/Manialinks/Nadeo/Trackmania/Menus/Common/Common_Flag_Mask.dds");
+        
+        Set("ScoreboardModule.FinalistColor").To("");
+        Set("ScoreboardModule.WinnerColor").To("");
+        
+        return Task.CompletedTask;
+    }
+}
diff --git a/src/Modules/ScoreboardModule/info.toml b/src/Modules/ScoreboardModule/info.toml
new file mode 100644
index 000000000..f7ad59d0d
--- /dev/null
+++ b/src/Modules/ScoreboardModule/info.toml
@@ -0,0 +1,9 @@
+[info]
+name = "ScoreboardModule"
+title = "Scoreboard Module"
+summary = "Custom EvoSC Scoreboards."
+version = "1.0.0"
+author = "Evo"
+
+[dependencies]
+GameModeUiModule = "1.0.0"