diff --git a/EvoSC.sln b/EvoSC.sln
index 569a1ce65..95a966060 100644
--- a/EvoSC.sln
+++ b/EvoSC.sln
@@ -136,6 +136,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameModeUiModule", "src\Mod
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameModeUiModule.Tests", "tests\Modules\GameModeUiModule.Tests\GameModeUiModule.Tests.csproj", "{5B515690-0F0B-44D1-B644-3524A83A17CE}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LiveRankingModule.Tests", "tests\Modules\LiveRankingModule.Tests\LiveRankingModule.Tests.csproj", "{4AA1890A-1423-4831-95B2-E29B9A7A58D1}"
+EndProject
 
 
 
@@ -411,6 +413,10 @@ Global
 		{5B515690-0F0B-44D1-B644-3524A83A17CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5B515690-0F0B-44D1-B644-3524A83A17CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5B515690-0F0B-44D1-B644-3524A83A17CE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4AA1890A-1423-4831-95B2-E29B9A7A58D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4AA1890A-1423-4831-95B2-E29B9A7A58D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4AA1890A-1423-4831-95B2-E29B9A7A58D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4AA1890A-1423-4831-95B2-E29B9A7A58D1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -475,5 +481,6 @@ Global
 		{F8C7FE5E-B389-4BA8-B0DF-6D9D0A9B0949} = {6D75D6A2-6ECD-4DE4-96C5-CAD7D134407A}
 		{5BA1FF1B-8CB0-4FF5-B6C0-4E2E323D446E} = {DC47658A-F421-4BA4-B617-090A7DFB3900}
 		{5B515690-0F0B-44D1-B644-3524A83A17CE} = {6D75D6A2-6ECD-4DE4-96C5-CAD7D134407A}
+		{4AA1890A-1423-4831-95B2-E29B9A7A58D1} = {6D75D6A2-6ECD-4DE4-96C5-CAD7D134407A}
 	EndGlobalSection
 EndGlobal
diff --git a/src/EvoSC.Common/Util/Manialinks/WidgetPosition.cs b/src/EvoSC.Common/Util/Manialinks/WidgetPosition.cs
new file mode 100644
index 000000000..1dfe6772c
--- /dev/null
+++ b/src/EvoSC.Common/Util/Manialinks/WidgetPosition.cs
@@ -0,0 +1,18 @@
+using EvoSC.Common.Util.EnumIdentifier;
+
+namespace EvoSC.Common.Util.Manialinks;
+
+public enum WidgetPosition
+{
+    [Identifier(Name = "left", NoPrefix = true)]
+    Left,
+
+    [Identifier(Name = "right", NoPrefix = true)]
+    Right,
+
+    [Identifier(Name = "center", NoPrefix = true)]
+    Center,
+
+    [Identifier(Name = "", NoPrefix = true)]
+    Undefined,
+}
diff --git a/src/Modules/LiveRankingModule/Config/ILiveRankingSettings.cs b/src/Modules/LiveRankingModule/Config/ILiveRankingSettings.cs
new file mode 100644
index 000000000..862e69272
--- /dev/null
+++ b/src/Modules/LiveRankingModule/Config/ILiveRankingSettings.cs
@@ -0,0 +1,22 @@
+using System.ComponentModel;
+using Config.Net;
+using EvoSC.Common.Util.Manialinks;
+using EvoSC.Modules.Attributes;
+
+namespace EvoSC.Modules.Official.LiveRankingModule.Config;
+
+[Settings]
+public interface ILiveRankingSettings
+{
+    [Option(DefaultValue = 10), Description("Max of rows to show in the live ranking widget.")]
+    public int MaxWidgetRows { get; set; }
+    
+    [Option(DefaultValue = 63.0), Description("Specifies the Y position of the widget.")]
+    public double Y { get; set; }
+    
+    [Option(DefaultValue = 36.0), Description("Specifies the width of the widget.")]
+    public double Width { get; set; }
+    
+    [Option(DefaultValue = "right"), Description("Specifies on which side the widget is displayed.")]
+    public WidgetPosition Position { get; set; }
+}
diff --git a/src/Modules/LiveRankingModule/Controllers/LiveRankingEventController.cs b/src/Modules/LiveRankingModule/Controllers/LiveRankingEventController.cs
index 5f8e1c9e4..98aac60cb 100644
--- a/src/Modules/LiveRankingModule/Controllers/LiveRankingEventController.cs
+++ b/src/Modules/LiveRankingModule/Controllers/LiveRankingEventController.cs
@@ -2,6 +2,7 @@
 using EvoSC.Common.Controllers.Attributes;
 using EvoSC.Common.Events.Attributes;
 using EvoSC.Common.Interfaces.Controllers;
+using EvoSC.Common.Models;
 using EvoSC.Common.Remote;
 using EvoSC.Common.Remote.EventArgsModels;
 using EvoSC.Modules.Official.LiveRankingModule.Interfaces;
@@ -12,30 +13,38 @@ namespace EvoSC.Modules.Official.LiveRankingModule.Controllers;
 [Controller]
 public class LiveRankingEventController(ILiveRankingService service) : EvoScController<IEventControllerContext>
 {
-    [Subscribe(ModeScriptEvent.WayPoint)]
-    public Task OnPlayerWaypointAsync(object sender, WayPointEventArgs args) => service.OnPlayerWaypointAsync(args);
-
-    [Subscribe(ModeScriptEvent.GiveUp)]
-    public Task OnPlayerGiveUpAsync(object sender, PlayerUpdateEventArgs args) => service.OnPlayerGiveupAsync(args);
-
-    [Subscribe(ModeScriptEvent.StartRoundStart)]
-    public Task OnStartRoundAsync(object sender, RoundEventArgs args) => service.OnStartRoundAsync(args);
-
-    [Subscribe(ModeScriptEvent.EndMapStart)]
-    public Task OnEndMapAsync(object sender, MapEventArgs args) => service.OnEndMapAsync(args);
+    [Subscribe(GbxRemoteEvent.BeginMap)]
+    public Task OnBeginMapAsync(object sender, MapGbxEventArgs args)
+        => service.DetectModeAndRequestScoreAsync();
+    
+    [Subscribe(ModeScriptEvent.Scores)]
+    public async Task OnScoresAsync(object sender, ScoresEventArgs args)
+    {
+        if (args.Section is not (ModeScriptSection.EndRound or ModeScriptSection.Undefined))
+        {
+            return;
+        }
+
+        await service.MapScoresAndSendWidgetAsync(args);
+    }
 
     [Subscribe(ModeScriptEvent.PodiumStart)]
-    public Task OnPodiumStartAsync(object sender, PodiumEventArgs args) => service.OnPodiumStartAsync(args);
+    public Task OnPodiumStartAsync(object sender, PodiumEventArgs args)
+        => service.HideWidgetAsync();
 
-    [Subscribe(ModeScriptEvent.EndRoundStart)]
-    public Task OnEndRoundAsync(object sender, RoundEventArgs args) => service.OnEndRoundAsync(args);
-
-    [Subscribe(GbxRemoteEvent.BeginMatch)]
-    public Task OnBeginMatchAsync(object sender, EventArgs args) => service.OnBeginMatchAsync();
-
-    [Subscribe(GbxRemoteEvent.EndMatch)]
-    public Task OnEndMatchAsync(object sender, EndMatchGbxEventArgs args) => service.OnEndMatchAsync(args);
-
-    [Subscribe(GbxRemoteEvent.PlayerConnect)]
-    public Task OnPlayerConnectAsync(object sender, PlayerConnectGbxEventArgs args) => service.SendManialinkAsync();
+    [Subscribe(ModeScriptEvent.WayPoint)]
+    public async Task OnWayPointAsync(object sender, WayPointEventArgs args)
+    {
+        if (!args.IsEndLap)
+        {
+            return;
+        }
+
+        if (await service.CurrentModeIsPointsBasedAsync())
+        {
+            return;
+        }
+
+        await service.RequestScoresAsync();
+    }
 }
diff --git a/src/Modules/LiveRankingModule/Interfaces/ILiveRankingService.cs b/src/Modules/LiveRankingModule/Interfaces/ILiveRankingService.cs
index ab61ad8e1..c5615e3ad 100644
--- a/src/Modules/LiveRankingModule/Interfaces/ILiveRankingService.cs
+++ b/src/Modules/LiveRankingModule/Interfaces/ILiveRankingService.cs
@@ -1,92 +1,60 @@
-using EvoSC.Common.Remote.EventArgsModels;
+using EvoSC.Common.Models.Callbacks;
+using EvoSC.Common.Remote.EventArgsModels;
 using EvoSC.Modules.Official.LiveRankingModule.Models;
-using GbxRemoteNet.Events;
 
 namespace EvoSC.Modules.Official.LiveRankingModule.Interfaces;
 
 public interface ILiveRankingService
 {
     /// <summary>
-    /// Called on when module is enabled
+    /// Determines if current mode is points based and requests scores.
     /// </summary>
     /// <returns></returns>
-    Task OnEnableAsync();
+    public Task DetectModeAndRequestScoreAsync();
 
     /// <summary>
-    /// Called on when module is disabled
+    /// Requests scores from the game mode.
     /// </summary>
     /// <returns></returns>
-    Task OnDisableAsync();
+    public Task RequestScoresAsync();
 
     /// <summary>
-    /// Called when a player passes a checkpoint.
+    /// Maps the scores and displays the widget.
     /// </summary>
+    /// <param name="scores"></param>
     /// <returns></returns>
-    Task OnPlayerWaypointAsync(WayPointEventArgs args);
+    public Task MapScoresAndSendWidgetAsync(ScoresEventArgs scores);
 
     /// <summary>
-    /// Called when a player retires from the current round.
+    /// Maps the given ScoresEventArgs to LiveRankingPositions.
     /// </summary>
+    /// <param name="scores"></param>
     /// <returns></returns>
-    Task OnPlayerGiveupAsync(PlayerUpdateEventArgs args);
+    public Task<IEnumerable<LiveRankingPosition>> MapScoresAsync(ScoresEventArgs scores);
 
     /// <summary>
-    /// Called when a new map starts.
+    /// Hides the live ranking widget for everyone.
     /// </summary>
     /// <returns></returns>
-    Task OnBeginMapAsync(MapEventArgs args);
+    public Task HideWidgetAsync();
 
     /// <summary>
-    /// Called when a map ends.
+    /// Returns whether the current mode is points based.
     /// </summary>
     /// <returns></returns>
-    Task OnEndMapAsync(MapEventArgs args);
+    public Task<bool> CurrentModeIsPointsBasedAsync();
 
     /// <summary>
-    /// Called when a round ends.
+    /// Determines whether a score should be displayed in the widget.
     /// </summary>
+    /// <param name="score"></param>
     /// <returns></returns>
-    Task OnEndRoundAsync(RoundEventArgs args);
+    public bool ScoreShouldBeDisplayed(PlayerScore score);
 
     /// <summary>
-    /// Called when a new round starts.
+    /// Converts a PlayerScore to a LiveRankingPosition object.
     /// </summary>
+    /// <param name="score"></param>
     /// <returns></returns>
-    Task OnStartRoundAsync(RoundEventArgs args);
-
-    /// <summary>
-    /// Called when the podium sequence starts.
-    /// </summary>
-    /// <returns></returns>
-    Task OnPodiumStartAsync(PodiumEventArgs args);
-
-    /// <summary>
-    /// Sends a manialink.
-    /// </summary>
-    /// <returns></returns>
-    Task SendManialinkAsync();
-
-    /// <summary>
-    /// Called when a new match starts.
-    /// </summary>
-    /// <returns></returns>
-    Task OnBeginMatchAsync();
-
-    /// <summary>
-    /// Called when a match ends.
-    /// </summary>
-    /// <returns></returns>
-    Task OnEndMatchAsync(EndMatchGbxEventArgs args);
-    
-    /// <summary>
-    /// Calculates and sets the diffs of given live ranking positions.
-    /// </summary>
-    /// <returns></returns>
-    Task CalculateDiffsAsync(List<ExpandedLiveRankingPosition> rankings);
-    
-    /// <summary>
-    /// Resets the live ranking data.
-    /// </summary>
-    /// <returns></returns>
-    Task ResetLiveRankingAsync();
+    public LiveRankingPosition PlayerScoreToLiveRankingPosition(PlayerScore score);
 }
diff --git a/src/Modules/LiveRankingModule/LiveRankingModule.cs b/src/Modules/LiveRankingModule/LiveRankingModule.cs
index 3acf50cfd..243b9c967 100644
--- a/src/Modules/LiveRankingModule/LiveRankingModule.cs
+++ b/src/Modules/LiveRankingModule/LiveRankingModule.cs
@@ -7,8 +7,7 @@ namespace EvoSC.Modules.Official.LiveRankingModule;
 [Module(IsInternal = true)]
 public class LiveRankingModule(ILiveRankingService service) : EvoScModule, IToggleable
 {
-    public Task EnableAsync() => service.OnEnableAsync();
+    public Task EnableAsync() => service.DetectModeAndRequestScoreAsync();
 
-    // if no cleaning for the classes needed to be done, return here a completed task, otherwise clean the classes, and then complete the task. 
-    public Task DisableAsync() => service.OnDisableAsync();
+    public Task DisableAsync() => Task.CompletedTask;
 }
diff --git a/src/Modules/LiveRankingModule/LiveRankingModule.csproj b/src/Modules/LiveRankingModule/LiveRankingModule.csproj
index 086f1bd59..b77b78dd2 100644
--- a/src/Modules/LiveRankingModule/LiveRankingModule.csproj
+++ b/src/Modules/LiveRankingModule/LiveRankingModule.csproj
@@ -11,6 +11,10 @@
         <ProjectReference Include="..\..\EvoSC.Modules.SourceGeneration\EvoSC.Modules.SourceGeneration.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
         <ProjectReference Include="..\..\EvoSC.Modules\EvoSC.Modules.csproj" />
         <EmbeddedResource Include="Templates\**\*" />
+        <EmbeddedResource Update="Localization.resx">
+          <Generator>ResXFileCodeGenerator</Generator>
+          <LastGenOutput>Localization.Designer.cs</LastGenOutput>
+        </EmbeddedResource>
     </ItemGroup>
 
 
diff --git a/src/Modules/LiveRankingModule/Localization.resx b/src/Modules/LiveRankingModule/Localization.resx
new file mode 100644
index 000000000..02cf34b4b
--- /dev/null
+++ b/src/Modules/LiveRankingModule/Localization.resx
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    <xsd:element name="root" msdata:IsDataSet="true">
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/src/Modules/LiveRankingModule/Models/ExpandedLiveRankingPosition.cs b/src/Modules/LiveRankingModule/Models/ExpandedLiveRankingPosition.cs
deleted file mode 100644
index cd2b166c9..000000000
--- a/src/Modules/LiveRankingModule/Models/ExpandedLiveRankingPosition.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using EvoSC.Common.Interfaces.Models;
-
-namespace EvoSC.Modules.Official.LiveRankingModule.Models;
-
-public record ExpandedLiveRankingPosition
-{
-    /// <summary>
-    /// The player.
-    /// </summary>
-    public required IOnlinePlayer Player { get; init; }
-    
-    /// <summary>
-    /// The time at the checkpoint.
-    /// </summary>
-    public required int CheckpointTime { get; init; }
-    
-    /// <summary>
-    /// The index of the checkpoint.
-    /// </summary>
-    public required int CheckpointIndex { get; init; }
-    
-    /// <summary>
-    /// Whether the player retreated from the round.
-    /// </summary>
-    public required bool IsDnf { get; init; }
-    
-    /// <summary>
-    /// Whether the player crossed the finish line.
-    /// </summary>
-    public required bool IsFinish { get; init; }
-    
-    /// <summary>
-    /// The difference in milliseconds of the players time to the leading players time.
-    /// </summary>
-    public int DiffToFirstPosition { get; set; }
-}
diff --git a/src/Modules/LiveRankingModule/Models/LiveRankingPosition.cs b/src/Modules/LiveRankingModule/Models/LiveRankingPosition.cs
index 98d0a8764..9952cb07e 100644
--- a/src/Modules/LiveRankingModule/Models/LiveRankingPosition.cs
+++ b/src/Modules/LiveRankingModule/Models/LiveRankingPosition.cs
@@ -1,11 +1,3 @@
 namespace EvoSC.Modules.Official.LiveRankingModule.Models;
 
-/// <summary>
-/// The live ranking position of a player.
-/// </summary>
-/// <param name="AccountId">Account Id of the player.</param>
-/// <param name="CpTime">The checkpoint time of the player.</param>
-/// <param name="CpIndex">The checkpoint index that was driven through.</param>
-/// <param name="IsDnf">Whether the player has given up or not.</param>
-/// <param name="IsFinish">Whether the player has finished.</param>
-public record LiveRankingPosition(string AccountId, int CpTime, int CpIndex, bool IsDnf, bool IsFinish);
+public record LiveRankingPosition(string AccountId, string Name, int Position, int Time, int Points);
diff --git a/src/Modules/LiveRankingModule/Models/LiveRankingStore.cs b/src/Modules/LiveRankingModule/Models/LiveRankingStore.cs
deleted file mode 100644
index 96fcb09eb..000000000
--- a/src/Modules/LiveRankingModule/Models/LiveRankingStore.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-using System.Collections.Concurrent;
-using EvoSC.Common.Interfaces.Services;
-
-namespace EvoSC.Modules.Official.LiveRankingModule.Models;
-
-internal class LiveRankingStore(IPlayerManagerService playerManager)
-{
-    private ConcurrentDictionary<string, LiveRankingPosition> _curLiveRanking { get; set; } = new();
-    private ConcurrentDictionary<string, LiveRankingPosition> _prevLiveRanking { get; set; } = new();
-
-    private MatchInfo _matchInfo = new();
-
-    internal Task ResetLiveRankingsAsync()
-    {
-        _curLiveRanking.Clear();
-
-        return Task.CompletedTask;
-    }
-
-    internal void RegisterTime(string accountId, int cpIndex, int cpTime, bool isFinish)
-    {
-        _prevLiveRanking = new ConcurrentDictionary<string, LiveRankingPosition>(_curLiveRanking);
-        var liveRankingPosition = new LiveRankingPosition(accountId, cpTime, cpIndex, false, isFinish);
-
-        _curLiveRanking.AddOrUpdate(accountId, _ => liveRankingPosition, (_, _) => liveRankingPosition);
-    }
-
-    internal void RegisterPlayerGiveUp(string accountId)
-    {
-        _prevLiveRanking = new ConcurrentDictionary<string, LiveRankingPosition>(_curLiveRanking);
-
-        _curLiveRanking.AddOrUpdate(accountId, _ => new LiveRankingPosition(accountId, 0, 0, true, false),
-            (_, arg) => new LiveRankingPosition(accountId, arg.CpTime, arg.CpIndex, true, false));
-    }
-
-    /// <summary>
-    /// This sorts the live ranking based on the following criteria:
-    /// - DNFd players should always be at the bottom
-    /// - Players with a higher cpIndex should always be at the top
-    /// - Players with the faster CP time at the same CP index should be in a higher position
-    /// </summary>
-    internal static List<ExpandedLiveRankingPosition> SortLiveRanking(
-        IEnumerable<ExpandedLiveRankingPosition> positions)
-    {
-        return positions
-            .OrderBy(a => a.IsDnf)
-            .ThenByDescending(a => a.CheckpointIndex)
-            .ThenBy(a => a.CheckpointTime).ToList();
-    }
-
-    internal async Task<List<ExpandedLiveRankingPosition>> GetFullLiveRankingAsync()
-    {
-        List<ExpandedLiveRankingPosition> expandedLiveRanking = new();
-        foreach (var rank in _curLiveRanking)
-        {
-            var player = await playerManager.GetOnlinePlayerAsync(rank.Value.AccountId);
-            expandedLiveRanking.Add(new ExpandedLiveRankingPosition
-            {
-                Player = player,
-                CheckpointTime = rank.Value.CpTime,
-                CheckpointIndex = rank.Value.CpIndex,
-                IsDnf = rank.Value.IsDnf,
-                IsFinish = rank.Value.IsFinish
-            });
-        }
-
-        var sortedExpandedLiveRanking = SortLiveRanking(expandedLiveRanking);
-
-        return sortedExpandedLiveRanking;
-    }
-
-    internal async Task<List<ExpandedLiveRankingPosition>> GetFullPreviousLiveRankingAsync()
-    {
-        List<ExpandedLiveRankingPosition> expandedLiveRanking = new();
-        foreach (var rank in _prevLiveRanking)
-        {
-            var player = await playerManager.GetOnlinePlayerAsync(rank.Value.AccountId);
-            expandedLiveRanking.Add(new ExpandedLiveRankingPosition
-            {
-                Player = player,
-                CheckpointTime = rank.Value.CpTime,
-                CheckpointIndex = rank.Value.CpIndex,
-                IsDnf = rank.Value.IsDnf,
-                IsFinish = rank.Value.IsFinish
-            });
-        }
-
-        return expandedLiveRanking;
-    }
-
-    internal void SetCurrentMap(string name)
-    {
-        _matchInfo.MapName = name;
-    }
-
-    internal void SetWorldRecord(string wrHolder, string wrTime)
-    {
-        _matchInfo.WrHolderName = wrHolder;
-        _matchInfo.WrTime = wrTime;
-    }
-
-    internal void IncreaseRoundCounter()
-    {
-        _matchInfo.NumRound++;
-    }
-
-    internal void ResetRoundCounter()
-    {
-        _matchInfo.NumRound = 0;
-    }
-
-    internal void IncreaseTrackCounter()
-    {
-        _matchInfo.NumTrack++;
-    }
-
-    internal void ResetTrackCounter()
-    {
-        _matchInfo.NumTrack = 0;
-    }
-
-    internal MatchInfo GetMatchInfo()
-    {
-        return _matchInfo;
-    }
-}
diff --git a/src/Modules/LiveRankingModule/Models/LiveRankingWidgetPosition.cs b/src/Modules/LiveRankingModule/Models/LiveRankingWidgetPosition.cs
deleted file mode 100644
index b815f8b02..000000000
--- a/src/Modules/LiveRankingModule/Models/LiveRankingWidgetPosition.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using EvoSC.Common.Interfaces.Models;
-
-namespace EvoSC.Modules.Official.LiveRankingModule.Models;
-
-public record LiveRankingWidgetPosition(int Position, IPlayer Player, string Login, string Time, int CpIndex, bool IsFinish);
diff --git a/src/Modules/LiveRankingModule/Models/MatchInfo.cs b/src/Modules/LiveRankingModule/Models/MatchInfo.cs
deleted file mode 100644
index 1e6f62f87..000000000
--- a/src/Modules/LiveRankingModule/Models/MatchInfo.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-namespace EvoSC.Modules.Official.LiveRankingModule.Models;
-
-public class MatchInfo
-{
-    /// <summary>
-    /// The name of the map.
-    /// </summary>
-    public string MapName { get; set; }
-    /// <summary>
-    /// The number of the round.
-    /// </summary>
-    public int NumRound { get; set; }
-    /// <summary>
-    /// The number of the map.
-    /// </summary>
-    public int NumTrack { get; set; }
-    /// <summary>
-    /// Name of world record holder.
-    /// </summary>
-    public string WrHolderName { get; set; }
-    /// <summary>
-    /// Current world record time.
-    /// </summary>
-    public string WrTime { get; set; }
-}
diff --git a/src/Modules/LiveRankingModule/Services/LiveRankingService.cs b/src/Modules/LiveRankingModule/Services/LiveRankingService.cs
index 7da1770ec..131063c7d 100644
--- a/src/Modules/LiveRankingModule/Services/LiveRankingService.cs
+++ b/src/Modules/LiveRankingModule/Services/LiveRankingService.cs
@@ -1,259 +1,87 @@
-using System.Globalization;
-using EvoSC.Common.Interfaces;
+using EvoSC.Common.Interfaces;
 using EvoSC.Common.Interfaces.Services;
+using EvoSC.Common.Models.Callbacks;
 using EvoSC.Common.Remote.EventArgsModels;
 using EvoSC.Common.Services.Attributes;
 using EvoSC.Common.Services.Models;
-using EvoSC.Common.Util;
+using EvoSC.Common.Util.MatchSettings;
 using EvoSC.Manialinks.Interfaces;
+using EvoSC.Modules.Official.LiveRankingModule.Config;
 using EvoSC.Modules.Official.LiveRankingModule.Interfaces;
 using EvoSC.Modules.Official.LiveRankingModule.Models;
-using GbxRemoteNet.Events;
-using Microsoft.Extensions.Logging;
 
 namespace EvoSC.Modules.Official.LiveRankingModule.Services;
 
 [Service(LifeStyle = ServiceLifeStyle.Singleton)]
-public class LiveRankingService(ILogger<LiveRankingService> logger, IManialinkManager manialinkManager,
-        IServerClient client, IPlayerManagerService playerManager)
-    : ILiveRankingService
+public class LiveRankingService(
+    IManialinkManager manialinkManager,
+    IServerClient server,
+    ILiveRankingSettings settings,
+    IPlayerManagerService playerManager,
+    IMatchSettingsService matchSettingsService
+) : ILiveRankingService
 {
-    private const int ShowRows = 4;
+    private const string WidgetTemplate = "LiveRankingModule.LiveRanking";
+    private bool _isPointsBased;
 
-    private readonly LiveRankingStore _liveRankingStore = new(playerManager);
-    private bool _isRoundsMode;
-
-    public async Task OnEnableAsync()
+    public async Task DetectModeAndRequestScoreAsync()
     {
-        logger.LogTrace("LiveRankingModule enabled");
-        await CheckAndSetRoundsMode();
-        await HideNadeoScoreboardAsync();
-        if (_isRoundsMode)
-        {
-            await _liveRankingStore.ResetLiveRankingsAsync();
-            _liveRankingStore.ResetRoundCounter();
-            _liveRankingStore.IncreaseRoundCounter();
-            _liveRankingStore.IncreaseTrackCounter();
-
-            await manialinkManager.SendPersistentManialinkAsync("LiveRankingModule.LiveRanking",
-                await GetWidgetDataAsync());
-        }
-
-        await Task.CompletedTask;
+        _isPointsBased = await matchSettingsService.GetCurrentModeAsync() is not DefaultModeScriptName.TimeAttack;
+        await RequestScoresAsync();
     }
 
-    public async Task OnDisableAsync()
-    {
-        logger.LogTrace("LiveRankingModule disabled");
-        await manialinkManager.HideManialinkAsync("LiveRankingModule.LiveRanking");
-        await Task.CompletedTask;
-    }
+    public Task RequestScoresAsync()
+        => server.Remote.TriggerModeScriptEventArrayAsync("Trackmania.GetScores");
 
-    public async Task OnPlayerWaypointAsync(WayPointEventArgs args)
+    public async Task MapScoresAndSendWidgetAsync(ScoresEventArgs scores)
     {
-        await CheckAndSetRoundsMode();
-        if (_isRoundsMode)
-        {
-            logger.LogTrace("Player crossed a checkpoint: {ArgsAccountId} - RoundsMode: {IsRoundsMode}",
-                args.AccountId, _isRoundsMode);
-
-            _liveRankingStore.RegisterTime(args.AccountId, args.CheckpointInRace, args.RaceTime, args.IsEndRace);
-
-            await manialinkManager.SendPersistentManialinkAsync("LiveRankingModule.LiveRanking",
-                await GetWidgetDataAsync());
-        }
+        await manialinkManager.SendPersistentManialinkAsync(WidgetTemplate,
+            new { settings, isPointsBased = _isPointsBased, scores = await MapScoresAsync(scores) });
     }
 
-    private async Task<dynamic> GetWidgetDataAsync()
+    public Task<IEnumerable<LiveRankingPosition>> MapScoresAsync(ScoresEventArgs scores)
     {
-        var currentRanking = (await _liveRankingStore.GetFullLiveRankingAsync()).Take(ShowRows).ToList();
-        await CalculateDiffsAsync(currentRanking);
-        var widgetCurrentRanking = GetLiveRankingForWidget(currentRanking);
-
-        return new { rankings = widgetCurrentRanking, };
-    }
-
-    public Task CalculateDiffsAsync(List<ExpandedLiveRankingPosition> rankings)
-    {
-        if (rankings.Count > 0)
-        {
-            var firstRanking = rankings.First();
-            foreach (var ranking in rankings)
-            {
-                ranking.DiffToFirstPosition = firstRanking.CheckpointTime - ranking.CheckpointTime;
-            }
-        }
-
-        return Task.CompletedTask;
+        return Task.FromResult(
+            scores.Players.Take(settings.MaxWidgetRows)
+                .Where(score => score != null)
+                .OfType<PlayerScore>()
+                .Where(ScoreShouldBeDisplayed)
+                .Select(PlayerScoreToLiveRankingPosition)
+        );
     }
 
-    public async Task OnPlayerGiveupAsync(PlayerUpdateEventArgs args)
-    {
-        await CheckAndSetRoundsMode();
-        if (_isRoundsMode)
-        {
-            logger.LogTrace("Player gave up: {ArgsAccountId} - RoundsMode: {IsRoundsMode}", args.AccountId,
-                _isRoundsMode);
-
-            _liveRankingStore.RegisterPlayerGiveUp(args.AccountId);
+    public Task HideWidgetAsync()
+        => manialinkManager.HideManialinkAsync(WidgetTemplate);
 
-            await manialinkManager.SendPersistentManialinkAsync("LiveRankingModule.LiveRanking",
-                await GetWidgetDataAsync());
-        }
-    }
+    public Task<bool> CurrentModeIsPointsBasedAsync()
+        => Task.FromResult(_isPointsBased);
 
-    public async Task OnBeginMapAsync(MapEventArgs args)
+    public bool ScoreShouldBeDisplayed(PlayerScore score)
     {
-        logger.LogTrace("Map starts: {MapName}, IsRounds: {IsRoundsMode}", args.Map.Name, _isRoundsMode);
-        await CheckAndSetRoundsMode();
-        if (!_isRoundsMode)
-        {
-            await Task.CompletedTask;
-        }
-        else
+        if (_isPointsBased)
         {
-            _liveRankingStore.ResetRoundCounter();
-            _liveRankingStore.IncreaseRoundCounter();
-            _liveRankingStore.IncreaseTrackCounter();
-            await _liveRankingStore.ResetLiveRankingsAsync();
+            return score.MatchPoints > 0;
         }
-    }
 
-    public async Task OnEndMapAsync(MapEventArgs args)
-    {
-        await CheckAndSetRoundsMode();
-        logger.LogTrace("Map ends: {MapName} - RoundsMode: {IsRoundsMode}", args.Map.Name, _isRoundsMode);
-        if (_isRoundsMode)
-        {
-            await _liveRankingStore.ResetLiveRankingsAsync();
-            await manialinkManager.HideManialinkAsync("LiveRankingModule.LiveRanking");
-            await manialinkManager.HideManialinkAsync("LiveRankingModule.MatchInfo");
-        }
+        return score.BestRaceTime > 0;
     }
 
-    public async Task ResetLiveRankingAsync()
+    public LiveRankingPosition PlayerScoreToLiveRankingPosition(PlayerScore score)
     {
-        await _liveRankingStore.ResetLiveRankingsAsync();
-    }
+        var player = playerManager.GetPlayerAsync(score.AccountId).Result;
+        var nickname = score.Name;
 
-    public async Task OnStartRoundAsync(RoundEventArgs args)
-    {
-        logger.LogTrace("Round {ArgsCount} starts - RoundsMode: {IsRoundsMode}", args.Count, _isRoundsMode);
-        await _liveRankingStore.ResetLiveRankingsAsync();
-        await manialinkManager.SendPersistentManialinkAsync("LiveRankingModule.LiveRanking",
-            await GetWidgetDataAsync());
-    }
-
-    public async Task SendManialinkAsync()
-    {
-        await manialinkManager.SendPersistentManialinkAsync("LiveRankingModule.LiveRanking",
-            await GetWidgetDataAsync());
-    }
-
-    public async Task OnEndRoundAsync(RoundEventArgs args)
-    {
-        logger.LogTrace("Round {ArgsCount} ends - RoundsMode: {IsRoundsMode}", args.Count, _isRoundsMode);
-        var liveRanking = await _liveRankingStore.GetFullLiveRankingAsync();
-        var nbFinished = liveRanking.FindAll(x => x.IsFinish);
-        if (nbFinished.Count > 0)
+        if (player != null)
         {
-            logger.LogTrace("MatchInfo Rounds before: {ArgsCount}", _liveRankingStore.GetMatchInfo().NumRound);
-            _liveRankingStore.IncreaseRoundCounter();
-            logger.LogTrace("MatchInfo Rounds after: {ArgsCount}", _liveRankingStore.GetMatchInfo().NumRound);
+            nickname = player.NickName;
         }
-    }
 
-    public async Task OnBeginMatchAsync()
-    {
-        await SendManialinkAsync();
-    }
-
-    public async Task OnEndMatchAsync(EndMatchGbxEventArgs args)
-    {
-        await HideManialinkAsync();
-    }
-
-    public async Task OnPodiumStartAsync(PodiumEventArgs args)
-    {
-        await CheckAndSetRoundsMode();
-        await HideManialinkAsync();
-    }
-
-    public async Task HideNadeoScoreboardAsync()
-    {
-        var hudSettings = new List<string>
-        {
-            @"{
-    ""uimodules"": [
-        {
-            ""id"": ""Rounds_SmallScoresTable"",
-            ""visible"": false,
-            ""visible_update"": true
-        }
-    ]
-}"
-        };
-
-        await client.Remote.TriggerModeScriptEventArrayAsync("Common.UIModules.SetProperties", hudSettings.ToArray());
-    }
-
-    private async Task HideManialinkAsync()
-    {
-        await manialinkManager.HideManialinkAsync("LiveRankingModule.LiveRanking");
-    }
-
-    private string FormatTime(int time, bool isDelta)
-    {
-        TimeSpan ts = TimeSpan.FromMilliseconds(time);
-
-        if (isDelta)
-        {
-            return $"+ {Math.Abs(ts.Seconds)}.{ts.ToString("fff", CultureInfo.InvariantCulture)}";
-        }
-
-        if (time > 60_000)
-        {
-            return $"{ts.ToString(@"mm\:ss\.fff", CultureInfo.InvariantCulture)}";
-        }
-
-        return $"{ts.ToString(@"ss\.fff", CultureInfo.InvariantCulture)}";
-    }
-
-    private List<LiveRankingWidgetPosition> GetLiveRankingForWidget(List<ExpandedLiveRankingPosition> liveRanking)
-    {
-        return liveRanking.Select(RankingToTime).ToList();
-    }
-
-    private LiveRankingWidgetPosition RankingToTime(ExpandedLiveRankingPosition ranking, int i)
-    {
-        var formattedTime = "DNF";
-
-        if (ranking.IsDnf)
-        {
-            return new LiveRankingWidgetPosition(i + 1, ranking.Player, ranking.Player.GetLogin(), formattedTime,
-                ranking.CheckpointIndex + 1, ranking.IsFinish);
-        }
-
-        var isDeltaTime = i > 0;
-        var timeToFormat = isDeltaTime ? ranking.DiffToFirstPosition : ranking.CheckpointTime;
-        formattedTime = FormatTime(timeToFormat, isDeltaTime);
-
-        return new LiveRankingWidgetPosition(i + 1, ranking.Player, ranking.Player.GetLogin(), formattedTime,
-            ranking.CheckpointIndex + 1, ranking.IsFinish);
-    }
-
-    private async Task CheckAndSetRoundsMode()
-    {
-        List<string> validModes = new List<string>
-        {
-            "Trackmania/TM_Rounds_Online.Script.txt", "Trackmania/TM_Cup_Online.Script.txt"
-        };
-        var scriptInfo = await client.Remote.GetModeScriptInfoAsync();
-        _isRoundsMode = validModes.Contains(scriptInfo.Name);
-    }
-
-    public MatchInfo GetMatchInfo()
-    {
-        return _liveRankingStore.GetMatchInfo();
+        return new LiveRankingPosition(
+            score.AccountId,
+            nickname,
+            score.Rank,
+            score.BestRaceTime,
+            score.MatchPoints
+        );
     }
 }
diff --git a/src/Modules/LiveRankingModule/Templates/Components/LiveRankingRecordRow.mt b/src/Modules/LiveRankingModule/Templates/Components/LiveRankingRecordRow.mt
new file mode 100644
index 000000000..4565e05b2
--- /dev/null
+++ b/src/Modules/LiveRankingModule/Templates/Components/LiveRankingRecordRow.mt
@@ -0,0 +1,68 @@
+<component>
+    <using namespace="EvoSC.Common.Interfaces.Util"/>
+
+    <import component="EvoSC.Controls.Panel" as="Panel"/>
+
+    <property type="double" name="width" default="36"/>
+    <property type="double" name="height" default="4"/>
+    <property type="double" name="y" default="0"/>
+
+    <property type="int" name="pos"/>
+    <property type="string" name="name"/>
+    <property type="IRaceTime" name="time"/>
+    <property type="bool" name="self" default="false"/>
+    <property type="int" name="points"/>
+    <property type="bool" name="usePoints"/>
+
+    <template>
+        <frame pos="0 {{ y }}">
+            <quad
+                    bgcolor="{{ Theme.UI_LiveRankingModule_Widget_AccentColor(pos) }}"
+                    size="0.7 {{ height }}"
+                    pos="0 0"
+            />
+            <quad
+                    bgcolor="{{ Theme.UI_AccentSecondary }}"
+                    size="{{ height }} {{ height }}"
+                    opacity="0.9"
+                    pos="0.7 0"
+            />
+            <label
+                    text="{{ pos }}"
+                    class="text-primary"
+                    pos="{{ 0.6 + height/2 }} {{ -height/2.0 + 0.2 }}"
+                    size="{{ height }} {{ height }}"
+                    valign="center"
+                    halign="center"
+                    textcolor="{{ Theme.Black }}"
+            />
+
+            <Panel
+                    width="{{ width-4 }}"
+                    height="4"
+                    className='{{ self ? "lr-body-highlight" : "lr-body-primary" }}'
+                    x="4.7"
+                    bgColor=""
+            >
+                <label
+                        text="{{ name }}"
+                        class="text-primary"
+                        textsize="0.5"
+                        pos="1 {{ -height/2.0 + 0.2 }}"
+                        valign="center"
+                        size="{{ width-18 }} {{ height }}"
+                />
+
+                <label
+                        text='{{ usePoints ? points : Util.StyledTime(time) }}'
+                        class="text-primary"
+                        textsize="0.5"
+                        pos="{{ width-5.0 }} {{ -height/2.0 + 0.2 }}"
+                        valign="center"
+                        halign="right"
+                        size="16 {{ height }}"
+                />
+            </Panel>
+        </frame>
+    </template>
+</component>
diff --git a/src/Modules/LiveRankingModule/Templates/Components/LiveRankingStyles.mt b/src/Modules/LiveRankingModule/Templates/Components/LiveRankingStyles.mt
new file mode 100644
index 000000000..e0cb07bbf
--- /dev/null
+++ b/src/Modules/LiveRankingModule/Templates/Components/LiveRankingStyles.mt
@@ -0,0 +1,19 @@
+<component>
+    <import component="EvoSC.Style.UIStyle" as="UIStyle"/>
+    
+    <template>
+        <UIStyle/>
+        <stylesheet>
+            <style
+                    class="lr-body-primary"
+                    bgcolor="{{ Theme.UI_LiveRankingModule_Widget_RowBg }}"
+                    opacity="0.9"
+            />
+            <style
+                    class="lr-body-highlight"
+                    bgcolor="{{ Theme.UI_LiveRankingModule_Widget_RowBgHighlight }}"
+                    opacity="0.9"
+            />
+        </stylesheet>
+    </template>
+</component>
\ No newline at end of file
diff --git a/src/Modules/LiveRankingModule/Templates/Components/NoFinishesBox.mt b/src/Modules/LiveRankingModule/Templates/Components/NoFinishesBox.mt
new file mode 100644
index 000000000..866bd6f39
--- /dev/null
+++ b/src/Modules/LiveRankingModule/Templates/Components/NoFinishesBox.mt
@@ -0,0 +1,32 @@
+<component>
+    <using namespace="EvoSC.Common.Util.Manialinks"/>
+    
+    <property type="double" name="width" default="36"/>
+    <property type="WidgetPosition" name="position" default="WidgetPosition.Right"/>
+    
+    <template>
+        <frame>
+            <quad pos='{{ position == WidgetPosition.Right ? width + 0.7 : 0 }}'
+                  bgcolor="{{ Theme.UI_AccentPrimary }}"
+                  size="0.7 9"
+                  halign='{{ position == WidgetPosition.Right ? "right" : "left" }}'
+            />
+            <Panel
+                    width="{{ width }}"
+                    height="9"
+                    x='{{ position == WidgetPosition.Right ? 0 : 0.7 }}'
+                    className="lr-body-primary"
+                    bgColor=""
+            >
+                <label
+                        class="text-primary"
+                        text="No finishes"
+                        valign="center"
+                        halign="center"
+                        pos="18 -4.2"
+                        size="{{ width }} 9"
+                />
+            </Panel>
+        </frame>
+    </template>
+</component>
\ No newline at end of file
diff --git a/src/Modules/LiveRankingModule/Templates/Components/PlayerScore.mt b/src/Modules/LiveRankingModule/Templates/Components/PlayerScore.mt
deleted file mode 100644
index 3cf995b4d..000000000
--- a/src/Modules/LiveRankingModule/Templates/Components/PlayerScore.mt
+++ /dev/null
@@ -1,123 +0,0 @@
-<component>
-    <using namespace="EvoSC.Modules.Official.LiveRankingModule.Models"/>
-
-    <property type="LiveRankingWidgetPosition?" name="ranking" default="null"/>
-
-    <property type="double" name="y" default="0.0"/>
-    <property type="double" name="w" default="66.0"/>
-    <property type="double" name="h" default="6.0"/>
-    <property type="double" name="rowSpacing" default="1.0"/>
-    <property type="string" name="positionColor" default="ffd12d"/>
-    <property type="string" name="playerRowBackgroundColor" default="999999"/>
-
-    <template>
-        <frame id="player_row_{{ ranking?.Login }}" pos="0 {{ y }}">
-            <quad id="player_row_trigger_{{ ranking?.Login }}"
-                  size="{{ w + 10.0 }} {{ h }}"
-                  ScriptEvents="1"
-            />
-
-            <!-- POSITION BOX -->
-            <quad pos="-1 0"
-                  size="8 {{ h }}"
-                  style="UICommon64_1"
-                  substyle="BgFrame2"
-                  colorize="{{ positionColor }}"
-            />
-
-            <!-- POSITION NUMBER -->
-            <label id="position"
-                   pos="3.25 {{ h / -2.0 + 0.25 }}"
-                   size="7 5"
-                   text="{{ ranking?.Position }}"
-                   halign="center"
-                   valign="center"
-                   textfont="{{ Font.Bold }}"
-                   textsize="2"
-                   textcolor="{{ Theme.LiveRankingModule_LiveRanking_Default_TextPosition }}"
-                   textprefix="$i"
-            />
-
-            <frame pos="8 0">
-                <frame size="0.95 999">
-                    <quad pos="0 0.1"
-                          size="2 {{ h + 0.25 }}"
-                          style="UICommon64_1"
-                          substyle="BgFrame2"
-                          colorize="{{ Theme.LiveRankingModule_PlayerScore_Default_Bg }}"
-                          opacity="0.75"
-                    />
-                </frame>
-
-                <!-- GRADIENT -->
-                <quad pos="1 0"
-                      size="{{ w - 1 }} {{ h }}"
-                      image="file://Media/Painter/Stencils/15-Stripes/_Stripe0Grad/Brush.tga"
-                      modulatecolor="{{ Theme.LiveRankingModule_PlayerScore_Default_Bg }}"
-                      opacity="0.75"
-                />
-
-                <!-- NAME -->
-                <label pos="2 {{ h / -2.0 }}"
-                       size="{{ w * 0.66 }} 6"
-                       text="{{ ranking?.Player?.NickName }}"
-                       valign="center2"
-                       textfont="{{ Font.Regular }}"
-                       textsize="1.15"
-                       textprefix="$i$t"
-                       textcolor="{{ Theme.LiveRankingModule_LiveRanking_Default_Text }}"
-                />
-
-                <!-- TIME -->
-                <label id="score"
-                       pos="{{ w - 9.0 }} {{ h / -2.0 }}"
-                       size="15 5"
-                       text="{{ ranking?.Time }}"
-                       valign="center2"
-                       halign="right"
-                       textfont="{{ Font.Regular }}"
-                       textsize="1.15"
-                       textprefix="$i$t"
-                       textcolor="{{ Theme.LiveRankingModule_LiveRanking_Default_Text }}"
-                />
-
-                <!-- CP-ID BOX -->
-                <quad pos="{{ w - 2.0 }} {{ h / -2.0 + 0.15 }}"
-                      size="6 {{ h - 2.0 }}"
-                      style="UICommon64_1"
-                      substyle="BgFrame2"
-                      colorize="{{ Theme.LiveRankingModule_PlayerScore_Default_Bg }}"
-                      halign="right"
-                      valign="center"
-                      opacity="0.75"
-                />
-
-                <label id="cp_index"
-                       pos="{{ w - 5.0 }} {{ h / -2.0 }}"
-                       size="5 5"
-                       text='{{ ranking != null ? (ranking.IsFinish ? Icons.FlagCheckered : ranking.CpIndex) : "" }}'
-                       valign="center2"
-                       halign="center"
-                       textfont="{{ Font.ExtraBold }}"
-                       textsize="0.9"
-                       opacity="0.9"
-                       textprefix="$i$t"
-                       textcolor="{{ Theme.LiveRankingModule_LiveRanking_Default_Text }}"
-                />
-            </frame>
-        </frame>
-    </template>
-
-    <script>
-        <!--
-            *** OnMouseClick ***
-            ***
-            if(Event.Control.ControlId == "player_row_trigger_{{ ranking?.Login }}"){
-                if(!IsSpectatorClient) RequestSpectatorClient(True);
-                SetSpectateTarget("{{ ranking?.Login }}");
-                continue;
-            }
-            ***
-        -->
-    </script>
-</component>
diff --git a/src/Modules/LiveRankingModule/Templates/CurrentPlayer.mt b/src/Modules/LiveRankingModule/Templates/CurrentPlayer.mt
deleted file mode 100644
index c0165d01a..000000000
--- a/src/Modules/LiveRankingModule/Templates/CurrentPlayer.mt
+++ /dev/null
@@ -1,32 +0,0 @@
-<component>
-    <property type="string" name="username"/>
-    
-    <template>
-        <frame>
-            <quad
-                    pos="0 0"
-                    z-index="1"
-                    size="7 5" 
-                    style="UICommon64_1" 
-                    substyle="BgFrame2"
-                    opacity="1"
-                    colorize="{{ Theme.LiveRankingModule_CurrentPlayer_Default_Bg }}"/>
-          
-            <label 
-                    pos="3.5 -2.25" 
-                    z-index="2" 
-                    size="7 5" 
-                    text="1"
-                    halign="center" 
-                    valign="center"
-                    textfont="{{ Font.Bold }}" 
-                    textsize="2" 
-                    textcolor="{{ Theme.LiveRankingModule_CurrentPlayer_Default_Text }}" textprefix="$i"/>
-            
-            <label pos="10 -2.5" z-index="3" size="50 5" text="ASfasfaf" valign="center2" textfont="{{ Font.Regular }}" textsize="1" textprefix="$i$t"/>
-            <label pos="65 -2.5" z-index="3" size="15 5" text="01:30.238" valign="center2" textfont="{{ Font.Regular }}" textsize="1" textprefix="$i$t" halign="center"/>
-            
-            <quad z-index="2" pos="9 0" size="50 5" image="file://Media/Painter/Stencils/15-Stripes/_Stripe0Grad/Brush.tga" opacity="1" modulatecolor="{{ Theme.LiveRankingModule_CurrentPlayer_Default_Gradient }}" />
-        </frame>
-    </template>
-</component>
\ No newline at end of file
diff --git a/src/Modules/LiveRankingModule/Templates/LiveRanking.mt b/src/Modules/LiveRankingModule/Templates/LiveRanking.mt
index ba8884f24..1d0bac552 100644
--- a/src/Modules/LiveRankingModule/Templates/LiveRanking.mt
+++ b/src/Modules/LiveRankingModule/Templates/LiveRanking.mt
@@ -1,102 +1,42 @@
 <component>
+    <using namespace="EvoSC.Modules.Official.LiveRankingModule.Config"/>
     <using namespace="EvoSC.Modules.Official.LiveRankingModule.Models"/>
+    <using namespace="EvoSC.Common.Util.Manialinks"/>
+    <using namespace="EvoSC.Common.Models.Callbacks"/>
     <using namespace="System.Linq"/>
 
-    <import component="LiveRankingModule.Components.PlayerScore" as="PlayerScore"/>
+    <import component="EvoSC.Containers.Widget" as="Widget"/>
+    <import component="EvoSC.Controls.Panel" as="Panel"/>
+    <import component="LiveRankingModule.Components.LiveRankingRecordRow" as="LiveRankingRecordRow"/>
+    <import component="LiveRankingModule.Components.LiveRankingStyles" as="LiveRankingStyles"/>
+    <import component="LiveRankingModule.Components.NoFinishesBox" as="NoFinishesBox"/>
 
-    <property type="List<LiveRankingWidgetPosition>" name="rankings"/>
-
-    <property type="double" name="scale" default="0.9"/>
-    <property type="double" name="w" default="68.0"/>
-    <property type="double" name="x" default="-160.0"/>
-    <property type="double" name="y" default="78.0"/>
-    <property type="double" name="headerHeight" default="8.0"/>
-    <property type="double" name="rowHeight" default="6.0"/>
-    <property type="double" name="rowSpacing" default="1.0"/>
-    <property type="int" name="rowsVisible" default="4"/>
-    
-    <property type="string" name="headerColor" default="c21d62"/>
-    <property type="string" name="primaryColor" default="4357ea"/>
-    <property type="string" name="playerRowBackgroundColor" default="999999"/>
-    <property type="string" name="logoUrl" default=""/>
+    <property type="ILiveRankingSettings" name="settings"/>
+    <property type="IEnumerable<LiveRankingPosition>" name="scores"/>
+    <property type="bool" name="isPointsBased"/>
 
     <template>
-        <frame id="live_rankings" pos="{{ x }} {{ y }}" size="{{ w }} 999" scale="{{ scale }}" z-index="100">
-            <frame>
-                <frame size="{{ w }} {{ headerHeight - 0.1 }}">
-                    <!-- HEADER -->
-                    <quad pos="{{ w * 0.5 - 10.0 }} 0.15"
-                          size="{{ headerHeight + 0.3 }} {{ w + 20.1 }}"
-                          valign="center"
-                          style="UICommon64_1"
-                          substyle="BgFrame1"
-                          colorize="{{ Theme.LiveRankingModule_LiveRanking_Default_BgHeaderGrad1 }}"
-                          rot="90"
-                    />
-
-                    <!-- GRADIENT -->
-                    <quad size="{{ w }} {{ headerHeight + 0.1 }}"
-                          image="file://Media/Painter/Stencils/15-Stripes/_Stripe0Grad/Brush.tga"
-                          modulatecolor="{{ Theme.LiveRankingModule_LiveRanking_Default_BgHeaderGrad2 }}"
-                    />
-
-                    <!-- LABEL -->
-                    <label pos="2 {{ headerHeight / -2.0 - 0.4 }}"
-                           text="Live Ranking"
-                           valign="center2"
-                           textfont="{{ Font.Bold }}"
-                           textcolor="{{ Theme.LiveRankingModule_LiveRanking_Default_Text }}"
-                           textprefix="$i$t"
-                           textsize="2"
-                    />
-
-                    <!-- LOGO -->
-                    <quad if='Theme.LiveRankingModule_LiveRanking_Default_Logo != ""'
-                          pos="{{ w - 3.0 }} {{ headerHeight / -2.0 }}"
-                          size="20 3.2"
-                          valign="center"
-                          halign="right"
-                          keepratio="Fit"
-                          image="{{ Theme.CurrentMapModule_CurrentMapWidget_Default_Logo }}"
-                          opacity="0.75"
-                    />
-                </frame>
-                
-                <!-- BACKGROUND -->
-                <quad pos="0 {{ -headerHeight + 0.1 }}"
-                      size="{{ w - 0.15 }} {{ rowsVisible * (rowSpacing + rowHeight) + rowSpacing * 4.0 }}"
-                      bgcolor="{{ Theme.CurrentMapModule_CurrentMapWidget_Default_BgContent }}"
-                      opacity="0.9"
+        <LiveRankingStyles/>
+        <Widget header="Live Ranking"
+                height="10"
+                bodyStyle="unstyled"
+                position='{{ settings.Position == WidgetPosition.Right ? "right" : "left" }}'
+                y="{{ settings.Y }}"
+        >
+            <template slot="body">
+                <LiveRankingRecordRow foreach="LiveRankingPosition score in scores"
+                           y="{{ -__index*(4+0.3) }}"
+                           pos="{{ __index + 1 }}"
+                           name="{{ score.Name }}"
+                           time="{{ RaceTime.FromMilliseconds(score.Time) }}"
+                           points="{{ score.Points }}"
+                           usePoints="{{ isPointsBased }}"
                 />
-            </frame>
-
-            <!-- CONTENT -->
-            <frame id="players" pos="0 {{ -headerHeight - rowSpacing * 2.0 }}" z-index="10">
-                <PlayerScore foreach="LiveRankingWidgetPosition position in rankings"
-                             y="{{ (position.Position - 1) * (rowHeight + rowSpacing) * -1.0 }}"
-                             w="{{ w - 8.0 }}"
-                             h="{{ rowHeight }}"
-                             rowSpacing="{{ rowSpacing }}"
-                             playerRowBackgroundColor="{{ playerRowBackgroundColor }}"
-                             ranking="{{ position }}"
+                <NoFinishesBox if="scores.Count() == 0" 
+                               width="{{ settings.Width }}"
+                               position="{{ settings.Position }}"
                 />
-            </frame>
-        </frame>
+            </template>
+        </Widget>
     </template>
-
-    <script>
-        <!--
-            main() {
-                while(True){
-                    yield;
-                    
-                    foreach(Event in PendingEvents){
-                        if(Event.Type == CMlScriptEvent::Type::MouseClick){
-                            +++ OnMouseClick +++
-                        }
-                    }
-                }
-            }
-        -->
-    </script>
 </component>
diff --git a/src/Modules/LiveRankingModule/Themes/DefaultLiveRankingTheme.cs b/src/Modules/LiveRankingModule/Themes/DefaultLiveRankingTheme.cs
index 03add3d30..e7236adc1 100644
--- a/src/Modules/LiveRankingModule/Themes/DefaultLiveRankingTheme.cs
+++ b/src/Modules/LiveRankingModule/Themes/DefaultLiveRankingTheme.cs
@@ -5,26 +5,24 @@
 
 namespace EvoSC.Modules.Official.LiveRankingModule.Themes;
 
-[Theme(Name = "Live Ranking", Description = "Default theme for the Live Ranking module.")]
+[Theme(Name = "Live Ranking", Description = "Default theme for the live rankings widget.")]
 public class DefaultLiveRankingTheme(IThemeManager theme) : Theme<DefaultLiveRankingTheme>
 { 
     private readonly dynamic _theme = theme.Theme;
 
     public override Task ConfigureAsync()
     {
-        Set("LiveRankingModule.LiveRanking.Default.Text").To(_theme.UI_TextPrimary);
-        Set("LiveRankingModule.LiveRanking.Default.TextPosition").To(_theme.Black);
-        Set("LiveRankingModule.LiveRanking.Default.BgHeaderGrad1").To(_theme.UI_BgPrimary);
-        Set("LiveRankingModule.LiveRanking.Default.BgHeaderGrad2").To(ColorUtils.Darken(_theme.UI_BgPrimary));
-        Set("LiveRankingModule.LiveRanking.Default.BgContent").To(_theme.UI_BgHighlight);
-        Set("LiveRankingModule.LiveRanking.Default.Logo").To(_theme.UI_LogoLight);
-        
-        Set("LiveRankingModule.CurrentPlayer.Default.Text").To(_theme.Black);
-        Set("LiveRankingModule.CurrentPlayer.Default.Bg").To(_theme.Gold);
-        Set("LiveRankingModule.CurrentPlayer.Default.Gradient").To(_theme.UI_BgHighlight);
-        
-        Set("LiveRankingModule.PlayerScore.Default.Bg").To(ColorUtils.Lighten(_theme.UI_BgHighlight));
-        
+        Set("UI.LiveRankingModule.Widget.AccentColor").To((int pos) => pos switch
+        {
+            1 => _theme.Gold,
+            2 => _theme.Silver,
+            3 => _theme.Bronze,
+            _ => _theme.UI_AccentPrimary
+        });
+
+        Set("UI.LiveRankingModule.Widget.RowBg").To(_theme.UI_BgPrimary);
+        Set("UI.LiveRankingModule.Widget.RowBgHighlight").To(ColorUtils.Lighten(_theme.UI_BgPrimary));
+
         return Task.CompletedTask;
     }
 }
diff --git a/src/Modules/LiveRankingModule/Utils/ManialinkUtils.cs b/src/Modules/LiveRankingModule/Utils/ManialinkUtils.cs
deleted file mode 100644
index 15441f171..000000000
--- a/src/Modules/LiveRankingModule/Utils/ManialinkUtils.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace EvoSC.Modules.Official.LiveRankingModule.Utils;
-
-public static class ManialinkUtils
-{
-    public static string GetPositionColor(IEnumerable<string> colors, int position) => position switch 
-    {
-        1 => colors.First(),
-        2 => colors.Skip(1).First(),
-        3 => colors.Skip(2).First(),
-        > 3 => colors.Skip(3).First(),
-        < 1 => throw new InvalidOperationException("Position cannot be lower than 1.")
-    };
-}
diff --git a/src/Modules/LiveRankingModule/Utils/RankingComparer.cs b/src/Modules/LiveRankingModule/Utils/RankingComparer.cs
deleted file mode 100644
index 889dd272c..000000000
--- a/src/Modules/LiveRankingModule/Utils/RankingComparer.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using EvoSC.Modules.Official.LiveRankingModule.Models;
-
-namespace EvoSC.Modules.Official.LiveRankingModule.Utils;
-
-public class RankingComparer : IEqualityComparer<LiveRankingWidgetPosition>
-{
-    public bool Equals(LiveRankingWidgetPosition? x, LiveRankingWidgetPosition? y)
-    {
-        if (x == null || y == null)
-        {
-            return false;
-        }
-        
-        return x.Player.AccountId == y.Player.AccountId;
-    }
-
-    public int GetHashCode(LiveRankingWidgetPosition obj)
-    {
-        return obj.GetHashCode();
-    }
-}
diff --git a/src/Modules/LiveRankingModule/info.toml b/src/Modules/LiveRankingModule/info.toml
index 65399f083..4e0245996 100644
--- a/src/Modules/LiveRankingModule/info.toml
+++ b/src/Modules/LiveRankingModule/info.toml
@@ -1,11 +1,11 @@
 [info]
-# A unique name for this module, this is used as a identifier
+# A unique name for this module, this is used as an identifier
 name = "LiveRankingModule"
 # The title of the module
 title = "LiveRanking Module"
 # A short description of what the module is and does
-summary = "Shows chekpoint positions and times of leading players, for the ongoing round."
+summary = "Shows a widget with the best scores of the running match."
 # The current version of this module, using SEMVER
-version = "1.0.0"
+version = "2.0.0"
 # The name of the author that created this module
 author = "Evo"
diff --git a/src/Modules/MatchRankingModule/Models/MatchRankingWidgetPosition.cs b/src/Modules/MatchRankingModule/Models/MatchRankingWidgetPosition.cs
new file mode 100644
index 000000000..8ea4e9a8a
--- /dev/null
+++ b/src/Modules/MatchRankingModule/Models/MatchRankingWidgetPosition.cs
@@ -0,0 +1,5 @@
+using EvoSC.Common.Interfaces.Models;
+
+namespace EvoSC.Modules.Official.MatchRankingModule.Models;
+
+public record MatchRankingWidgetPosition(int Position, IPlayer Player, string Login, string Time, int CpIndex, bool IsFinish);
diff --git a/src/Modules/MatchRankingModule/Services/MatchRankingService.cs b/src/Modules/MatchRankingModule/Services/MatchRankingService.cs
index 7e7c425da..03fb99577 100644
--- a/src/Modules/MatchRankingModule/Services/MatchRankingService.cs
+++ b/src/Modules/MatchRankingModule/Services/MatchRankingService.cs
@@ -6,7 +6,6 @@
 using EvoSC.Common.Services.Models;
 using EvoSC.Common.Util;
 using EvoSC.Manialinks.Interfaces;
-using EvoSC.Modules.Official.LiveRankingModule.Models;
 using EvoSC.Modules.Official.MatchRankingModule.Interfaces;
 using EvoSC.Modules.Official.MatchRankingModule.Models;
 using Microsoft.Extensions.Logging;
@@ -89,14 +88,14 @@ public async Task HandlePlayerStateChange(string accountId)
         await manialinkManager.SendManialinkAsync(player, Template, await GetWidgetDataAsync());
     }
 
-    private async Task<IEnumerable<LiveRankingWidgetPosition>> MapScoresForWidgetAsync(ScoresEventArgs? scores)
+    private async Task<IEnumerable<MatchRankingWidgetPosition>> MapScoresForWidgetAsync(ScoresEventArgs? scores)
     {
         if (scores == null)
         {
-            return new List<LiveRankingWidgetPosition>();
+            return new List<MatchRankingWidgetPosition>();
         }
 
-        var playerScores = new List<LiveRankingWidgetPosition>();
+        var playerScores = new List<MatchRankingWidgetPosition>();
         foreach (var score in scores.Players)
         {
             if (score == null)
@@ -111,7 +110,7 @@ private async Task<IEnumerable<LiveRankingWidgetPosition>> MapScoresForWidgetAsy
                 continue;
             }
 
-            playerScores.Add(new LiveRankingWidgetPosition(
+            playerScores.Add(new MatchRankingWidgetPosition(
                 score.Rank,
                 player,
                 player.GetLogin(),
diff --git a/src/Modules/MatchRankingModule/Templates/Components/PlayerScore.mt b/src/Modules/MatchRankingModule/Templates/Components/PlayerScore.mt
index 295d7a470..7c25f30a2 100644
--- a/src/Modules/MatchRankingModule/Templates/Components/PlayerScore.mt
+++ b/src/Modules/MatchRankingModule/Templates/Components/PlayerScore.mt
@@ -1,7 +1,7 @@
 <component>
-    <using namespace="EvoSC.Modules.Official.LiveRankingModule.Models"/>
-
-    <property type="LiveRankingWidgetPosition?" name="ranking" default="null"/>
+    <using namespace="EvoSC.Modules.Official.MatchRankingModule.Models"/>
+    
+    <property type="MatchRankingWidgetPosition?" name="ranking" default="null"/>
 
     <property type="double" name="y" default="0.0"/>
     <property type="double" name="w" default="66.0"/>
diff --git a/src/Modules/MatchRankingModule/Templates/MatchRanking.mt b/src/Modules/MatchRankingModule/Templates/MatchRanking.mt
index 55919c571..debd58b93 100644
--- a/src/Modules/MatchRankingModule/Templates/MatchRanking.mt
+++ b/src/Modules/MatchRankingModule/Templates/MatchRanking.mt
@@ -1,11 +1,10 @@
 <component>
     <using namespace="EvoSC.Modules.Official.MatchRankingModule.Models"/>
-    <using namespace="EvoSC.Modules.Official.LiveRankingModule.Models"/>
     <using namespace="System.Linq"/>
     
     <import component="MatchRankingModule.Components.PlayerScore" as="PlayerScore"/>
 
-    <property type="List<LiveRankingWidgetPosition>" name="Scores"/>
+    <property type="List<MatchRankingWidgetPosition>" name="Scores"/>
 
     <property type="double" name="scale" default="0.9"/>
     <property type="double" name="w" default="68.0"/>
@@ -72,7 +71,7 @@
 
             <!-- CONTENT -->
             <frame id="players" pos="0 {{ -headerHeight - rowSpacing * 2.0 }}" size="{{ w }} 999" z-index="10">
-                <PlayerScore foreach="LiveRankingWidgetPosition position in Scores"
+                <PlayerScore foreach="MatchRankingWidgetPosition position in Scores"
                              y="{{ (position.Position - 1) * (rowHeight + rowSpacing) * -1.0 }}"
                              w="{{ w - 8.0 }}"
                              h="{{ rowHeight }}"
diff --git a/src/Modules/MatchRankingModule/info.toml b/src/Modules/MatchRankingModule/info.toml
index d220c412c..69cc4f5f4 100644
--- a/src/Modules/MatchRankingModule/info.toml
+++ b/src/Modules/MatchRankingModule/info.toml
@@ -9,6 +9,3 @@ summary = "A module to display the scores of the current match."
 version = "1.0.0"
 # The name of the author that created this module
 author = "Evo"
-
-[dependencies]
-LiveRankingModule = "1.0.0"
\ No newline at end of file
diff --git a/src/Modules/LiveRankingModule/Models/TMioLeaderboardResponse.cs b/src/Modules/WorldRecordModule/Models/TMioLeaderboardResponse.cs
similarity index 92%
rename from src/Modules/LiveRankingModule/Models/TMioLeaderboardResponse.cs
rename to src/Modules/WorldRecordModule/Models/TMioLeaderboardResponse.cs
index a4d1306b7..f8d7a2dda 100644
--- a/src/Modules/LiveRankingModule/Models/TMioLeaderboardResponse.cs
+++ b/src/Modules/WorldRecordModule/Models/TMioLeaderboardResponse.cs
@@ -1,4 +1,4 @@
-namespace EvoSC.Modules.Official.LiveRankingModule.Models;
+namespace EvoSC.Modules.Official.WorldRecordModule.Models;
 
 public class Parent
 {
diff --git a/src/Modules/WorldRecordModule/Services/WorldRecordService.cs b/src/Modules/WorldRecordModule/Services/WorldRecordService.cs
index 1138d2fbe..b67273a5e 100644
--- a/src/Modules/WorldRecordModule/Services/WorldRecordService.cs
+++ b/src/Modules/WorldRecordModule/Services/WorldRecordService.cs
@@ -3,7 +3,6 @@
 using EvoSC.Common.Services.Attributes;
 using EvoSC.Common.Services.Models;
 using EvoSC.Common.Util;
-using EvoSC.Modules.Official.LiveRankingModule.Models;
 using EvoSC.Modules.Official.WorldRecordModule.Events;
 using EvoSC.Modules.Official.WorldRecordModule.Interfaces;
 using EvoSC.Modules.Official.WorldRecordModule.Models;
diff --git a/tests/Modules/LiveRankingModule.Tests/Controllers/LiveRankingEventControllerTests.cs b/tests/Modules/LiveRankingModule.Tests/Controllers/LiveRankingEventControllerTests.cs
new file mode 100644
index 000000000..28e7ac189
--- /dev/null
+++ b/tests/Modules/LiveRankingModule.Tests/Controllers/LiveRankingEventControllerTests.cs
@@ -0,0 +1,101 @@
+using EvoSC.Common.Interfaces.Controllers;
+using EvoSC.Common.Models;
+using EvoSC.Common.Models.Callbacks;
+using EvoSC.Common.Remote.EventArgsModels;
+using EvoSC.Modules.Official.LiveRankingModule.Controllers;
+using EvoSC.Modules.Official.LiveRankingModule.Interfaces;
+using EvoSC.Testing.Controllers;
+using GbxRemoteNet.Events;
+using Moq;
+using Xunit;
+
+namespace EvoSC.Modules.Official.LiveRankingModule.Tests.Controllers;
+
+public class LiveRankingEventControllerTests : ControllerMock<LiveRankingEventController, IEventControllerContext>
+{
+    private Mock<ILiveRankingService> _liveRankingService = new();
+
+    public LiveRankingEventControllerTests()
+    {
+        InitMock(_liveRankingService);
+    }
+
+    [Fact]
+    public async Task Detects_Mode_And_Requests_Scores_On_Begin_Map()
+    {
+        await Controller.OnBeginMapAsync(null, new MapGbxEventArgs());
+
+        _liveRankingService.Verify(s => s.DetectModeAndRequestScoreAsync(), Times.Once);
+    }
+
+    [Theory]
+    [InlineData(ModeScriptSection.Undefined, 1)]
+    [InlineData(ModeScriptSection.EndRound, 1)]
+    [InlineData(ModeScriptSection.PreEndRound, 0)]
+    [InlineData(ModeScriptSection.EndMap, 0)]
+    [InlineData(ModeScriptSection.EndMatchEarly, 0)]
+    [InlineData(ModeScriptSection.EndMatch, 0)]
+    public async Task Maps_Scores_For_Correct_Mode_Script_Sections(ModeScriptSection section, int expectedCallCount)
+    {
+        var scoresEventArgs = new ScoresEventArgs
+        {
+            Section = section,
+            UseTeams = false,
+            WinnerTeam = 0,
+            WinnerPlayer = null,
+            Teams = new List<TeamScore>(),
+            Players = new List<PlayerScore?>()
+        };
+
+        await Controller.OnScoresAsync(null, scoresEventArgs);
+
+        _liveRankingService.Verify(
+            s => s.MapScoresAndSendWidgetAsync(scoresEventArgs),
+            Times.Exactly(expectedCallCount)
+        );
+    }
+
+    [Fact]
+    public async Task Hides_Widget_On_Podium_Start()
+    {
+        await Controller.OnPodiumStartAsync(null, new PodiumEventArgs { Time = 0 });
+
+        _liveRankingService.Verify(s => s.HideWidgetAsync(), Times.Once);
+    }
+
+    [Theory]
+    [InlineData(true, false, 1)]
+    [InlineData(true, true, 0)]
+    [InlineData(false, true, 0)]
+    [InlineData(false, false, 0)]
+    public async Task Requests_Scores_For_Each_Finish_In_TimeAttack_Mode(bool isEndLap, bool isPointsBasedMode,
+        int expectedCallCount)
+    {
+        var waypointEventArgs = new WayPointEventArgs
+        {
+            Login = "",
+            AccountId = "",
+            RaceTime = 0,
+            LapTime = 0,
+            CheckpointInRace = 0,
+            CheckpointInLap = 0,
+            IsEndRace = false,
+            IsEndLap = isEndLap,
+            CurrentRaceCheckpoints = new List<int>(),
+            CurrentLapCheckpoints = new List<int>(),
+            BlockId = "",
+            Speed = 0,
+            Time = 0
+        };
+
+        _liveRankingService.Setup(s => s.CurrentModeIsPointsBasedAsync())
+            .Returns(Task.FromResult(isPointsBasedMode));
+
+        await Controller.OnWayPointAsync(null, waypointEventArgs);
+
+        _liveRankingService.Verify(
+            s => s.RequestScoresAsync(),
+            Times.Exactly(expectedCallCount)
+        );
+    }
+}
diff --git a/tests/Modules/LiveRankingModule.Tests/LiveRankingModule.Tests.csproj b/tests/Modules/LiveRankingModule.Tests/LiveRankingModule.Tests.csproj
new file mode 100644
index 000000000..79d714301
--- /dev/null
+++ b/tests/Modules/LiveRankingModule.Tests/LiveRankingModule.Tests.csproj
@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <RootNamespace>EvoSC.Modules.Official.LiveRankingModule.Tests</RootNamespace>
+    </PropertyGroup>
+    
+    <ItemGroup>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+        <PackageReference Include="xunit" Version="2.8.1" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.6.2">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="coverlet.collector" Version="6.0.0">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\src\EvoSC.Testing\EvoSC.Testing.csproj" />
+        <ProjectReference Include="..\..\..\src\Modules\LiveRankingModule\LiveRankingModule.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Reference Include="Moq">
+            <HintPath>..\..\..\..\..\.nuget\packages\moq\4.20.70\lib\net6.0\Moq.dll</HintPath>
+        </Reference>
+    </ItemGroup>
+
+</Project>
diff --git a/tests/Modules/LiveRankingModule.Tests/Services/LiveRankingServiceTests.cs b/tests/Modules/LiveRankingModule.Tests/Services/LiveRankingServiceTests.cs
new file mode 100644
index 000000000..105177865
--- /dev/null
+++ b/tests/Modules/LiveRankingModule.Tests/Services/LiveRankingServiceTests.cs
@@ -0,0 +1,230 @@
+using EvoSC.Common.Interfaces;
+using EvoSC.Common.Interfaces.Models;
+using EvoSC.Common.Interfaces.Services;
+using EvoSC.Common.Models;
+using EvoSC.Common.Models.Callbacks;
+using EvoSC.Common.Models.Players;
+using EvoSC.Common.Remote.EventArgsModels;
+using EvoSC.Common.Util.MatchSettings;
+using EvoSC.Manialinks.Interfaces;
+using EvoSC.Modules.Official.LiveRankingModule.Config;
+using EvoSC.Modules.Official.LiveRankingModule.Interfaces;
+using EvoSC.Modules.Official.LiveRankingModule.Models;
+using EvoSC.Modules.Official.LiveRankingModule.Services;
+using EvoSC.Testing;
+using GbxRemoteNet.Interfaces;
+using Moq;
+using Xunit;
+
+namespace EvoSC.Modules.Official.LiveRankingModule.Tests.Services;
+
+public class LiveRankingServiceTests
+{
+    private readonly Mock<IManialinkManager> _manialinkManager = new();
+    private readonly Mock<ILiveRankingSettings> _settings = new();
+    private readonly Mock<IPlayerManagerService> _playerManagerService = new();
+    private readonly Mock<IMatchSettingsService> _matchSettingsService = new();
+
+    private readonly (Mock<IServerClient> Client, Mock<IGbxRemoteClient> Remote)
+        _server = Mocking.NewServerClientMock();
+
+    private ILiveRankingService LiveRankingServiceMock()
+    {
+        return new LiveRankingService(
+            _manialinkManager.Object,
+            _server.Client.Object,
+            _settings.Object,
+            _playerManagerService.Object,
+            _matchSettingsService.Object
+        );
+    }
+
+    [Fact]
+    public async Task Detects_Mode_And_Requests_Scores()
+    {
+        await LiveRankingServiceMock().DetectModeAndRequestScoreAsync();
+
+        _server.Remote.Verify(
+            remote => remote.TriggerModeScriptEventArrayAsync("Trackmania.GetScores"),
+            Times.Once
+        );
+    }
+
+    [Fact]
+    public async Task Requests_Scores_When_Asked()
+    {
+        await LiveRankingServiceMock().RequestScoresAsync();
+
+        _server.Remote.Verify(
+            remote => remote.TriggerModeScriptEventArrayAsync("Trackmania.GetScores"),
+            Times.Once
+        );
+    }
+
+    [Theory]
+    [InlineData(0, 0, DefaultModeScriptName.TimeAttack, 0)]
+    [InlineData(0, 0, DefaultModeScriptName.Rounds, 0)]
+    [InlineData(0, 10, DefaultModeScriptName.Rounds, 1)]
+    [InlineData(0, 20, DefaultModeScriptName.TimeAttack, 0)]
+    [InlineData(30, 0, DefaultModeScriptName.TimeAttack, 1)]
+    [InlineData(40, 0, DefaultModeScriptName.Rounds, 0)]
+    public async Task Maps_Scores_To_LiveRankingPositions(int bestRaceTime, int matchPoints,
+        DefaultModeScriptName modeScriptName,
+        int expectedLiveRankingPositionCount)
+    {
+        var liveRankingService = LiveRankingServiceMock();
+        var player = new Player { AccountId = "UnitTest", NickName = "unit_test", UbisoftName = "unittest"};
+        var scoresEventArgs = new ScoresEventArgs
+        {
+            Section = ModeScriptSection.Undefined,
+            UseTeams = false,
+            WinnerTeam = 0,
+            WinnerPlayer = null,
+            Teams = new List<TeamScore?>(),
+            Players = new List<PlayerScore?>
+            {
+                new()
+                {
+                    AccountId = player.AccountId, 
+                    Name = player.UbisoftName, 
+                    BestRaceTime = bestRaceTime,
+                    MatchPoints = matchPoints, 
+                    Rank = 1
+                }
+            }
+        };
+
+        _matchSettingsService.Setup(m => m.GetCurrentModeAsync())
+            .Returns(Task.FromResult(modeScriptName));
+
+        _playerManagerService.Setup(p => p.GetPlayerAsync("UnitTest"))
+            .Returns(Task.FromResult((IPlayer?)player));
+
+        await liveRankingService.DetectModeAndRequestScoreAsync();
+
+        if (modeScriptName == DefaultModeScriptName.TimeAttack)
+        {
+            Assert.False(await liveRankingService.CurrentModeIsPointsBasedAsync());
+        }
+        else
+        {
+            Assert.True(await liveRankingService.CurrentModeIsPointsBasedAsync());
+        }
+
+        if (expectedLiveRankingPositionCount > 0)
+        {
+            Assert.True(liveRankingService.ScoreShouldBeDisplayed(scoresEventArgs.Players.First()));
+        }
+        else
+        {
+            Assert.False(liveRankingService.ScoreShouldBeDisplayed(scoresEventArgs.Players.First()));
+        }
+        
+        var mappedScores = await liveRankingService.MapScoresAsync(scoresEventArgs);
+
+        Assert.IsAssignableFrom<IEnumerable<LiveRankingPosition>>(mappedScores);
+    }
+
+    [Fact]
+    public async Task Maps_Scores_And_Displays_Widget()
+    {
+        var liveRankingService = LiveRankingServiceMock();
+        var scoresEventArgs = new ScoresEventArgs
+        {
+            Section = ModeScriptSection.Undefined,
+            UseTeams = false,
+            WinnerTeam = 0,
+            WinnerPlayer = null,
+            Teams = new List<TeamScore?>(),
+            Players = new List<PlayerScore?>()
+        };
+
+        await liveRankingService.MapScoresAndSendWidgetAsync(scoresEventArgs);
+
+        _manialinkManager.Verify(
+            m => m.SendPersistentManialinkAsync("LiveRankingModule.LiveRanking", It.IsAny<object>()),
+            Times.Once
+        );
+    }
+
+    [Fact]
+    public Task Maps_Player_Score_To_Live_Ranking_Position()
+    {
+        var liveRankingService = LiveRankingServiceMock();
+        var player = new Player { AccountId = "UnitTest", NickName = "unit_test", UbisoftName = "unittest"};
+
+        _playerManagerService.Setup(s => s.GetPlayerAsync(player.AccountId))
+            .Returns(Task.FromResult((IPlayer?)player));
+        
+        var liveRankingPosition = liveRankingService.PlayerScoreToLiveRankingPosition(new()
+        {
+            AccountId = player.AccountId,
+            Name = player.UbisoftName,
+            BestRaceTime = 1234,
+            MatchPoints = 3,
+            Rank = 7
+        });
+        
+        Assert.Equal("UnitTest", liveRankingPosition.AccountId);
+        Assert.Equal("unit_test", liveRankingPosition.Name);
+        Assert.Equal(1234, liveRankingPosition.Time);
+        Assert.Equal(3, liveRankingPosition.Points);
+        Assert.Equal(7, liveRankingPosition.Position);
+        
+        return Task.CompletedTask;
+    }
+
+    [Fact]
+    public Task Maps_Player_Score_To_Live_Ranking_Position_Where_Player_Is_Unknown()
+    {
+        var liveRankingService = LiveRankingServiceMock();
+        var player = new Player { AccountId = "UnitTest", NickName = "unit_test", UbisoftName = "unittest"};
+
+        _playerManagerService.Setup(s => s.GetPlayerAsync(player.AccountId))
+            .Returns(Task.FromResult((IPlayer?)null));
+        
+        var liveRankingPosition = liveRankingService.PlayerScoreToLiveRankingPosition(new()
+        {
+            AccountId = player.AccountId,
+            Name = player.UbisoftName,
+            BestRaceTime = 1234,
+            MatchPoints = 3,
+            Rank = 7
+        });
+        
+        Assert.Equal("UnitTest", liveRankingPosition.AccountId);
+        Assert.Equal("unittest", liveRankingPosition.Name);
+        Assert.Equal(1234, liveRankingPosition.Time);
+        Assert.Equal(3, liveRankingPosition.Points);
+        Assert.Equal(7, liveRankingPosition.Position);
+        
+        return Task.CompletedTask;
+    }
+
+    [Theory]
+    [InlineData(DefaultModeScriptName.Rounds, 0, 0, false)]
+    [InlineData(DefaultModeScriptName.Rounds, 0, 1, true)]
+    [InlineData(DefaultModeScriptName.Rounds, 1, 0, false)]
+    [InlineData(DefaultModeScriptName.TimeAttack, 0, 0, false)]
+    [InlineData(DefaultModeScriptName.TimeAttack, 0, 1, false)]
+    [InlineData(DefaultModeScriptName.TimeAttack, 1, 0, true)]
+    public Task Determines_Whether_Score_Should_Be_Send_To_Widget(DefaultModeScriptName modeScriptName, int time, int points, bool expected)
+    {
+        var liveRankingService = LiveRankingServiceMock();
+        
+        _matchSettingsService.Setup(s => s.GetCurrentModeAsync())
+            .Returns(Task.FromResult(modeScriptName));
+
+        liveRankingService.DetectModeAndRequestScoreAsync();
+
+        var shouldBeDisplayed = liveRankingService.ScoreShouldBeDisplayed(new PlayerScore
+        {
+            BestRaceTime = time,
+            MatchPoints = points
+        });
+        
+        Assert.Equal(expected, shouldBeDisplayed);
+        
+        return Task.CompletedTask;
+    }
+}