diff --git a/EvoSC.sln b/EvoSC.sln
index 6d42c6c99..e1ff0f73c 100644
--- a/EvoSC.sln
+++ b/EvoSC.sln
@@ -112,6 +112,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapListModule", "src\Module
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapListModule.Tests", "tests\Modules\MapListModule.Tests\MapListModule.Tests.csproj", "{098D1F9B-054D-4158-BB6C-AC908C4595F6}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LocalRecordsModule", "src/Modules/LocalRecordsModule/LocalRecordsModule.csproj", "{1D8DBFC8-EC21-4DDA-9D88-DE7CA04C8449}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LocalRecordsModule.Tests", "tests\Modules\LocalRecordsModule.Tests\LocalRecordsModule.Tests.csproj", "{7401429B-B842-4316-B7A2-B77E9AD966CB}"
+EndProject
+
 
 
 
@@ -330,6 +335,14 @@ Global
 		{098D1F9B-054D-4158-BB6C-AC908C4595F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{098D1F9B-054D-4158-BB6C-AC908C4595F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{098D1F9B-054D-4158-BB6C-AC908C4595F6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1D8DBFC8-EC21-4DDA-9D88-DE7CA04C8449}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1D8DBFC8-EC21-4DDA-9D88-DE7CA04C8449}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1D8DBFC8-EC21-4DDA-9D88-DE7CA04C8449}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1D8DBFC8-EC21-4DDA-9D88-DE7CA04C8449}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7401429B-B842-4316-B7A2-B77E9AD966CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7401429B-B842-4316-B7A2-B77E9AD966CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7401429B-B842-4316-B7A2-B77E9AD966CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7401429B-B842-4316-B7A2-B77E9AD966CB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -382,5 +395,7 @@ Global
 		{2D2D3AC6-C8BD-4615-BCC7-9A64007DB762} = {6D75D6A2-6ECD-4DE4-96C5-CAD7D134407A}
 		{AB316816-F301-4693-86E8-C31E78F53A59} = {DC47658A-F421-4BA4-B617-090A7DFB3900}
 		{098D1F9B-054D-4158-BB6C-AC908C4595F6} = {6D75D6A2-6ECD-4DE4-96C5-CAD7D134407A}
+		{1D8DBFC8-EC21-4DDA-9D88-DE7CA04C8449} = {DC47658A-F421-4BA4-B617-090A7DFB3900}
+		{7401429B-B842-4316-B7A2-B77E9AD966CB} = {6D75D6A2-6ECD-4DE4-96C5-CAD7D134407A}
 	EndGlobalSection
 EndGlobal
diff --git a/src/EvoSC.Common/Database/Repository/Maps/MapRepository.cs b/src/EvoSC.Common/Database/Repository/Maps/MapRepository.cs
index 6fabd5801..a1eea86f5 100644
--- a/src/EvoSC.Common/Database/Repository/Maps/MapRepository.cs
+++ b/src/EvoSC.Common/Database/Repository/Maps/MapRepository.cs
@@ -19,6 +19,11 @@ public class MapRepository(IDbConnectionFactory dbConnFactory, ILogger<MapReposi
         .LoadWith(t => t.DbDetails)
         .SingleOrDefaultAsync(m => m.Id == id);
 
+    public async Task<IMap[]> GetMapsAsync() => await Table<DbMap>()
+        .LoadWith(m => m.DbAuthor)
+        .LoadWith(m => m.DbDetails)
+        .ToArrayAsync();
+
     public async Task<IMap?> GetMapByUidAsync(string uid) => await Table<DbMap>()
         .LoadWith(t => t.DbAuthor)
         .LoadWith(t => t.DbDetails)
diff --git a/src/EvoSC.Common/Interfaces/Database/Repository/IMapRepository.cs b/src/EvoSC.Common/Interfaces/Database/Repository/IMapRepository.cs
index baca8ad32..84769c3a2 100644
--- a/src/EvoSC.Common/Interfaces/Database/Repository/IMapRepository.cs
+++ b/src/EvoSC.Common/Interfaces/Database/Repository/IMapRepository.cs
@@ -14,6 +14,12 @@ public interface IMapRepository
     /// <param name="id">The maps database ID.</param>
     /// <returns>a map if it exists in the database.</returns>
     public Task<IMap?> GetMapByIdAsync(long id);
+
+    /// <summary>
+    /// Get all maps in the database.
+    /// </summary>
+    /// <returns></returns>
+    public Task<IMap[]> GetMapsAsync();
     
     /// <summary>
     /// Gets a map from the database based on the provided UID.
diff --git a/src/EvoSC.Common/Interfaces/Services/IMapService.cs b/src/EvoSC.Common/Interfaces/Services/IMapService.cs
index f058d16d3..72929f840 100644
--- a/src/EvoSC.Common/Interfaces/Services/IMapService.cs
+++ b/src/EvoSC.Common/Interfaces/Services/IMapService.cs
@@ -86,4 +86,10 @@ public interface IMapService
     /// <param name="map">Map to get details of.</param>
     /// <returns></returns>
     public Task<IMapDetails> FetchMapDetailsAsync(IMap map);
+
+    /// <summary>
+    /// Get all maps in the database.
+    /// </summary>
+    /// <returns></returns>
+    public Task<IMap[]> GetCurrentMapListAsync();
 }
diff --git a/src/EvoSC.Common/Services/MapService.cs b/src/EvoSC.Common/Services/MapService.cs
index 22165b840..05cfad607 100644
--- a/src/EvoSC.Common/Services/MapService.cs
+++ b/src/EvoSC.Common/Services/MapService.cs
@@ -198,6 +198,8 @@ public async Task<IMapDetails> FetchMapDetailsAsync(IMap map)
         }
     }
 
+    public Task<IMap[]> GetCurrentMapListAsync() => mapRepository.GetMapsAsync();
+
     private static bool MapVersionExistsInDb(IMap map, MapMetadata mapMetadata)
     {
         return map.ExternalVersion == mapMetadata.ExternalVersion;
diff --git a/src/EvoSC.Common/Util/FormattingUtils.cs b/src/EvoSC.Common/Util/FormattingUtils.cs
index 095abd297..475c4113f 100644
--- a/src/EvoSC.Common/Util/FormattingUtils.cs
+++ b/src/EvoSC.Common/Util/FormattingUtils.cs
@@ -49,9 +49,9 @@ public static TextFormatter FormatPlayerChatMessage(string nickname, string mess
     {
         var formattedMessage = new TextFormatter()
             .AddText("[")
-            .AddText(text => text.AsIsolated().AddText(nickname))
+            .AddText(text => text.AddText(nickname))
             .AddText("] ")
-            .AddText(text => text.AsIsolated().AddText(message));
+            .AddText(text => text.AddText(message));
 
         return formattedMessage;
     }
diff --git a/src/EvoSC.Common/Util/TextFormatting/FormattedText.cs b/src/EvoSC.Common/Util/TextFormatting/FormattedText.cs
index cf1e16423..f9d1c3720 100644
--- a/src/EvoSC.Common/Util/TextFormatting/FormattedText.cs
+++ b/src/EvoSC.Common/Util/TextFormatting/FormattedText.cs
@@ -9,7 +9,7 @@ namespace EvoSC.Common.Util.TextFormatting;
 public class FormattedText
 {
     public TextStyling? Style { get; set; }
-    public bool IsIsolated { get; set; }
+    public bool IsIsolated { get; set; } = true;
     public StringBuilder Text { get; set; } = new StringBuilder();
 
     public FormattedText(){}
@@ -127,9 +127,9 @@ public FormattedText WithStyle(Action<TextStyling> styleAction)
     /// interfere with later text.
     /// </summary>
     /// <returns></returns>
-    public FormattedText AsIsolated()
+    public FormattedText AsNotIsolated()
     {
-        IsIsolated = true;
+        IsIsolated = false;
         return this;
     }
 
diff --git a/src/EvoSC.Common/Util/TextFormatting/TextColor.cs b/src/EvoSC.Common/Util/TextFormatting/TextColor.cs
index a5c5973d0..97e69a5f7 100644
--- a/src/EvoSC.Common/Util/TextFormatting/TextColor.cs
+++ b/src/EvoSC.Common/Util/TextFormatting/TextColor.cs
@@ -29,9 +29,26 @@ public TextColor(Color color)
 
     public TextColor(string hex)
     {
-        this._r = byte.Parse(hex[0].ToString(), System.Globalization.NumberStyles.HexNumber);
-        this._g = byte.Parse(hex[1].ToString(), System.Globalization.NumberStyles.HexNumber);
-        this._b = byte.Parse(hex[2].ToString(), System.Globalization.NumberStyles.HexNumber);
+        if (hex.Length == 3)
+        {
+            this._r = byte.Parse(hex[0].ToString(), System.Globalization.NumberStyles.HexNumber);
+            this._g = byte.Parse(hex[1].ToString(), System.Globalization.NumberStyles.HexNumber);
+            this._b = byte.Parse(hex[2].ToString(), System.Globalization.NumberStyles.HexNumber);
+        } 
+        else if (hex.Length >= 6)
+        {
+            var r = Math.Floor(byte.Parse(hex[0..2], NumberStyles.HexNumber) / 255.0 * 0xF);
+            var g = Math.Floor(byte.Parse(hex[2..4], NumberStyles.HexNumber) / 255.0 * 0xF);
+            var b = Math.Floor(byte.Parse(hex[4..6], NumberStyles.HexNumber) / 255.0 * 0xF);
+
+            this._r = (byte)r;
+            this._g = (byte)g;
+            this._b = (byte)b;
+        }
+        else
+        {
+            throw new FormatException("Invalid color code");
+        }
     }
 
     /// <summary>
diff --git a/src/EvoSC.Common/Util/TextFormatting/TextStyling.cs b/src/EvoSC.Common/Util/TextFormatting/TextStyling.cs
index 76330bd10..14f135415 100644
--- a/src/EvoSC.Common/Util/TextFormatting/TextStyling.cs
+++ b/src/EvoSC.Common/Util/TextFormatting/TextStyling.cs
@@ -31,6 +31,17 @@ public TextStyling WithColor(TextColor color)
         return this;
     }
     
+    /// <summary>
+    /// Set the color of this style.
+    /// </summary>
+    /// <param name="color">The color to use.</param>
+    /// <returns></returns>
+    public TextStyling WithColor(string color)
+    {
+        _color = new TextColor(color);
+        return this;
+    }
+    
     /// <summary>
     /// Set the color of this style.
     /// </summary>
diff --git a/src/EvoSC.Manialinks/Interfaces/IManialinkManager.cs b/src/EvoSC.Manialinks/Interfaces/IManialinkManager.cs
index fc6a33586..2ef28abf6 100644
--- a/src/EvoSC.Manialinks/Interfaces/IManialinkManager.cs
+++ b/src/EvoSC.Manialinks/Interfaces/IManialinkManager.cs
@@ -1,12 +1,11 @@
-using EvoSC.Common.Interfaces.Models;
-using EvoSC.Manialinks.Interfaces.Models;
+using EvoSC.Manialinks.Interfaces.Models;
 
 namespace EvoSC.Manialinks.Interfaces;
 
 /// <summary>
 /// Manialink template & ManiaScript registry, and can render, display and hide Manialink to players.
 /// </summary>
-public interface IManialinkManager
+public interface IManialinkManager : IManialinkOperations
 {
     /// <summary>
     /// Add all the default templates from EvoSC.
@@ -54,27 +53,10 @@ public interface IManialinkManager
     public void RemoveManiaScript(string name);
     
     /// <summary>
-    /// Render a template and send it to all players.
-    /// </summary>
-    /// <param name="name">The name of the template.</param>
-    /// <param name="data">Any kind of data the template uses.</param>
-    /// <returns></returns>
-    public Task SendManialinkAsync(string name, IDictionary<string, object?> data);
-    
-    /// <summary>
-    /// Render a template and send it to all players.
-    /// </summary>
-    /// <param name="name">The name of the template.</param>
-    /// <param name="data">Any kind of data the template uses.</param>
-    /// <returns></returns>
-    public Task SendManialinkAsync(string name, dynamic data);
-    
-    /// <summary>
-    /// Render a template and send it to all players without data.
+    /// Pre-process all current templates registered.
     /// </summary>
-    /// <param name="name">The name of the template.</param>
     /// <returns></returns>
-    public Task SendManialinkAsync(string name);
+    public Task PreprocessAllAsync();
 
     /// <summary>
     /// Send a manialink to all players which persists even if a player re-connects.
@@ -103,105 +85,82 @@ public interface IManialinkManager
     public Task SendPersistentManialinkAsync(string name);
 
     /// <summary>
-    /// Render a template and send it to a specific player.
-    /// </summary>
-    /// <param name="player">The player to send to.</param>
-    /// <param name="name">The name of the template.</param>
-    /// <param name="data">Data which the template uses.</param>
-    /// <returns></returns>
-    public Task SendManialinkAsync(IPlayer player, string name, IDictionary<string, object?> data);
-
-    /// <summary>
-    /// Render a template and send it to a specific player.
+    /// Send a manialink to all players which persists even if a player re-connects.
+    /// It will also automatically show for new players.
+    ///
+    /// This method allows for dynamic data updates by a callback method.
     /// </summary>
-    /// <param name="player">The player to send to.</param>
-    /// <param name="name">The name of the template.</param>
-    /// <param name="data">Data which the template uses</param>
+    /// <param name="name">Name of the template to show.</param>
+    /// <param name="setupData">Method that returns data to be sent.</param>
     /// <returns></returns>
-    public Task SendManialinkAsync(IPlayer player, string name, dynamic data);
-
+    public Task SendPersistentManialinkAsync(string name, Func<Task<dynamic>> setupData);
+    
     /// <summary>
-    /// Render a template and send it to a specific player.
+    /// Send a manialink to all players which persists even if a player re-connects.
+    /// It will also automatically show for new players.
+    ///
+    /// This method allows for dynamic data updates by a callback method.
     /// </summary>
-    /// <param name="playerLogin">The login to send to.</param>
-    /// <param name="name">The name of the template.</param>
-    /// <param name="data">Data which the template uses</param>
+    /// <param name="name">Name of the template to show.</param>
+    /// <param name="setupData">Method that returns data to be sent.</param>
     /// <returns></returns>
-    public Task SendManialinkAsync(string playerLogin, string name, dynamic data);
+    public Task SendPersistentManialinkAsync(string name, Func<Task<IDictionary<string, object?>>> setupData);
 
     /// <summary>
-    /// Render a template and send it to a specific player without data.
+    /// Hides and removes a persistent mainalink.
     /// </summary>
-    /// <param name="player">The player to send to.</param>
-    /// <param name="name">The name of the template.</param>
+    /// <param name="name">Name of the template to hide.</param>
     /// <returns></returns>
-    public Task SendManialinkAsync(IPlayer player, string name) => SendManialinkAsync(player, name, new { });
+    public Task RemovePersistentManialinkAsync(string name);
     
     /// <summary>
-    /// Render a template and send it to a set of players.
+    /// Add a global variable that is accessible from all templates.
     /// </summary>
-    /// <param name="players">The players to send to</param>
-    /// <param name="name">The name of the template.</param>
-    /// <param name="data">Data which the template uses</param>
-    /// <returns></returns>
-    public Task SendManialinkAsync(IEnumerable<IPlayer> players, string name, IDictionary<string, object?> data);
+    /// <param name="name">Name of the variable.</param>
+    /// <param name="value">Value of the variable.</param>
+    /// <typeparam name="T">Variable type.</typeparam>
+    public void AddGlobalVariable<T>(string name, T value);
     
     /// <summary>
-    /// Render a template and send it to a set of players.
+    /// Remove a global variable.
     /// </summary>
-    /// <param name="players">The players to send to</param>
-    /// <param name="name">The name of the template.</param>
-    /// <param name="data">Data which the template uses</param>
-    /// <returns></returns>
-    public Task SendManialinkAsync(IEnumerable<IPlayer> players, string name, dynamic data);
+    /// <param name="name">Name of the variable to remove.</param>
+    public void RemoveGlobalVariable(string name);
     
     /// <summary>
-    /// Render a template and send it to a set of players without data.
+    /// Remove all global variables.
     /// </summary>
-    /// <param name="players">The players to send to</param>
-    /// <param name="name">The name of the template.</param>
-    /// <returns></returns>
-    public Task SendManialinkAsync(IEnumerable<IPlayer> players, string name) =>
-        SendManialinkAsync(players, name, new { });
+    public void ClearGlobalVariables();
 
     /// <summary>
-    /// Hide a manialink from all players.
+    /// Get the rendered contents of a template.
     /// </summary>
-    /// <param name="name">Name of the manialink to hide.</param>
+    /// <param name="name">Name of the template.</param>
+    /// <param name="data">Data to send to the template.</param>
     /// <returns></returns>
-    public Task HideManialinkAsync(string name);
+    public Task<string> PrepareAndRenderAsync(string name, IDictionary<string, object?> data);
     
     /// <summary>
-    /// Hide a manialink from a player.
+    /// Get the rendered contents of a template.
     /// </summary>
-    /// <param name="player">The player to hide the manialink from.</param>
-    /// <param name="name">Name of the manialink to hide.</param>
+    /// <param name="name">Name of the template.</param>
+    /// <param name="data">Data to send to the template.</param>
     /// <returns></returns>
-    public Task HideManialinkAsync(IPlayer player, string name);
+    public Task<string> PrepareAndRenderAsync(string name, dynamic data);
     
     /// <summary>
-    /// Hide a manialink from a player.
+    /// Get the effective name of a template's name. This may change
+    /// depending on the theme.
     /// </summary>
-    /// <param name="playerLogin">The player to hide the manialink from.</param>
-    /// <param name="name">Name of the manialink to hide.</param>
+    /// <param name="name">Original name of the template.</param>
     /// <returns></returns>
-    public Task HideManialinkAsync(string playerLogin, string name);
-    
-    /// <summary>
-    /// Hide a manialink from a set of players.
-    /// </summary>
-    /// <param name="players">The players to hide the manialink from.</param>
-    /// <param name="name">Name of the manialink to hide.</param>
-    /// <returns></returns>
-    public Task HideManialinkAsync(IEnumerable<IPlayer> players, string name);
-    
+    public string GetEffectiveName(string name);
+
     /// <summary>
-    /// Pre-process all current templates registered.
+    /// Create a new transaction for manialink operations.
+    /// Nothing is done until the transaction is committed,
+    /// and all operations are sent at once for speed.
     /// </summary>
     /// <returns></returns>
-    public Task PreprocessAllAsync();
-
-    public void AddGlobalVariable<T>(string name, T value);
-    public void RemoveGlobalVariable(string name);
-    public void ClearGlobalVariables();
+    public IManialinkTransaction CreateTransaction();
 }
diff --git a/src/EvoSC.Manialinks/Interfaces/IManialinkOperations.cs b/src/EvoSC.Manialinks/Interfaces/IManialinkOperations.cs
new file mode 100644
index 000000000..b27be90db
--- /dev/null
+++ b/src/EvoSC.Manialinks/Interfaces/IManialinkOperations.cs
@@ -0,0 +1,122 @@
+using EvoSC.Common.Interfaces.Models;
+
+namespace EvoSC.Manialinks.Interfaces;
+
+public interface IManialinkOperations
+{
+    /// <summary>
+    /// Render a template and send it to all players.
+    /// </summary>
+    /// <param name="name">The name of the template.</param>
+    /// <param name="data">Any kind of data the template uses.</param>
+    /// <returns></returns>
+    public Task SendManialinkAsync(string name, IDictionary<string, object?> data);
+    
+    /// <summary>
+    /// Render a template and send it to all players.
+    /// </summary>
+    /// <param name="name">The name of the template.</param>
+    /// <param name="data">Any kind of data the template uses.</param>
+    /// <returns></returns>
+    public Task SendManialinkAsync(string name, dynamic data);
+    
+    /// <summary>
+    /// Render a template and send it to all players without data.
+    /// </summary>
+    /// <param name="name">The name of the template.</param>
+    /// <returns></returns>
+    
+    public Task SendManialinkAsync(string name);
+    /// <summary>
+    /// Render a template and send it to a specific player.
+    /// </summary>
+    /// <param name="player">The player to send to.</param>
+    /// <param name="name">The name of the template.</param>
+    /// <param name="data">Data which the template uses.</param>
+    /// <returns></returns>
+    public Task SendManialinkAsync(IPlayer player, string name, IDictionary<string, object?> data);
+
+    /// <summary>
+    /// Render a template and send it to a specific player.
+    /// </summary>
+    /// <param name="player">The player to send to.</param>
+    /// <param name="name">The name of the template.</param>
+    /// <param name="data">Data which the template uses</param>
+    /// <returns></returns>
+    public Task SendManialinkAsync(IPlayer player, string name, dynamic data);
+
+    /// <summary>
+    /// Render a template and send it to a specific player.
+    /// </summary>
+    /// <param name="playerLogin">The login to send to.</param>
+    /// <param name="name">The name of the template.</param>
+    /// <param name="data">Data which the template uses</param>
+    /// <returns></returns>
+    public Task SendManialinkAsync(string playerLogin, string name, dynamic data);
+
+    /// <summary>
+    /// Render a template and send it to a specific player without data.
+    /// </summary>
+    /// <param name="player">The player to send to.</param>
+    /// <param name="name">The name of the template.</param>
+    /// <returns></returns>
+    public Task SendManialinkAsync(IPlayer player, string name) => SendManialinkAsync(player, name, new { });
+    
+    /// <summary>
+    /// Render a template and send it to a set of players.
+    /// </summary>
+    /// <param name="players">The players to send to</param>
+    /// <param name="name">The name of the template.</param>
+    /// <param name="data">Data which the template uses</param>
+    /// <returns></returns>
+    public Task SendManialinkAsync(IEnumerable<IPlayer> players, string name, IDictionary<string, object?> data);
+    
+    /// <summary>
+    /// Render a template and send it to a set of players.
+    /// </summary>
+    /// <param name="players">The players to send to</param>
+    /// <param name="name">The name of the template.</param>
+    /// <param name="data">Data which the template uses</param>
+    /// <returns></returns>
+    public Task SendManialinkAsync(IEnumerable<IPlayer> players, string name, dynamic data);
+    
+    /// <summary>
+    /// Render a template and send it to a set of players without data.
+    /// </summary>
+    /// <param name="players">The players to send to</param>
+    /// <param name="name">The name of the template.</param>
+    /// <returns></returns>
+    public Task SendManialinkAsync(IEnumerable<IPlayer> players, string name) =>
+        SendManialinkAsync(players, name, new { });
+
+    /// <summary>
+    /// Hide a manialink from all players.
+    /// </summary>
+    /// <param name="name">Name of the manialink to hide.</param>
+    /// <returns></returns>
+    public Task HideManialinkAsync(string name);
+    
+    /// <summary>
+    /// Hide a manialink from a player.
+    /// </summary>
+    /// <param name="player">The player to hide the manialink from.</param>
+    /// <param name="name">Name of the manialink to hide.</param>
+    /// <returns></returns>
+    public Task HideManialinkAsync(IPlayer player, string name);
+    
+    /// <summary>
+    /// Hide a manialink from a player.
+    /// </summary>
+    /// <param name="playerLogin">The player to hide the manialink from.</param>
+    /// <param name="name">Name of the manialink to hide.</param>
+    /// <returns></returns>
+    public Task HideManialinkAsync(string playerLogin, string name);
+    
+    /// <summary>
+    /// Hide a manialink from a set of players.
+    /// </summary>
+    /// <param name="players">The players to hide the manialink from.</param>
+    /// <param name="name">Name of the manialink to hide.</param>
+    /// <returns></returns>
+    public Task HideManialinkAsync(IEnumerable<IPlayer> players, string name);
+}
diff --git a/src/EvoSC.Manialinks/Interfaces/IManialinkTransaction.cs b/src/EvoSC.Manialinks/Interfaces/IManialinkTransaction.cs
new file mode 100644
index 000000000..6a85012ec
--- /dev/null
+++ b/src/EvoSC.Manialinks/Interfaces/IManialinkTransaction.cs
@@ -0,0 +1,6 @@
+namespace EvoSC.Manialinks.Interfaces;
+
+public interface IManialinkTransaction : IManialinkOperations
+{
+    public Task CommitAsync();
+}
diff --git a/src/EvoSC.Manialinks/Interfaces/Models/IPersistentManialink.cs b/src/EvoSC.Manialinks/Interfaces/Models/IPersistentManialink.cs
new file mode 100644
index 000000000..41291e4d8
--- /dev/null
+++ b/src/EvoSC.Manialinks/Interfaces/Models/IPersistentManialink.cs
@@ -0,0 +1,9 @@
+namespace EvoSC.Manialinks.Interfaces.Models;
+
+public interface IPersistentManialink
+{
+    public string Name { get; }
+    public PersistentManialinkType Type { get; }
+    public string CompiledOutput { get; }
+    public Func<Task<IDictionary<string, object?>>>? DynamicDataCallbackAsync { get; }
+}
diff --git a/src/EvoSC.Manialinks/Interfaces/Models/PersistentManialinkType.cs b/src/EvoSC.Manialinks/Interfaces/Models/PersistentManialinkType.cs
new file mode 100644
index 000000000..fa6e3deb6
--- /dev/null
+++ b/src/EvoSC.Manialinks/Interfaces/Models/PersistentManialinkType.cs
@@ -0,0 +1,7 @@
+namespace EvoSC.Manialinks.Interfaces.Models;
+
+public enum PersistentManialinkType
+{
+    Static,
+    Dynamic
+}
diff --git a/src/EvoSC.Manialinks/ManialinkController.cs b/src/EvoSC.Manialinks/ManialinkController.cs
index ac67a0459..8e6e055bd 100644
--- a/src/EvoSC.Manialinks/ManialinkController.cs
+++ b/src/EvoSC.Manialinks/ManialinkController.cs
@@ -30,7 +30,7 @@ public Task ShowAsync(IEnumerable<IOnlinePlayer> players, string maniaLink) =>
 
     public Task ShowAsync(IEnumerable<IOnlinePlayer> players, string maniaLink, object data) =>
         Context.ManialinkManager.SendManialinkAsync(players, maniaLink, PrepareManialinkData(data));
-
+    
     public Task ShowPersistentAsync(string name) => Context.ManialinkManager.SendPersistentManialinkAsync(name, PrepareManialinkData(new object()));
     
     public Task ShowPersistentAsync(string name, object data) => Context.ManialinkManager.SendPersistentManialinkAsync(name, PrepareManialinkData(data));
diff --git a/src/EvoSC.Manialinks/ManialinkManager.cs b/src/EvoSC.Manialinks/ManialinkManager.cs
index ccb6c6d97..87928429b 100644
--- a/src/EvoSC.Manialinks/ManialinkManager.cs
+++ b/src/EvoSC.Manialinks/ManialinkManager.cs
@@ -1,6 +1,7 @@
 using System.Collections.Concurrent;
+using System.ComponentModel;
+using System.Dynamic;
 using System.Reflection;
-using System.Text;
 using EvoSC.Common.Events;
 using EvoSC.Common.Interfaces;
 using EvoSC.Common.Interfaces.Models;
@@ -19,7 +20,6 @@
 using GbxRemoteNet;
 using GbxRemoteNet.Events;
 using ManiaTemplates;
-using ManiaTemplates.Lib;
 using Microsoft.Extensions.Logging;
 
 namespace EvoSC.Manialinks;
@@ -33,7 +33,7 @@ public class ManialinkManager : IManialinkManager
     private readonly ManiaTemplateEngine _engine = new();
     private readonly Dictionary<string, IManialinkTemplateInfo> _templates = new();
     private readonly Dictionary<string, IManiaScriptInfo> _scripts = new();
-    private readonly ConcurrentDictionary<string, string> _persistentManialinks = new();
+    private readonly ConcurrentDictionary<string, IPersistentManialink> _persistentManialinks = new();
 
     private static IEnumerable<Assembly> s_defaultAssemblies = new[]
     {
@@ -207,7 +207,12 @@ public async Task SendPersistentManialinkAsync(string name, IDictionary<string,
         name = GetEffectiveName(name);
         var manialinkOutput = await PrepareAndRenderAsync(name, data);
         await _server.Remote.SendDisplayManialinkPageAsync(manialinkOutput, 0, false);
-        _persistentManialinks[name] = manialinkOutput;
+        _persistentManialinks[name] = new PersistentManialink
+        {
+            Name = name,
+            Type = PersistentManialinkType.Static,
+            CompiledOutput = manialinkOutput 
+        };
     }
 
     public async Task SendPersistentManialinkAsync(string name, dynamic data)
@@ -215,11 +220,53 @@ public async Task SendPersistentManialinkAsync(string name, dynamic data)
         name = GetEffectiveName(name);
         var manialinkOutput = await PrepareAndRenderAsync(name, data);
         await _server.Remote.SendDisplayManialinkPageAsync(manialinkOutput, 0, false);
-        _persistentManialinks[name] = manialinkOutput;
+        _persistentManialinks[name] = new PersistentManialink
+        {
+            Name = name,
+            Type = PersistentManialinkType.Static,
+            CompiledOutput = manialinkOutput 
+        };
     }
 
     public Task SendPersistentManialinkAsync(string name) => SendPersistentManialinkAsync(name, new { });
 
+    public Task SendPersistentManialinkAsync(string name, Func<Task<dynamic>> setupData) =>
+        SendPersistentManialinkAsync(name, async Task<IDictionary<string, object?>> () =>
+        {
+            var rawData = await setupData();
+            IDictionary<string, object?> data = new ExpandoObject();
+
+            foreach (PropertyDescriptor prop in TypeDescriptor.GetProperties(rawData.GetType()))
+            {
+                data.Add(prop.Name, prop.GetValue(rawData));
+            }
+            
+            return data;
+        });
+
+    public async Task SendPersistentManialinkAsync(string name, Func<Task<IDictionary<string, object?>>> setupData)
+    {
+        name = GetEffectiveName(name);
+        
+        _persistentManialinks[name] = new PersistentManialink
+        {
+            Name = name,
+            Type = PersistentManialinkType.Static,
+            DynamicDataCallbackAsync = setupData
+        };
+
+        var data = await setupData();
+        var manialinkOutput = await PrepareAndRenderAsync(name, data);
+        await _server.Remote.SendDisplayManialinkPageAsync(manialinkOutput, 0, false);
+    }
+
+    public Task RemovePersistentManialinkAsync(string name)
+    {
+        name = GetEffectiveName(name);
+        _persistentManialinks.TryRemove(name, out _);
+        return Task.CompletedTask;
+    }
+
     public async Task SendManialinkAsync(IPlayer player, string name, IDictionary<string, object?> data)
     {
         name = GetEffectiveName(name);
@@ -261,7 +308,7 @@ public Task HideManialinkAsync(string name)
     {
         name = GetEffectiveName(name);
         _persistentManialinks.TryRemove(name, out _);
-        var manialinkOutput = CreateHideManialink(name);
+        var manialinkOutput = ManialinkUtils.CreateHideManialink(name);
         return _server.Remote.SendDisplayManialinkPageAsync(manialinkOutput, 3, true);
     }
 
@@ -269,21 +316,21 @@ public Task HideManialinkAsync(IPlayer player, string name)
     {
         name = GetEffectiveName(name);
         _persistentManialinks.TryRemove(name, out _);
-        var manialinkOutput = CreateHideManialink(name);
+        var manialinkOutput = ManialinkUtils.CreateHideManialink(name);
         return _server.Remote.SendDisplayManialinkPageToLoginAsync(player.GetLogin(), manialinkOutput, 3, true);
     }
 
     public Task HideManialinkAsync(string playerLogin, string name)
     {
         name = GetEffectiveName(name);
-        var manialinkOutput = CreateHideManialink(name);
+        var manialinkOutput = ManialinkUtils.CreateHideManialink(name);
         return _server.Remote.SendDisplayManialinkPageToLoginAsync(playerLogin, manialinkOutput, 3, true);
     }
 
     public Task HideManialinkAsync(IEnumerable<IPlayer> players, string name)
     {
         name = GetEffectiveName(name);
-        var manialinkOutput = CreateHideManialink(name);
+        var manialinkOutput = ManialinkUtils.CreateHideManialink(name);
         var multiCall = new MultiCall();
 
         foreach (var player in players)
@@ -330,9 +377,37 @@ private async Task HandlePlayerConnectAsync(object sender, PlayerConnectGbxEvent
     {
         try
         {
-            foreach (var (_, output) in _persistentManialinks)
+            foreach (var (_, manialink) in _persistentManialinks)
             {
-                await _server.Remote.SendDisplayManialinkPageToLoginAsync(e.Login, output, 0, false);
+                string? output = null;
+                
+                switch (manialink.Type)
+                {
+                    case PersistentManialinkType.Static:
+                        output = manialink.CompiledOutput;
+                        break;
+                    case PersistentManialinkType.Dynamic:
+                        {
+                            var data = await manialink.DynamicDataCallbackAsync?.Invoke();
+                            output = await PrepareAndRenderAsync(manialink.Name, data);
+                        }
+                        break;
+                }
+
+                if (output == null)
+                {
+                    _logger.LogWarning("Failed to get output of persistent ({Type}) manialink: {Name}",
+                        manialink.Type switch
+                        {
+                            PersistentManialinkType.Dynamic => "Dynamic",
+                            PersistentManialinkType.Static => "Static",
+                            _ => "Unknown",
+                        },
+                        manialink.Name);
+                    continue;
+                }
+                
+                await _server.Remote.SendDisplayManialinkPageToLoginAsync(e.Login, manialink.CompiledOutput, 0, false);
             }
         }
         catch (Exception ex)
@@ -393,32 +468,22 @@ private IEnumerable<Assembly> PrepareRender(string name)
         return assemblies;
     }
 
-    private async Task<string> PrepareAndRenderAsync(string name, IDictionary<string, object?> data)
+    public async Task<string> PrepareAndRenderAsync(string name, IDictionary<string, object?> data)
     {
         var assemblies = PrepareRender(name);
         return await _engine.RenderAsync(name, data, assemblies);
     }
     
-    private async Task<string> PrepareAndRenderAsync(string name, dynamic data)
+    public async Task<string> PrepareAndRenderAsync(string name, dynamic data)
     {
         var assemblies = PrepareRender(name);
         return await _engine.RenderAsync(name, data, assemblies);
     }
-    
-    private string CreateHideManialink(string name)
-    {
-        var sb = new StringBuilder()
-            .Append("<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?>\n")
-            .Append("<manialink version=\"3\" id=\"")
-            .Append(ManialinkNameUtils.KeyToId(name))
-            .Append("\">\n")
-            .Append("</manialink>\n");
 
-        return sb.ToString();
-    }
-
-    private string GetEffectiveName(string name) =>
+    public string GetEffectiveName(string name) =>
         _themeManager.ComponentReplacements.TryGetValue(name, out var effectiveName)
             ? effectiveName
             : name;
+
+    public IManialinkTransaction CreateTransaction() => new ManialinkTransaction(this, _server);
 }
diff --git a/src/EvoSC.Manialinks/ManialinkTransaction.cs b/src/EvoSC.Manialinks/ManialinkTransaction.cs
new file mode 100644
index 000000000..9970f5012
--- /dev/null
+++ b/src/EvoSC.Manialinks/ManialinkTransaction.cs
@@ -0,0 +1,122 @@
+using EvoSC.Common.Interfaces;
+using EvoSC.Common.Interfaces.Models;
+using EvoSC.Common.Util;
+using EvoSC.Manialinks.Interfaces;
+using EvoSC.Manialinks.Util;
+using GbxRemoteNet;
+using GbxRemoteNet.Interfaces;
+
+namespace EvoSC.Manialinks;
+
+public class ManialinkTransaction(IManialinkManager manialinkManager, IServerClient server) : IManialinkTransaction
+{
+    private readonly MultiCall _serverCalls = new MultiCall();
+    private readonly HashSet<string> _persistentRemovals = [];
+
+    public Task SendManialinkAsync(string name, IDictionary<string, object?> data) => AddSendCallAsync(name, data);
+
+    public Task SendManialinkAsync(string name, dynamic data) => AddSendCallAsync(name, data);
+
+    public Task SendManialinkAsync(string name) => AddSendCallAsync(name, new { });
+
+    public Task SendManialinkAsync(IPlayer player, string name, IDictionary<string, object?> data) => AddSendCallAsync(player, name, data);
+
+    public Task SendManialinkAsync(IPlayer player, string name, dynamic data) => AddSendCallAsync(player, name, data);
+
+    public Task SendManialinkAsync(string playerLogin, string name, dynamic data) => AddSendCallAsync(playerLogin, name, data);
+
+    public async Task SendManialinkAsync(IEnumerable<IPlayer> players, string name, IDictionary<string, object?> data)
+    {
+        foreach (var player in players)
+        {
+            await AddSendCallAsync(player, name, data);
+        }
+    }
+
+    public async Task SendManialinkAsync(IEnumerable<IPlayer> players, string name, dynamic data)
+    {
+        foreach (var player in players)
+        {
+            await AddSendCallAsync(player, name, data);
+        }
+    }
+
+    public Task HideManialinkAsync(string name) => AddHideCallAsync(name);
+
+    public Task HideManialinkAsync(IPlayer player, string name) => AddHideCallAsync(player, name);
+
+    public Task HideManialinkAsync(string playerLogin, string name) => AddHideCallAsync(playerLogin, name);
+
+    public async Task HideManialinkAsync(IEnumerable<IPlayer> players, string name)
+    {
+        foreach (var player in players)
+        {
+            await AddHideCallAsync(player, name);
+        }
+    }
+
+    private async Task AddSendCallAsync(string name, IDictionary<string, object?> data)
+    {
+        var output = await GetSendOutputAsync(name, data);
+        _serverCalls.Add(nameof(IGbxRemoteClient.SendDisplayManialinkPageAsync), output, 0, false);
+    }
+    
+    private async Task AddSendCallAsync(string name, dynamic data)
+    {
+        var output = await GetSendOutputAsync(name, data);
+        _serverCalls.Add(nameof(IGbxRemoteClient.SendDisplayManialinkPageAsync), output, 0, false);
+    }
+    
+    private async Task AddSendCallAsync(string playerLogin, string name, IDictionary<string, object?> data)
+    {
+        var output = await GetSendOutputAsync(name, data);
+        _serverCalls.Add(nameof(IGbxRemoteClient.SendDisplayManialinkPageToLoginAsync), playerLogin, output, 0, false);
+    }
+    
+    private async Task AddSendCallAsync(string playerLogin, string name, dynamic data)
+    {
+        var output = await GetSendOutputAsync(name, data);
+        _serverCalls.Add(nameof(IGbxRemoteClient.SendDisplayManialinkPageToLoginAsync), playerLogin, output, 0, false);
+    }
+
+    private Task AddSendCallAsync(IPlayer player, string name, IDictionary<string, object?> data) =>
+        AddSendCallAsync(player.GetLogin(), name, data);
+    
+    private Task AddSendCallAsync(IPlayer player, string name, dynamic data) =>
+        AddSendCallAsync(player.GetLogin(), name, data);
+
+    private Task AddHideCallAsync(string name)
+    {
+        var output = PrepareAndGetHideCall(name);
+        _serverCalls.Add(nameof(IGbxRemoteClient.SendDisplayManialinkPageAsync), output, 3, true);
+        return Task.CompletedTask;
+    }
+    
+    private Task AddHideCallAsync(string playerLogin, string name)
+    {
+        var output = PrepareAndGetHideCall(name);
+        _serverCalls.Add(nameof(IGbxRemoteClient.SendDisplayManialinkPageToLoginAsync), playerLogin, output, 3, true);
+        return Task.CompletedTask;
+    }
+
+    private Task AddHideCallAsync(IPlayer player, string name) => AddHideCallAsync(player.GetLogin(), name);
+
+    private async Task<string> GetSendOutputAsync(string name, IDictionary<string, object?> data)
+    {
+        return await manialinkManager.PrepareAndRenderAsync(manialinkManager.GetEffectiveName(name), data);
+    }
+    
+    private async Task<string> GetSendOutputAsync(string name, dynamic data)
+    {
+        return await manialinkManager.PrepareAndRenderAsync(manialinkManager.GetEffectiveName(name), data);
+    }
+
+    private string PrepareAndGetHideCall(string name)
+    {
+        name = manialinkManager.GetEffectiveName(name);
+        _persistentRemovals.Add(name);
+        return ManialinkUtils.CreateHideManialink(name);
+    }
+
+    public Task CommitAsync() => server.Remote.MultiCallAsync(_serverCalls);
+}
diff --git a/src/EvoSC.Manialinks/Models/PersistentManialink.cs b/src/EvoSC.Manialinks/Models/PersistentManialink.cs
new file mode 100644
index 000000000..8f11b2b91
--- /dev/null
+++ b/src/EvoSC.Manialinks/Models/PersistentManialink.cs
@@ -0,0 +1,11 @@
+using EvoSC.Manialinks.Interfaces.Models;
+
+namespace EvoSC.Manialinks.Models;
+
+public class PersistentManialink : IPersistentManialink
+{
+    public required string Name { get; init; }
+    public required PersistentManialinkType Type { get; init; }
+    public string CompiledOutput { get; init; }
+    public Func<Task<IDictionary<string, object?>>>? DynamicDataCallbackAsync { get; init; }
+}
diff --git a/src/EvoSC.Manialinks/Templates/Containers/Widget.mt b/src/EvoSC.Manialinks/Templates/Containers/Widget.mt
index 0eb24922a..d6401cc93 100644
--- a/src/EvoSC.Manialinks/Templates/Containers/Widget.mt
+++ b/src/EvoSC.Manialinks/Templates/Containers/Widget.mt
@@ -2,53 +2,56 @@
   <property type="string" name="header" default="" />
   <property type="string" name="position" default="left" /> <!-- Values: left, right, top, bottom -->
   <property type="double" name="height" />
-  <property type="double" name="x" />
-  <property type="double" name="y" />
-  <property type="string" name="style" default="normal" /> <!-- Values: normal, unstyled -->
+  <property type="double" name="width" default="36" />
+  <property type="double" name="x" default="0" />
+  <property type="double" name="y" default="0" />
+  <property type="double" name="padding" default="1.5" />
+  <property type="string" name="headerStyle" default="normal" /> <!-- Values: normal, unstyled -->
+  <property type="string" name="bodyStyle" default="normal" /> <!-- Values: normal, unstyled -->
   <property type="bool" name="ingrid" default="true" /> <!-- If true, position and size acts on the grid system -->
   <property type="double" name="gridsize" default="12" /> <!-- If true, position and size acts on the grid system -->
   <property type="double" name="cellsize" default="10" /> <!-- If true, position and size acts on the grid system -->
   
   <template>
-    <frame pos="{{ x*(cellsize + (160 - (160/gridsize - cellsize))/gridsize - cellsize) }} {{ y*(cellsize + (160 - (160/gridsize - cellsize))/gridsize - cellsize) }}">
+    <frame pos='{{ (position == "left" ? -160 + padding : 160-width - padding ) }} {{ y }}'>
       <frame if='header != ""'>
         <quad
-                bgcolor="28212F"
-                size="37 5"
+                bgcolor="{{ Theme.UI_HeaderBg }}"
+                size="{{ width }} 4.5"
                 opacity="0.95"
-                pos="0.8 0"
-                if='style.ToLower() == "normal"'
+                pos="0.7 0"
+                if='headerStyle.ToLower() == "normal"'
         />
         <quad
-                bgcolor="ff0058"
-                size="0.8 5"
+                bgcolor="{{ Theme.UI_AccentPrimary }}"
+                size="0.7 4.5"
                 pos="0 0"
-                if='style.ToLower() == "normal"'
+                if='headerStyle.ToLower() == "normal"'
         />
         <label 
                 text="{{ header.ToUpper() }}" 
-                textfont="GameFontExtraBold"
-                textsize="0.8"
-                pos="18.5 -2.4"
+                textfont="{{ Font.Bold }}"
+                textsize="0.5"
+                pos="{{ width/2.0 + 1 }} -2.1"
                 halign="center"
                 valign="center"
-                if='style.ToLower() == "normal"'
+                if='headerStyle.ToLower() == "normal"'
         />
         <slot name="header" />
       </frame>
-      <frame pos='0 {{ -5 - (header == "" ? 0 : 0.3) }}'>
+      <frame pos='0 {{ -4.5 - (header == "" ? 0 : 0.3) }}'>
         <quad
-                size="37 {{ height }}"
+                size="{{ width }} {{ height }}"
                 bgcolor="2C2D34"
                 opacity="0.9"
-                pos="0.8 0"
-                if='style.ToLower() == "normal"'
+                pos="1 0"
+                if='bodyStyle.ToLower() == "normal"'
         />
         <quad
-                size="0.8 {{ height }}"
+                size="1 {{ height }}"
                 pos="0 0"
                 bgcolor="ff0058"
-                if='style.ToLower() == "normal"'
+                if='bodyStyle.ToLower() == "normal"'
         />
         <slot name="body" />
       </frame>
diff --git a/src/EvoSC.Manialinks/Util/GlobalManialinkUtils.cs b/src/EvoSC.Manialinks/Util/GlobalManialinkUtils.cs
index 0b5f9f2cd..103432e67 100644
--- a/src/EvoSC.Manialinks/Util/GlobalManialinkUtils.cs
+++ b/src/EvoSC.Manialinks/Util/GlobalManialinkUtils.cs
@@ -1,6 +1,8 @@
 using System.Globalization;
 using EvoSC.Common.Interfaces.Themes;
+using EvoSC.Common.Interfaces.Util;
 using EvoSC.Common.Util;
+using EvoSC.Common.Util.TextFormatting;
 
 namespace EvoSC.Manialinks.Util;
 
@@ -82,4 +84,30 @@ public bool HasItem(string items, string item, string splitter)
     }
 
     public bool HasItem(string items, string item) => HasItem(items, item, ",");
+
+    public string StyledTime(IRaceTime time)
+    {
+        var styledTime = new TextFormatter();
+
+        if (time.Hours > 0)
+        {
+            styledTime.AddText(time.Hours + ":", s => s.WithColor(_theme.UI_TextPrimary));
+        }
+
+        styledTime.AddText(time.Minutes.ToString().PadLeft(2, '0'), s => s
+            .WithColor(time.Minutes + time.Hours > 0 ? _theme.UI_TextPrimary : _theme.UI_TextMuted)
+        );
+
+        styledTime.AddText(":", s => s.WithColor(_theme.UI_TextPrimary));
+        styledTime.AddText(time.Seconds.ToString().PadLeft(2, '0'), s => s
+            .WithColor(time.Seconds + time.Minutes > 0 ? _theme.UI_TextPrimary : _theme.UI_TextMuted)
+        );
+        
+        styledTime.AddText(".", s => s.WithColor(_theme.UI_TextPrimary));
+        styledTime.AddText(time.Milliseconds.ToString().PadLeft(3, '0'), s => s
+            .WithColor(time.Milliseconds + time.Seconds > 0 ? _theme.UI_TextPrimary : _theme.UI_TextMuted)
+        );
+
+        return styledTime.ToString();
+    }
 }
diff --git a/src/EvoSC.Manialinks/Util/ManialinkUtils.cs b/src/EvoSC.Manialinks/Util/ManialinkUtils.cs
new file mode 100644
index 000000000..26c024fb1
--- /dev/null
+++ b/src/EvoSC.Manialinks/Util/ManialinkUtils.cs
@@ -0,0 +1,19 @@
+using System.Text;
+using ManiaTemplates.Lib;
+
+namespace EvoSC.Manialinks.Util;
+
+public static class ManialinkUtils
+{
+    public static string CreateHideManialink(string name)
+    {
+        var sb = new StringBuilder()
+            .Append("<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?>\n")
+            .Append("<manialink version=\"3\" id=\"")
+            .Append(ManialinkNameUtils.KeyToId(name))
+            .Append("\">\n")
+            .Append("</manialink>\n");
+
+        return sb.ToString();
+    }
+}
diff --git a/src/EvoSC/EvoSC.csproj b/src/EvoSC/EvoSC.csproj
index 08d603228..25c2b72fc 100644
--- a/src/EvoSC/EvoSC.csproj
+++ b/src/EvoSC/EvoSC.csproj
@@ -26,6 +26,7 @@
         <ProjectReference Include="..\EvoSC.Modules\EvoSC.Modules.csproj" />
         <ProjectReference Include="..\Modules\ExampleModule\ExampleModule.csproj" />
         <ProjectReference Include="..\Modules\LiveRankingModule\LiveRankingModule.csproj" />
+        <ProjectReference Include="..\Modules\LocalRecordsModule\LocalRecordsModule.csproj" />
         <ProjectReference Include="..\Modules\MapListModule\MapListModule.csproj" />
         <ProjectReference Include="..\Modules\MapQueueModule\MapQueueModule.csproj" />
         <ProjectReference Include="..\Modules\MatchRankingModule\MatchRankingModule.csproj" />
diff --git a/src/EvoSC/InternalModules.cs b/src/EvoSC/InternalModules.cs
index abf3e7627..500e002c8 100644
--- a/src/EvoSC/InternalModules.cs
+++ b/src/EvoSC/InternalModules.cs
@@ -5,6 +5,7 @@
 using EvoSC.Modules.Official.ExampleModule;
 using EvoSC.Modules.Official.FastestCpModule;
 using EvoSC.Modules.Official.LiveRankingModule;
+using EvoSC.Modules.Official.LocalRecordsModule;
 using EvoSC.Modules.Official.MapListModule;
 using EvoSC.Modules.Official.MapQueueModule;
 using EvoSC.Modules.Official.MapsModule;
@@ -49,7 +50,8 @@ public static class InternalModules
         typeof(ASayModule),
         typeof(SpectatorTargetInfoModule),
         typeof(MapQueueModule),
-        typeof(MapListModule)
+        typeof(MapListModule),
+        typeof(LocalRecordsModule)
     };
 
     /// <summary>
diff --git a/src/Modules/ASayModule/Themes/DefaultASayTheme.cs b/src/Modules/ASayModule/Themes/DefaultASayTheme.cs
index 7d771d8ec..008bb1a2d 100644
--- a/src/Modules/ASayModule/Themes/DefaultASayTheme.cs
+++ b/src/Modules/ASayModule/Themes/DefaultASayTheme.cs
@@ -14,7 +14,7 @@ public override Task ConfigureAsync()
         Set("ASayModule.Announcement.Default.TextSize").To(3);
         Set("ASayModule.Announcement.Default.IconSize").To(4);
         Set("ASayModule.Announcement.Default.Bg").To(_theme.UI_BgPrimary);
-        Set("ASayModule.Announcement.Default.BgSecondary").To(_theme.White);
+        Set("ASayModule.Announcement.Default.BgSecondary").To(_theme.UI_AccentSecondary);
         Set("ASayModule.Announcement.Default.Text").To(_theme.UI_TextPrimary);
         
         return Task.CompletedTask;
diff --git a/src/Modules/CurrentMapModule/Services/CurrentMapService.cs b/src/Modules/CurrentMapModule/Services/CurrentMapService.cs
index b8472aaf8..e203b9e57 100644
--- a/src/Modules/CurrentMapModule/Services/CurrentMapService.cs
+++ b/src/Modules/CurrentMapModule/Services/CurrentMapService.cs
@@ -37,9 +37,9 @@ public async Task HideWidgetAsync()
     private async Task ShowManialinkAsync(string mapUId)
     {
         var dbMap = await mapRepository.GetMapByUidAsync(mapUId);
-        var author = "";
+        string author;
         var worldRecord = await worldRecordService.GetRecordAsync();
-        if (dbMap.Author.NickName == dbMap.Author.AccountId)
+        if (dbMap?.Author?.NickName == dbMap?.Author?.AccountId)
         {
             var serverMap = await client.Remote.GetCurrentMapInfoAsync();
             author = serverMap.AuthorNickname.Length > 0 ? serverMap.AuthorNickname : serverMap.Author;
diff --git a/src/Modules/LocalRecordsModule/AuditEvents.cs b/src/Modules/LocalRecordsModule/AuditEvents.cs
new file mode 100644
index 000000000..e4b51e8fe
--- /dev/null
+++ b/src/Modules/LocalRecordsModule/AuditEvents.cs
@@ -0,0 +1,9 @@
+using EvoSC.Common.Util.EnumIdentifier;
+
+namespace EvoSC.Modules.Official.LocalRecordsModule;
+
+public enum AuditEvents
+{
+    [Identifier(Name = "LocalRecords:ResetAll")]
+    ResetAll,
+}
diff --git a/src/Modules/LocalRecordsModule/Config/ILocalRecordsSettings.cs b/src/Modules/LocalRecordsModule/Config/ILocalRecordsSettings.cs
new file mode 100644
index 000000000..7a164b473
--- /dev/null
+++ b/src/Modules/LocalRecordsModule/Config/ILocalRecordsSettings.cs
@@ -0,0 +1,19 @@
+using System.ComponentModel;
+using Config.Net;
+using EvoSC.Modules.Attributes;
+
+namespace EvoSC.Modules.Official.LocalRecordsModule.Config;
+
+[Settings]
+public interface ILocalRecordsSettings
+{
+    [Option(DefaultValue = 10), Description("Max of rows to show in the local records widget.")]
+    public int MaxWidgetRows { get; }
+    
+    [Option(DefaultValue = 3), Description("Always show top N players in the widget.")]
+    public int WidgetShowTop { get; }
+    
+    [Option(DefaultValue = 100), Description("Maximum number of local records to keep track of per map.")]
+    public int MaxRecordsPerMap { get; }
+}
+
diff --git a/src/Modules/LocalRecordsModule/Controllers/CommandsController.cs b/src/Modules/LocalRecordsModule/Controllers/CommandsController.cs
new file mode 100644
index 000000000..73cb3a628
--- /dev/null
+++ b/src/Modules/LocalRecordsModule/Controllers/CommandsController.cs
@@ -0,0 +1,20 @@
+using EvoSC.Commands.Attributes;
+using EvoSC.Commands.Interfaces;
+using EvoSC.Common.Controllers;
+using EvoSC.Common.Controllers.Attributes;
+using EvoSC.Manialinks.Interfaces;
+using EvoSC.Modules.Official.LocalRecordsModule.Permissions;
+
+namespace EvoSC.Modules.Official.LocalRecordsModule.Controllers;
+
+[Controller]
+public class CommandsController(IManialinkManager manialinks) : EvoScController<ICommandInteractionContext>
+{
+    [ChatCommand("resetlocals", "Recalculates local records table on all maps based on pbs.",
+        LocalRecordsPermission.ResetLocals)]
+    public async Task ResetLocalsAsync()
+    {
+        await manialinks.SendManialinkAsync(Context.Player, "LocalRecordsModule.Dialogs.ConfirmResetDialog");
+        Context.AuditEvent.Cancel();
+    }
+}
diff --git a/src/Modules/LocalRecordsModule/Controllers/LocalRecordsManialinkController.cs b/src/Modules/LocalRecordsModule/Controllers/LocalRecordsManialinkController.cs
new file mode 100644
index 000000000..c8119c62c
--- /dev/null
+++ b/src/Modules/LocalRecordsModule/Controllers/LocalRecordsManialinkController.cs
@@ -0,0 +1,42 @@
+using EvoSC.Common.Controllers.Attributes;
+using EvoSC.Common.Interfaces;
+using EvoSC.Manialinks;
+using EvoSC.Manialinks.Attributes;
+using EvoSC.Modules.Official.LocalRecordsModule.Interfaces.Services;
+using EvoSC.Modules.Official.LocalRecordsModule.Permissions;
+
+namespace EvoSC.Modules.Official.LocalRecordsModule.Controllers;
+
+[Controller]
+public class LocalRecordsManialinkController(ILocalRecordsService localRecordsService, IServerClient server) : ManialinkController
+{
+    [ManialinkRoute(Permission = LocalRecordsPermission.ResetLocals)]
+    public async Task ConfirmResetAsync(bool confirmed)
+    {
+        await HideAsync("LocalRecordsModule.Dialogs.ConfirmResetDialog");
+        
+        if (!confirmed)
+        {
+            return;
+        }
+        
+        Context.AuditEvent.WithEventName(AuditEvents.ResetAll);
+        await server.InfoMessageAsync("Resetting local records, this may take a while ...");
+
+        try
+        {
+            await localRecordsService.ResetLocalRecordsAsync();
+        }
+        catch (Exception ex)
+        {
+            await server.ErrorMessageAsync($"Failed to reset local records: {ex.Message}");
+            Context.AuditEvent.Error();
+            throw;
+        }
+        
+        await server.SuccessMessageAsync("Local records successfully reset!");
+        Context.AuditEvent.Success();
+
+        await localRecordsService.ShowWidgetToAllAsync();
+    }
+}
diff --git a/src/Modules/LocalRecordsModule/Controllers/WidgetUpdateController.cs b/src/Modules/LocalRecordsModule/Controllers/WidgetUpdateController.cs
new file mode 100644
index 000000000..0eb819641
--- /dev/null
+++ b/src/Modules/LocalRecordsModule/Controllers/WidgetUpdateController.cs
@@ -0,0 +1,29 @@
+using EvoSC.Common.Controllers;
+using EvoSC.Common.Controllers.Attributes;
+using EvoSC.Common.Events.Attributes;
+using EvoSC.Common.Interfaces.Controllers;
+using EvoSC.Common.Interfaces.Services;
+using EvoSC.Common.Remote;
+using EvoSC.Common.Util;
+using EvoSC.Modules.Official.LocalRecordsModule.Interfaces.Services;
+using EvoSC.Modules.Official.PlayerRecords.Events;
+using GbxRemoteNet.Events;
+
+namespace EvoSC.Modules.Official.LocalRecordsModule.Controllers;
+
+[Controller]
+public class WidgetUpdateController(ILocalRecordsService localRecords, IPlayerManagerService playerManagerService) : EvoScController<IEventControllerContext>
+{
+    [Subscribe(GbxRemoteEvent.PlayerConnect)]
+    public async Task OnPlayerConnectAsync(object sender, PlayerConnectGbxEventArgs args)
+    {
+        var player = await playerManagerService.GetOnlinePlayerAsync(PlayerUtils.ConvertLoginToAccountId(args.Login));
+        await localRecords.ShowWidgetAsync(player);
+    }
+
+    [Subscribe(GbxRemoteEvent.BeginMap)]
+    public Task OnBeginMapAsync(object sender, MapGbxEventArgs args) => localRecords.ShowWidgetToAllAsync();
+
+    [Subscribe(PlayerRecordsEvent.PbRecord)]
+    public Task OnPbAsync(object sender, PbRecordUpdateEventArgs args) => localRecords.UpdatePbAsync(args.Record);
+}
diff --git a/src/Modules/LocalRecordsModule/Database/Models/DbLocalRecord.cs b/src/Modules/LocalRecordsModule/Database/Models/DbLocalRecord.cs
new file mode 100644
index 000000000..28f817467
--- /dev/null
+++ b/src/Modules/LocalRecordsModule/Database/Models/DbLocalRecord.cs
@@ -0,0 +1,36 @@
+using EvoSC.Common.Database.Models.Maps;
+using EvoSC.Common.Interfaces.Models;
+using EvoSC.Modules.Official.LocalRecordsModule.Interfaces;
+using EvoSC.Modules.Official.PlayerRecords.Database.Models;
+using EvoSC.Modules.Official.PlayerRecords.Interfaces.Models;
+using LinqToDB.Mapping;
+
+namespace EvoSC.Modules.Official.LocalRecordsModule.Database.Models;
+
+[Table(TableName)]
+public class DbLocalRecord : ILocalRecord
+{
+    public const string TableName = "LocalRecords";
+    
+    [PrimaryKey, Identity]
+    public long Id { get; set; }
+    
+    [Column]
+    public long MapId { get; set; }
+    
+    [Column]
+    public long RecordId { get; set; }
+    
+    [Column]
+    public int Position { get; set; }
+
+    public IMap Map => DbMap;
+    
+    public IPlayerRecord Record => DbRecord;
+
+    [Association(ThisKey = nameof(MapId), OtherKey = nameof(DbMap.Id))]
+    public DbMap DbMap { get; set; }
+    
+    [Association(ThisKey = nameof(RecordId), OtherKey = nameof(DbPlayerRecord.Id))]
+    public DbPlayerRecord DbRecord { get; set; }
+}
diff --git a/src/Modules/LocalRecordsModule/Database/Repository/LocalRecordRepository.cs b/src/Modules/LocalRecordsModule/Database/Repository/LocalRecordRepository.cs
new file mode 100644
index 000000000..f408a3c93
--- /dev/null
+++ b/src/Modules/LocalRecordsModule/Database/Repository/LocalRecordRepository.cs
@@ -0,0 +1,221 @@
+using EvoSC.Common.Database.Models.Maps;
+using EvoSC.Common.Database.Repository;
+using EvoSC.Common.Interfaces.Database;
+using EvoSC.Common.Interfaces.Models;
+using EvoSC.Common.Services.Attributes;
+using EvoSC.Modules.Official.LocalRecordsModule.Config;
+using EvoSC.Modules.Official.LocalRecordsModule.Database.Models;
+using EvoSC.Modules.Official.LocalRecordsModule.Interfaces;
+using EvoSC.Modules.Official.LocalRecordsModule.Interfaces.Database;
+using EvoSC.Modules.Official.PlayerRecords.Database.Models;
+using EvoSC.Modules.Official.PlayerRecords.Interfaces;
+using EvoSC.Modules.Official.PlayerRecords.Interfaces.Models;
+using LinqToDB;
+using Microsoft.Extensions.Logging;
+
+namespace EvoSC.Modules.Official.LocalRecordsModule.Database.Repository;
+
+[Service]
+public class LocalRecordRepository(
+    IDbConnectionFactory dbConnFactory,
+    IPlayerRecordsRepository recordsRepository,
+    ILocalRecordsSettings settings,
+    ILogger<LocalRecordRepository> logger)
+    : DbRepository(dbConnFactory), ILocalRecordRepository
+{
+    public async Task<IEnumerable<DbLocalRecord>> GetLocalRecordsOfMapByIdAsync(long mapId) =>
+        await NewLoadAll()
+            .Where(r => r.DbMap.Id == mapId)
+            .OrderBy(r => r.Position)
+            .ToArrayAsync();
+
+    public async Task<DbLocalRecord?> AddOrUpdateRecordAsync(IMap map, IPlayerRecord record)
+    {
+        // check if old record is better or equal, and dont bother updating if so
+        var oldRecord = await GetRecordOfPlayerInMapAsync(record.Player, map);
+
+        if (oldRecord != null && oldRecord.Record.CompareTo(record) <= 0)
+        {
+            logger.LogDebug("Player has old record that is better or equal");
+            return oldRecord;
+        }
+
+        var worstRecord = await NewLoadAll()
+            .Where(r => r.DbMap.Id == map.Id)
+            .OrderByDescending(r => r.Position)
+            .FirstOrDefaultAsync();
+
+        if (worstRecord != null && worstRecord.Position >= settings.MaxRecordsPerMap && worstRecord.Record.CompareTo(record) < 0)
+        {
+            logger.LogDebug("player got a new record that is worse than the worst local record of the map");
+            return null;
+        }
+
+        var localRecord = new DbLocalRecord
+        {
+            MapId = map.Id,
+            RecordId = record.Id,
+            Position = 0,
+            DbMap = new DbMap(map),
+            DbRecord = new DbPlayerRecord(record)
+        };
+
+        var transaction = await Database.BeginTransactionAsync();
+
+        try
+        {
+            // remove old record and add the new one
+            if (oldRecord != null)
+            {
+                await Database.DeleteAsync(oldRecord);
+            }
+
+            var id = await Database.InsertWithIdentityAsync(localRecord);
+            localRecord.Id = Convert.ToInt64(id);
+
+            await transaction.CommitTransactionAsync();
+        }
+        catch (Exception ex)
+        {
+            await transaction.RollbackTransactionAsync();
+            throw;
+        }
+
+        var updated = await RecalculatePositionsOfMapAsync(map);
+        var updatedRecord = updated.FirstOrDefault(r => r.Id == localRecord.Id);
+        
+        logger.LogDebug("player got a new local record");
+        return updatedRecord;
+    }
+
+    public async Task AddRecordsAsync(IMap map, IEnumerable<IPlayerRecord> records)
+    {
+        var transaction = await Database.BeginTransactionAsync();
+
+        try
+        {
+            foreach (var record in records)
+            {
+                await Database.InsertWithIdentityAsync(new DbLocalRecord
+                {
+                    MapId = map.Id,
+                    RecordId = record.Id,
+                    Position = 0,
+                    DbMap = new DbMap(map),
+                    DbRecord = new DbPlayerRecord(record)
+                });
+            }
+        }
+        catch (Exception ex)
+        {
+            await transaction.RollbackTransactionAsync();
+            throw;
+        }
+
+        await transaction.CommitTransactionAsync();
+        await RecalculatePositionsOfMapAsync(map);
+    }
+
+    public async Task<DbLocalRecord[]> RecalculatePositionsOfMapAsync(IMap map)
+    {
+        var locals = await GetLocalRecordsOfMapByIdAsync(map.Id);
+        var sorted = locals.OrderBy(r => r.DbRecord.Score).ToArray();
+        var updated = new List<DbLocalRecord>();
+        var remove = new List<DbLocalRecord>();
+
+        var maxRecords = settings.MaxRecordsPerMap;
+
+        for (var i = 0; i < sorted.Length; i++)
+        {
+            if (i > maxRecords)
+            {
+                remove.Add(sorted[i]);
+                continue;
+            }
+
+            var newPos = i + 1;
+
+            // don't update records that dont need it
+            if (sorted[i].Position == newPos)
+            {
+                continue;
+            }
+
+            sorted[i].Position = newPos;
+            updated.Add(sorted[i]);
+        }
+
+        var transaction = await Database.BeginTransactionAsync();
+
+        try
+        {
+            foreach (var record in updated)
+            {
+                await Database.UpdateAsync(record);
+            }
+
+            foreach (var toRemove in remove)
+            {
+                await Database.DeleteAsync(toRemove);
+            }
+
+            await transaction.CommitTransactionAsync();
+        }
+        catch (Exception ex)
+        {
+            await transaction.RollbackTransactionAsync();
+        }
+
+        return updated.ToArray();
+    }
+
+    public async Task<IEnumerable<DbLocalRecord>> GetRecordsByPlayerAsync(IPlayer player) =>
+        await NewLoadAll()
+            .Where(r => r.DbRecord.DbPlayer.Id == player.Id)
+            .ToArrayAsync();
+
+    public async Task<DbLocalRecord?> GetRecordOfPlayerInMapAsync(IPlayer player, IMap map) =>
+        await NewLoadAll()
+            .FirstOrDefaultAsync(r => r.DbRecord.DbPlayer.Id == player.Id);
+
+    public async Task DeleteRecordAsync(IPlayer player, IMap map)
+    {
+        var transaction = await Database.BeginTransactionAsync();
+
+        try
+        {
+            await Table<DbLocalRecord>().DeleteAsync(r => r.MapId == map.Id && r.DbRecord.Player.Id == player.Id);
+            await recordsRepository.DeleteRecordAsync(player, map);
+        }
+        catch (Exception ex)
+        {
+            await transaction.RollbackTransactionAsync();
+            throw;
+        }
+    }
+
+    public async Task DeleteRecordAsync(ILocalRecord localRecord)
+    {
+        var transaction = await Database.BeginTransactionAsync();
+
+        try
+        {
+            await Database.DeleteAsync(localRecord);
+            await recordsRepository.DeleteRecordAsync(localRecord.Record);
+        }
+        catch (Exception ex)
+        {
+            await transaction.RollbackTransactionAsync();
+            throw;
+        }
+    }
+
+    public Task DeleteRecordsAsync(IMap map) => Table<DbLocalRecord>()
+        .Where(r => r.MapId == map.Id)
+        .DeleteAsync();
+
+    private ILoadWithQueryable<DbLocalRecord, IPlayer> NewLoadAll() => Table<DbLocalRecord>()
+        .LoadWith(r => r.DbMap)
+        .LoadWith(r => r.DbRecord)
+        .ThenLoad(r => r.DbPlayer);
+}
diff --git a/src/Modules/LocalRecordsModule/Interfaces/Database/ILocalRecordRepository.cs b/src/Modules/LocalRecordsModule/Interfaces/Database/ILocalRecordRepository.cs
new file mode 100644
index 000000000..cccc0a91b
--- /dev/null
+++ b/src/Modules/LocalRecordsModule/Interfaces/Database/ILocalRecordRepository.cs
@@ -0,0 +1,77 @@
+using EvoSC.Common.Interfaces.Models;
+using EvoSC.Modules.Official.LocalRecordsModule.Database.Models;
+using EvoSC.Modules.Official.PlayerRecords.Interfaces.Models;
+
+namespace EvoSC.Modules.Official.LocalRecordsModule.Interfaces.Database;
+
+public interface ILocalRecordRepository
+{
+    /// <summary>
+    /// Get all local records from a map by its ID.
+    /// </summary>
+    /// <param name="mapId">ID of the map to get local records from.</param>
+    /// <returns></returns>
+    public Task<IEnumerable<DbLocalRecord>> GetLocalRecordsOfMapByIdAsync(long mapId);
+    
+    /// <summary>
+    /// Add a new local record, or update it if its better than existing one.
+    /// </summary>
+    /// <param name="map">Map to add local record to.</param>
+    /// <param name="record">The record to add.</param>
+    /// <returns></returns>
+    public Task<DbLocalRecord?> AddOrUpdateRecordAsync(IMap map, IPlayerRecord record);
+    
+    /// <summary>
+    /// Add multiple local records to a map.
+    /// </summary>
+    /// <param name="map">Map to add local records to.</param>
+    /// <param name="records">Records to add.</param>
+    /// <returns></returns>
+    public Task AddRecordsAsync(IMap map, IEnumerable<IPlayerRecord> records);
+    
+    /// <summary>
+    /// Recalculate positions of all local records in a map. It will
+    /// also remove local records that does not fit within the configured
+    /// top N local records.
+    /// </summary>
+    /// <param name="map">Map to re-calculate local records for.</param>
+    /// <returns></returns>
+    public Task<DbLocalRecord[]> RecalculatePositionsOfMapAsync(IMap map);
+    
+    /// <summary>
+    /// Get local records from a player.
+    /// </summary>
+    /// <param name="player">Player to get local records from.</param>
+    /// <returns></returns>
+    public Task<IEnumerable<DbLocalRecord>> GetRecordsByPlayerAsync(IPlayer player);
+    
+    /// <summary>
+    /// Get the local record of a player for a map.
+    /// </summary>
+    /// <param name="player">The player to get the local record of.</param>
+    /// <param name="map">The map to get the local record for.</param>
+    /// <returns></returns>
+    public Task<DbLocalRecord?> GetRecordOfPlayerInMapAsync(IPlayer player, IMap map);
+    
+    /// <summary>
+    /// Delete a local record for a player in a map.
+    /// </summary>
+    /// <param name="player">The player that has the local record.</param>
+    /// <param name="map">The map that contains the local record.</param>
+    /// <returns></returns>
+    public Task DeleteRecordAsync(IPlayer player, IMap map);
+    
+    /// <summary>
+    /// Delete a local record.
+    /// </summary>
+    /// <param name="localRecord">The local record to remove.</param>
+    /// <returns></returns>
+    public Task DeleteRecordAsync(ILocalRecord localRecord);
+    
+    /// <summary>
+    /// Delete all local records from a map.
+    /// </summary>
+    /// <param name="map">The map to clear all local records from.</param>
+    /// <returns></returns>
+    public Task DeleteRecordsAsync(IMap map);
+}
diff --git a/src/Modules/LocalRecordsModule/Interfaces/ILocalRecord.cs b/src/Modules/LocalRecordsModule/Interfaces/ILocalRecord.cs
new file mode 100644
index 000000000..69b072655
--- /dev/null
+++ b/src/Modules/LocalRecordsModule/Interfaces/ILocalRecord.cs
@@ -0,0 +1,27 @@
+using EvoSC.Common.Interfaces.Models;
+using EvoSC.Modules.Official.PlayerRecords.Interfaces.Models;
+
+namespace EvoSC.Modules.Official.LocalRecordsModule.Interfaces;
+
+public interface ILocalRecord
+{
+    /// <summary>
+    /// The ID of the record.
+    /// </summary>
+    public long Id { get; }
+    
+    /// <summary>
+    /// The position of the record in the leaderboard.
+    /// </summary>
+    public int Position { get; }
+    
+    /// <summary>
+    /// The map the record is set on.
+    /// </summary>
+    public IMap Map { get; }
+    
+    /// <summary>
+    /// The player record.
+    /// </summary>
+    public IPlayerRecord Record { get; }
+}
diff --git a/src/Modules/LocalRecordsModule/Interfaces/Services/ILocalRecordsService.cs b/src/Modules/LocalRecordsModule/Interfaces/Services/ILocalRecordsService.cs
new file mode 100644
index 000000000..1828bc803
--- /dev/null
+++ b/src/Modules/LocalRecordsModule/Interfaces/Services/ILocalRecordsService.cs
@@ -0,0 +1,40 @@
+using EvoSC.Common.Interfaces.Models;
+using EvoSC.Modules.Official.PlayerRecords.Interfaces.Models;
+
+namespace EvoSC.Modules.Official.LocalRecordsModule.Interfaces.Services;
+
+public interface ILocalRecordsService
+{
+    /// <summary>
+    /// Get all local records of the current map on the server.
+    /// </summary>
+    /// <returns></returns>
+    public Task<ILocalRecord[]> GetLocalsOfCurrentMapAsync();
+    
+    /// <summary>
+    /// Show/Update the local records widget to a player.
+    /// </summary>
+    /// <param name="player"></param>
+    /// <returns></returns>
+    public Task ShowWidgetAsync(IPlayer player);
+    
+    /// <summary>
+    /// Show/Update the local records widget to all players.
+    /// </summary>
+    /// <returns></returns>
+    public Task ShowWidgetToAllAsync();
+    
+    /// <summary>
+    /// Update a player's local record for the current map.
+    /// </summary>
+    /// <param name="record"></param>
+    /// <returns></returns>
+    public Task UpdatePbAsync(IPlayerRecord record);
+
+    /// <summary>
+    /// Remove all local records on all maps, and add them back based on the
+    /// registered PBs of players.
+    /// </summary>
+    /// <returns></returns>
+    public Task ResetLocalRecordsAsync();
+}
diff --git a/src/Modules/LocalRecordsModule/LocalRecordsModule.cs b/src/Modules/LocalRecordsModule/LocalRecordsModule.cs
new file mode 100644
index 000000000..047726ed6
--- /dev/null
+++ b/src/Modules/LocalRecordsModule/LocalRecordsModule.cs
@@ -0,0 +1,14 @@
+using EvoSC.Manialinks.Interfaces;
+using EvoSC.Modules.Attributes;
+using EvoSC.Modules.Interfaces;
+using EvoSC.Modules.Official.LocalRecordsModule.Interfaces.Services;
+
+namespace EvoSC.Modules.Official.LocalRecordsModule;
+
+[Module(IsInternal = true)]
+public class LocalRecordsModule(IManialinkManager manialinkManager, ILocalRecordsService localRecordsService) : EvoScModule, IToggleable
+{
+    public Task EnableAsync() => localRecordsService.ShowWidgetToAllAsync();
+
+    public Task DisableAsync() => manialinkManager.HideManialinkAsync("LocalRecordsModule.LocalRecordsWidget");
+}
diff --git a/src/Modules/LocalRecordsModule/LocalRecordsModule.csproj b/src/Modules/LocalRecordsModule/LocalRecordsModule.csproj
new file mode 100644
index 000000000..d9b3074db
--- /dev/null
+++ b/src/Modules/LocalRecordsModule/LocalRecordsModule.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <RootNamespace>EvoSC.Modules.Official.LocalRecordsModule</RootNamespace>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <AssemblyName>LocalRecordsModule</AssemblyName>
+    <Title>Local Records</Title>
+    <Description>Determine and display top records of a map from locally saved records.</Description>
+    <Version>1.0.0</Version>
+    <Authors>Evo</Authors>
+  </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Templates\**\*" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Localization.resx" />
+  </ItemGroup>
+  <ItemGroup>
+        <ProjectReference Include="../../EvoSC.Modules.SourceGeneration/EvoSC.Modules.SourceGeneration.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+        <ProjectReference Include="../../EvoSC.Modules/EvoSC.Modules.csproj" Private="true" />
+        <ProjectReference Include="..\PlayerRecords\PlayerRecords.csproj" />
+  </ItemGroup>
+  
+  </Project>
diff --git a/src/Modules/LocalRecordsModule/Localization.nb-no.resx b/src/Modules/LocalRecordsModule/Localization.nb-no.resx
new file mode 100644
index 000000000..6ac3a281d
--- /dev/null
+++ b/src/Modules/LocalRecordsModule/Localization.nb-no.resx
@@ -0,0 +1,20 @@
+<root>
+  <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>
+  <data name="Widget.NoRecords" xml:space="preserve">
+    <value>Ingen rekorder for denne banen</value>
+  </data>
+  <data name="Widget.Title" xml:space="preserve">
+    <value>LOKALE REKORDER</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Modules/LocalRecordsModule/Localization.resx b/src/Modules/LocalRecordsModule/Localization.resx
new file mode 100644
index 000000000..f6b16b454
--- /dev/null
+++ b/src/Modules/LocalRecordsModule/Localization.resx
@@ -0,0 +1,25 @@
+<?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>
+  <data name="Widget.NoRecords" xml:space="preserve">
+    <value>No records for this map</value>
+  </data>
+  <data name="Widget.Title" xml:space="preserve">
+    <value>LOCAL RECORDS</value>
+  </data>
+</root>
diff --git a/src/Modules/LocalRecordsModule/Migrations/202406050955_AddLocalRecordsTable.cs b/src/Modules/LocalRecordsModule/Migrations/202406050955_AddLocalRecordsTable.cs
new file mode 100644
index 000000000..b40bb8a9d
--- /dev/null
+++ b/src/Modules/LocalRecordsModule/Migrations/202406050955_AddLocalRecordsTable.cs
@@ -0,0 +1,23 @@
+using EvoSC.Modules.Official.LocalRecordsModule.Database.Models;
+using FluentMigrator;
+
+namespace EvoSC.Modules.Official.LocalRecordsModule;
+
+[Tags("Production")]
+[Migration(1717574116)]
+public class AddLocalRecordsTable : Migration
+{
+    public override void Up()
+    {
+        Create.Table(DbLocalRecord.TableName)
+            .WithColumn(nameof(DbLocalRecord.Id)).AsInt64().PrimaryKey().Identity()
+            .WithColumn(nameof(DbLocalRecord.MapId)).AsInt64().Indexed()
+            .WithColumn(nameof(DbLocalRecord.RecordId)).AsInt64().Indexed()
+            .WithColumn(nameof(DbLocalRecord.Position)).AsInt32();
+    }
+
+    public override void Down()
+    {
+        Delete.Table(DbLocalRecord.TableName);
+    }
+}
diff --git a/src/Modules/LocalRecordsModule/Permissions/LocalRecordsPermission.cs b/src/Modules/LocalRecordsModule/Permissions/LocalRecordsPermission.cs
new file mode 100644
index 000000000..6cb85ba4a
--- /dev/null
+++ b/src/Modules/LocalRecordsModule/Permissions/LocalRecordsPermission.cs
@@ -0,0 +1,11 @@
+using System.ComponentModel;
+using EvoSC.Common.Permissions.Attributes;
+
+namespace EvoSC.Modules.Official.LocalRecordsModule.Permissions;
+
+[PermissionGroup]
+public enum LocalRecordsPermission
+{
+    [Description("Can reset the local records table on all maps.")]
+    ResetLocals
+}
diff --git a/src/Modules/LocalRecordsModule/Services/LocalRecordsService.cs b/src/Modules/LocalRecordsModule/Services/LocalRecordsService.cs
new file mode 100644
index 000000000..99cb5d163
--- /dev/null
+++ b/src/Modules/LocalRecordsModule/Services/LocalRecordsService.cs
@@ -0,0 +1,191 @@
+using EvoSC.Common.Interfaces;
+using EvoSC.Common.Interfaces.Models;
+using EvoSC.Common.Interfaces.Services;
+using EvoSC.Common.Interfaces.Themes;
+using EvoSC.Common.Services.Attributes;
+using EvoSC.Common.Util;
+using EvoSC.Common.Util.TextFormatting;
+using EvoSC.Manialinks.Interfaces;
+using EvoSC.Modules.Official.LocalRecordsModule.Config;
+using EvoSC.Modules.Official.LocalRecordsModule.Interfaces;
+using EvoSC.Modules.Official.LocalRecordsModule.Interfaces.Database;
+using EvoSC.Modules.Official.LocalRecordsModule.Interfaces.Services;
+using EvoSC.Modules.Official.PlayerRecords.Interfaces;
+using EvoSC.Modules.Official.PlayerRecords.Interfaces.Models;
+using Microsoft.Extensions.Logging;
+
+namespace EvoSC.Modules.Official.LocalRecordsModule.Services;
+
+[Service]
+public class LocalRecordsService(
+    IMapService mapService,
+    ILocalRecordRepository localRecordRepository,
+    IPlayerManagerService playerManagerService,
+    IManialinkManager manialinkManager,
+    ILogger<LocalRecordsService> logger,
+    ILocalRecordsSettings settings,
+    IServerClient server,
+    IThemeManager themeManager,
+    IPlayerRecordsRepository playerRecordsRepository) : ILocalRecordsService
+{
+    private const string WidgetName = "LocalRecordsModule.LocalRecordsWidget";
+    
+    public async Task<ILocalRecord[]> GetLocalsOfCurrentMapAsync()
+    {
+        var currentMap = await mapService.GetCurrentMapAsync();
+
+        if (currentMap == null)
+        {
+            throw new InvalidOperationException("Failed to get current map");
+        }
+
+        var records = (IEnumerable<ILocalRecord>)await localRecordRepository.GetLocalRecordsOfMapByIdAsync(currentMap.Id);
+        return records.ToArray();
+    }
+
+    public async Task ShowWidgetAsync(IPlayer player)
+    {
+        var records = await GetLocalsOfCurrentMapAsync();
+        var playerRecords = GetRecordsWithPlayer(player, records);
+        await manialinkManager.SendManialinkAsync(player, WidgetName,
+            new { currentPlayer = player, records = playerRecords });
+    }
+
+    public async Task ShowWidgetToAllAsync()
+    {
+        var records = await GetLocalsOfCurrentMapAsync();
+        var onlinePlayers = await playerManagerService.GetOnlinePlayersAsync();
+        var transaction = manialinkManager.CreateTransaction();
+
+        try
+        {
+            foreach (var player in onlinePlayers)
+            {
+                var playerRecords = GetRecordsWithPlayer(player, records);
+                await transaction.SendManialinkAsync(player, WidgetName, new { currentPlayer = player, records = playerRecords });
+            }
+            
+            await transaction.CommitAsync();
+        }
+        catch (Exception ex)
+        {
+            logger.LogError(ex, "Failed to send local records widget");
+        }
+    }
+
+    public async Task UpdatePbAsync(IPlayerRecord record)
+    {
+        var oldRecord = await localRecordRepository.GetRecordOfPlayerInMapAsync(record.Player, record.Map);
+        var localRecord = await localRecordRepository.AddOrUpdateRecordAsync(record.Map, record);
+
+        if (localRecord == null)
+        {
+            // player did not get a local record good enough to be registered
+            return;
+        }
+        
+        var localRaceTime = RaceTime.FromMilliseconds(localRecord.Record.Score).ToString();
+        
+        if (localRaceTime == null)
+        {
+            throw new InvalidOperationException($"Failed to convert {localRecord.Record.Score} to race time");
+        }
+
+        if (oldRecord == null)
+        {
+            await server.InfoMessageAsync(new TextFormatter()
+                .AddText(record.Player.NickName)
+                .AddText(" gained the ")
+                .AddText($"{localRecord.Position}.", s => s.WithColor(themeManager.Theme.Info))
+                .AddText(" local record ")
+                .AddText(localRaceTime, s => s.WithColor(themeManager.Theme.Info))
+                .ToString());
+            await ShowWidgetToAllAsync();
+            return;
+        }
+
+        if (record.Score < oldRecord.Record.Score)
+        {
+            await server.InfoMessageAsync(new TextFormatter()
+                .AddText(record.Player.NickName)
+                .AddText(" improved the ")
+                .AddText($"{localRecord.Position}.", s => s.WithColor(themeManager.Theme.Info))
+                .AddText(" local record ")
+                .AddText(localRaceTime, s => s.WithColor(themeManager.Theme.Info))
+                .AddText(" (")
+                .AddText($"{oldRecord.Position}.", s => s.WithColor(themeManager.Theme.Info))
+                .AddText(" - ")
+                .AddText($"{localRecord.Position}.", s => s.WithColor(themeManager.Theme.Info))
+                .AddText(" )")
+                .ToString());
+            await ShowWidgetToAllAsync();
+        }
+        else if (record.Score == oldRecord.Record.Score)
+        {
+            await server.InfoMessageAsync(new TextFormatter()
+                .AddText(record.Player.NickName)
+                .AddText(" equaled their ")
+                .AddText($"{localRecord.Position}.", s => s.WithColor(themeManager.Theme.Info))
+                .AddText(" local record ")
+                .AddText(localRaceTime, s => s.WithColor(themeManager.Theme.Info))
+                .ToString());
+        }
+    }
+
+    public async Task ResetLocalRecordsAsync()
+    {
+        var maps = await mapService.GetCurrentMapListAsync();
+
+        foreach (var map in maps)
+        {
+            var mapPbs = await playerRecordsRepository.GetRecordsOfMapAsync(map.Id);
+
+            await localRecordRepository.DeleteRecordsAsync(map);
+            await localRecordRepository.AddRecordsAsync(map, mapPbs);
+        }
+    }
+
+    private ILocalRecord[] GetRecordsWithPlayer(IPlayer player, ILocalRecord[] records)
+    {
+        if (records.Length == 0)
+        {
+            return records;
+        }
+        
+        var playerRecord = records.FirstOrDefault(r => r.Record.Player.Id == player.Id);
+        var topMaxRows = Math.Min(settings.MaxWidgetRows, records.Length);
+
+        // if player doesn't exist, just return the top players
+        if (playerRecord == null)
+        {
+            return records[..topMaxRows];
+        }
+
+        // if records around player overlaps with top players, just return first MaxRows records
+        if (playerRecord.Position <= settings.MaxWidgetRows)
+        {
+            return records[..topMaxRows];
+        }
+        
+        // return top records + records around the player
+        var topRecords = records[..Math.Min(settings.WidgetShowTop, records.Length)];
+
+        var maxRange = settings.MaxWidgetRows - settings.WidgetShowTop;
+        var half = maxRange / 2;
+
+        var lower = playerRecord.Position - half;
+        var upper = lower + maxRange;
+
+        // if the range is outside the upper bound, let's start from the last record instead
+        if (upper > records.Length)
+        {
+            lower -= upper - records.Length;
+            upper = records.Length;
+
+            lower++;
+            upper++;
+        }
+
+        return [..topRecords, ..records[(lower - 1)..(upper - 1)]];
+    }
+}
diff --git a/src/Modules/LocalRecordsModule/Templates/Dialogs/ConfirmResetDialog.mt b/src/Modules/LocalRecordsModule/Templates/Dialogs/ConfirmResetDialog.mt
new file mode 100644
index 000000000..7d981fc34
--- /dev/null
+++ b/src/Modules/LocalRecordsModule/Templates/Dialogs/ConfirmResetDialog.mt
@@ -0,0 +1,19 @@
+<!--
+Shows a confirmation dialog when deleting a map from the leaderboard.
+-->
+<component>
+  <import component="EvoSC.Controls.ConfirmDialog" as="ConfirmDialog" />
+  <import component="EvoSC.Style.UIStyle" as="UIStyle" />
+  
+  <template>
+    <UIStyle />
+    
+    <ConfirmDialog 
+            title="Reset local records?"
+            text="This will re-calculate local records on all maps based PBs."
+            action="LocalRecordsManialinkController/ConfirmReset"
+    />
+  </template>
+  
+  <script resource="EvoSC.Scripts.UIScripts" main="true" />
+</component>
\ No newline at end of file
diff --git a/src/Modules/LocalRecordsModule/Templates/LocalRecordsWidget.mt b/src/Modules/LocalRecordsModule/Templates/LocalRecordsWidget.mt
new file mode 100644
index 000000000..110a3eb68
--- /dev/null
+++ b/src/Modules/LocalRecordsModule/Templates/LocalRecordsWidget.mt
@@ -0,0 +1,57 @@
+<component>
+  <using namespace="EvoSC.Common.Interfaces.Models" />
+  <using namespace="EvoSC.Common.Interfaces.Util" />
+  <using namespace="EvoSC.Common.Util" />
+  <using namespace="EvoSC.Modules.Official.LocalRecordsModule.Interfaces" />
+  <using namespace="System.Linq" />
+  
+  <import component="EvoSC.Containers.Widget" as="Widget" />
+  <import component="EvoSC.Style.UIStyle" as="UIStyle" />
+  <import component="EvoSC.Controls.Panel" as="Panel" />
+  
+  <import component="LocalRecordsModule.Widget.RecordRow" as="RecordRow" />
+  <import component="LocalRecordsModule.Style.LocalRecordsStyle" as="LocalRecordsStyle" />
+  
+  <property type="IEnumerable<ILocalRecord>" name="records" />
+  <property type="IPlayer" name="currentPlayer" />
+  
+  <template>
+    <UIStyle />
+    <LocalRecordsStyle />
+      <Widget header="local records" height="20" bodyStyle="unstyled" y="80">
+      <template slot="body">
+        <RecordRow 
+                pos="{{ record.Position }}"
+                name="{{ record.Record.Player.NickName }}" 
+                y="{{ -__index*(4+0.3) }}" 
+                foreach="ILocalRecord record in records"
+                time="{{ RaceTime.FromMilliseconds(record.Record.Score) }}" 
+                self="{{ record.Record.Player.Id == currentPlayer.Id }}"
+        />
+        
+        <frame if="records.Count() == 0">
+          <quad
+                  bgcolor="{{ Theme.UI_AccentPrimary }}"
+                  size="0.7 9"
+          />
+          <Panel
+                  width="36"
+                  height="9"
+                  x="0.7"
+                  className="lr-body-primary"
+                  bgColor=""
+          >
+            <label
+                    class="text-primary"
+                    text="No records for this map"
+                    valign="center"
+                    halign="center"
+                    pos="18 -4.2"
+                    size="36 9"
+            />
+          </Panel>
+        </frame>
+      </template>
+    </Widget>
+  </template>
+</component>
diff --git a/src/Modules/LocalRecordsModule/Templates/Style/LocalRecordsStyle.mt b/src/Modules/LocalRecordsModule/Templates/Style/LocalRecordsStyle.mt
new file mode 100644
index 000000000..2015ce0dc
--- /dev/null
+++ b/src/Modules/LocalRecordsModule/Templates/Style/LocalRecordsStyle.mt
@@ -0,0 +1,17 @@
+<component>
+  <template>
+    <stylesheet>
+      <style
+              class="lr-body-primary"
+              bgcolor="{{ Theme.UI_LocalRecordsModule_Widget_RowBg }}"
+              opacity="0.9"
+      />
+
+      <style
+              class="lr-body-highlight"
+              bgcolor="{{ Theme.UI_LocalRecordsModule_Widget_RowBgHighlight }}"
+              opacity="0.9"
+      />
+    </stylesheet>
+  </template>
+</component>
diff --git a/src/Modules/LocalRecordsModule/Templates/Widget/RecordRow.mt b/src/Modules/LocalRecordsModule/Templates/Widget/RecordRow.mt
new file mode 100644
index 000000000..42cd6e9ed
--- /dev/null
+++ b/src/Modules/LocalRecordsModule/Templates/Widget/RecordRow.mt
@@ -0,0 +1,65 @@
+<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" />
+  
+  <template>
+    <frame pos="0 {{ y }}">
+      <quad
+              bgcolor="{{ Theme.UI_LocalRecordsModule_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="{{ Util.StyledTime(time) }}"
+                class="text-primary"
+                textsize="0.5"
+                pos="{{ width-16.5 }} {{ -height/2.0 + 0.2 }}"
+                valign="center"
+                size="16 {{ height }}"
+        />
+      </Panel>
+    </frame>
+  </template>
+</component>
diff --git a/src/Modules/LocalRecordsModule/Themes/DefaultLocalRecordsTheme.cs b/src/Modules/LocalRecordsModule/Themes/DefaultLocalRecordsTheme.cs
new file mode 100644
index 000000000..5bacb1612
--- /dev/null
+++ b/src/Modules/LocalRecordsModule/Themes/DefaultLocalRecordsTheme.cs
@@ -0,0 +1,29 @@
+using EvoSC.Common.Interfaces.Themes;
+using EvoSC.Common.Themes;
+using EvoSC.Common.Themes.Attributes;
+using EvoSC.Common.Util;
+
+namespace EvoSC.Modules.Official.LocalRecordsModule.Themes;
+
+[Theme(Name = "Local Records", Description = "Default theme for the local records widget.")]
+public class DefaultLocalRecordsTheme(IThemeManager theme) : Theme<DefaultLocalRecordsTheme>
+{
+    private readonly dynamic _theme = theme.Theme;
+
+    public override Task ConfigureAsync()
+    {
+        Set("UI.LocalRecordsModule.Widget.AccentColor").To((int pos) => pos switch
+        {
+            1 => _theme.Gold,
+            2 => _theme.Silver,
+            3 => _theme.Bronze,
+            _ => _theme.UI_AccentPrimary
+        });
+
+        Set("UI.LocalRecordsModule.Widget.RowBg").To(_theme.UI_BgPrimary);
+        Set("UI.LocalRecordsModule.Widget.RowBgHighlight").To(ColorUtils.Lighten(_theme.UI_BgPrimary));
+
+        return Task.CompletedTask;
+    }
+}
+
diff --git a/src/Modules/LocalRecordsModule/info.toml b/src/Modules/LocalRecordsModule/info.toml
new file mode 100644
index 000000000..fc5c8d2f7
--- /dev/null
+++ b/src/Modules/LocalRecordsModule/info.toml
@@ -0,0 +1,14 @@
+[info]
+# A unique name for this module, this is used as a identifier
+name = "LocalRecordsModule"
+# The title of the module
+title = "Local Records"
+# A short description of what the module is and does
+summary = "Determine and display top records of a map from locally saved records."
+# The current version of this module, using SEMVER
+version = "1.0.0"
+# The name of the author that created this module
+author = "Evo"
+
+[dependencies]
+RecordsModule = "1.0.0"
diff --git a/src/Modules/MapListModule/Templates/MapList.mt b/src/Modules/MapListModule/Templates/MapList.mt
index 458aad365..1cb97e7b2 100644
--- a/src/Modules/MapListModule/Templates/MapList.mt
+++ b/src/Modules/MapListModule/Templates/MapList.mt
@@ -25,6 +25,7 @@ Shows a window with a list of maps available in the current match settings.
                  scrollHeight="{{ maps.Count()*8 }}"
                  width="96"
                  height="60"
+                 id="maplist-container"
       >
         <MapRow 
                 foreach="IMapListMap map in maps" 
diff --git a/src/Modules/MapQueueModule/Controllers/QueueCommandsController.cs b/src/Modules/MapQueueModule/Controllers/QueueCommandsController.cs
index 18e48acbf..2cfb297bb 100644
--- a/src/Modules/MapQueueModule/Controllers/QueueCommandsController.cs
+++ b/src/Modules/MapQueueModule/Controllers/QueueCommandsController.cs
@@ -28,7 +28,7 @@ public async Task QueueListAsync()
         var message = new TextFormatter();
         var mapList = mapQueue.QueuedMaps
             .Select(m => new FormattedText(m.Name)
-                .AsIsolated()
+                .AsNotIsolated()
                 .WithStyle(style => style.WithColor(Color.Gray))
             );
 
diff --git a/src/Modules/PlayerRecords/Database/Models/DbPlayerRecord.cs b/src/Modules/PlayerRecords/Database/Models/DbPlayerRecord.cs
index 7751b9051..2c5c33d5a 100644
--- a/src/Modules/PlayerRecords/Database/Models/DbPlayerRecord.cs
+++ b/src/Modules/PlayerRecords/Database/Models/DbPlayerRecord.cs
@@ -42,4 +42,62 @@ public class DbPlayerRecord : IPlayerRecord
     public DbMap DbMap;
 
     public IMap? Map => DbMap;
+
+    public DbPlayerRecord(){}
+
+    public DbPlayerRecord(IPlayerRecord? record)
+    {
+        if (record == null)
+        {
+            return;
+        }
+
+        Id = record.Id;
+        PlayerId = record.Player.Id;
+        MapId = record.Map.Id;
+        Score = record.Score;
+        RecordType = record.RecordType;
+        Checkpoints = record.Checkpoints;
+        CreatedAt = record.CreatedAt;
+        UpdatedAt = record.UpdatedAt;
+        DbPlayer = new DbPlayer(record.Player);
+        DbMap = new DbMap(record.Map);
+    }
+
+    public int CompareTo(IPlayerRecord? other)
+    {
+        if (other == null)
+        {
+            // better than "nothing"
+            return 1;
+        }
+        
+        if (RecordType != other.RecordType)
+        {
+            throw new InvalidOperationException("Cannot compare records of different types");
+        }
+
+        return RecordType switch
+        {
+            PlayerRecordType.Points => ComparePoints(),
+            PlayerRecordType.Time => CompareTime(),
+            _ => CompareTime()
+        };
+
+        // Compare time record type, lower is better
+        int CompareTime() => Score switch
+        {
+            _ when Score < other.Score => -1,
+            _ when Score > other.Score => 1,
+            _ => 0
+        };
+
+        // compare points record type, higher is better
+        int ComparePoints() => Score switch
+        {
+            _ when Score > other.Score => -1,
+            _ when Score < other.Score => 1,
+            _ => 0
+        };
+    }
 }
diff --git a/src/Modules/PlayerRecords/Database/Repository/PlayerRecordsRepository.cs b/src/Modules/PlayerRecords/Database/Repository/PlayerRecordsRepository.cs
index e97979ab5..69f93cef7 100644
--- a/src/Modules/PlayerRecords/Database/Repository/PlayerRecordsRepository.cs
+++ b/src/Modules/PlayerRecords/Database/Repository/PlayerRecordsRepository.cs
@@ -21,9 +21,8 @@ public class PlayerRecordsRepository(DbConnectionFactory dbConnFactory, ILogger<
         Table<DbPlayerRecord>()
             .LoadWith(r => r.DbPlayer)
             .LoadWith(r => r.DbMap)
-            .SingleOrDefaultAsync(r => r.PlayerId == player.Id && r.MapId == map.Id);
-
-    public Task UpdateRecordAsync(DbPlayerRecord record) => Database.UpdateAsync(record);
+            .OrderBy(r => r.Score)
+            .FirstOrDefaultAsync(r => r.PlayerId == player.Id && r.MapId == map.Id);
 
     public async Task<DbPlayerRecord> InsertRecordAsync(IPlayer player, IMap map, int score, IEnumerable<int> checkpoints)
     {
@@ -42,7 +41,8 @@ public async Task<DbPlayerRecord> InsertRecordAsync(IPlayer player, IMap map, in
 
         try
         {
-            await Database.InsertAsync(record);
+            var id = await Database.InsertWithIdentityAsync(record);
+            record.Id = Convert.ToInt64(id);
         }
         catch (Exception ex)
         {
@@ -52,4 +52,17 @@ public async Task<DbPlayerRecord> InsertRecordAsync(IPlayer player, IMap map, in
 
         return record;
     }
+
+    public Task DeleteRecordAsync(IPlayer player, IMap map) => Table<DbPlayerRecord>()
+        .DeleteAsync(r => r.MapId == map.Id && r.PlayerId == player.Id);
+
+    public Task DeleteRecordAsync(IPlayerRecord record) => Database.DeleteAsync(record);
+
+    public Task<DbPlayerRecord[]> GetRecordsOfMapAsync(long mapId) =>
+        Table<DbPlayerRecord>()
+            .LoadWith(r => r.DbMap)
+            .LoadWith(r => r.DbPlayer)
+            .Where(r => r.MapId == mapId)
+            .OrderBy(r => r.Score)
+            .ToArrayAsync();
 }
diff --git a/src/Modules/PlayerRecords/Interfaces/IPlayerRecordsRepository.cs b/src/Modules/PlayerRecords/Interfaces/IPlayerRecordsRepository.cs
index e5a2e68a4..0602a3f00 100644
--- a/src/Modules/PlayerRecords/Interfaces/IPlayerRecordsRepository.cs
+++ b/src/Modules/PlayerRecords/Interfaces/IPlayerRecordsRepository.cs
@@ -1,5 +1,6 @@
 using EvoSC.Common.Interfaces.Models;
 using EvoSC.Modules.Official.PlayerRecords.Database.Models;
+using EvoSC.Modules.Official.PlayerRecords.Interfaces.Models;
 
 namespace EvoSC.Modules.Official.PlayerRecords.Interfaces;
 
@@ -13,17 +14,15 @@ public interface IPlayerRecordsRepository
     /// <returns></returns>
     public Task<DbPlayerRecord?> GetRecordAsync(IPlayer player, IMap map);
     
-    /// <summary>
-    /// Update a record in the database.
-    /// </summary>
-    /// <param name="record">The record to update with new information.</param>
-    /// <returns></returns>
-    public Task UpdateRecordAsync(DbPlayerRecord record);
-    
     /// <summary>
     /// Add a new record to the database.
     /// </summary>
     /// <param name="record">The record to add.</param>
     /// <returns></returns>
     public Task<DbPlayerRecord> InsertRecordAsync(IPlayer player, IMap map, int score, IEnumerable<int> checkpoints);
+
+    public Task DeleteRecordAsync(IPlayer player, IMap map);
+    public Task DeleteRecordAsync(IPlayerRecord record);
+
+    public Task<DbPlayerRecord[]> GetRecordsOfMapAsync(long mapId);
 }
diff --git a/src/Modules/PlayerRecords/Interfaces/Models/IPlayerRecord.cs b/src/Modules/PlayerRecords/Interfaces/Models/IPlayerRecord.cs
index 90654397d..d1da8180f 100644
--- a/src/Modules/PlayerRecords/Interfaces/Models/IPlayerRecord.cs
+++ b/src/Modules/PlayerRecords/Interfaces/Models/IPlayerRecord.cs
@@ -2,11 +2,14 @@
 
 namespace EvoSC.Modules.Official.PlayerRecords.Interfaces.Models;
 
-public interface IPlayerRecord
+public interface IPlayerRecord : IComparable<IPlayerRecord>
 {
+    public long Id { get; }
     public IPlayer Player { get; }
     public IMap Map { get; }
     public int Score { get; }
     public PlayerRecordType RecordType { get; }
     public string Checkpoints { get; }
+    public DateTime CreatedAt { get; }
+    public DateTime UpdatedAt { get; }
 }
diff --git a/src/Modules/PlayerRecords/Services/PlayerRecordsService.cs b/src/Modules/PlayerRecords/Services/PlayerRecordsService.cs
index 3c0c3f9c0..d7f06a055 100644
--- a/src/Modules/PlayerRecords/Services/PlayerRecordsService.cs
+++ b/src/Modules/PlayerRecords/Services/PlayerRecordsService.cs
@@ -55,7 +55,7 @@ public async Task<IMap> GetOrAddCurrentMapAsync()
 
         if (record == null)
         {
-            await recordsRepo.InsertRecordAsync(player, map, score, checkpoints);
+            record = await recordsRepo.InsertRecordAsync(player, map, score, checkpoints);
             return (record, RecordUpdateStatus.New);
         }
 
@@ -63,11 +63,8 @@ public async Task<IMap> GetOrAddCurrentMapAsync()
         {
             return (record, score > record.Score ? RecordUpdateStatus.NotUpdated : RecordUpdateStatus.Equal);
         }
-
-        record.Score = score;
-        record.Checkpoints = string.Join(',', checkpoints);
-        record.UpdatedAt = DateTime.UtcNow;
-        await recordsRepo.UpdateRecordAsync(record);
+        
+        record = await recordsRepo.InsertRecordAsync(player, map, score, checkpoints);
 
         return (record, RecordUpdateStatus.Updated);
     }
diff --git a/tests/EvoSC.CLI.Tests/EvoSC.CLI.Tests.csproj b/tests/EvoSC.CLI.Tests/EvoSC.CLI.Tests.csproj
index 0dee7c98f..d428c99d4 100644
--- a/tests/EvoSC.CLI.Tests/EvoSC.CLI.Tests.csproj
+++ b/tests/EvoSC.CLI.Tests/EvoSC.CLI.Tests.csproj
@@ -8,12 +8,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit" Version="2.6.3" />
+        <PackageReference Include="xunit" Version="2.8.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
diff --git a/tests/EvoSC.Commands.Tests/EvoSC.Commands.Tests.csproj b/tests/EvoSC.Commands.Tests/EvoSC.Commands.Tests.csproj
index 7bd3513e0..6b942a975 100644
--- a/tests/EvoSC.Commands.Tests/EvoSC.Commands.Tests.csproj
+++ b/tests/EvoSC.Commands.Tests/EvoSC.Commands.Tests.csproj
@@ -8,12 +8,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit" Version="2.6.3" />
+        <PackageReference Include="xunit" Version="2.8.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
diff --git a/tests/EvoSC.Common.Tests/EvoSC.Common.Tests.csproj b/tests/EvoSC.Common.Tests/EvoSC.Common.Tests.csproj
index 82269616d..a298b4ccc 100644
--- a/tests/EvoSC.Common.Tests/EvoSC.Common.Tests.csproj
+++ b/tests/EvoSC.Common.Tests/EvoSC.Common.Tests.csproj
@@ -13,13 +13,13 @@
         <PackageReference Include="linq2db" Version="5.3.2" />
         <PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="Moq" Version="4.20.70" />
         <PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit" Version="2.6.3" />
+        <PackageReference Include="xunit" Version="2.8.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
diff --git a/tests/EvoSC.Manialinks.Tests/EvoSC.Manialinks.Tests.csproj b/tests/EvoSC.Manialinks.Tests/EvoSC.Manialinks.Tests.csproj
index f0c7412ba..4a5f4eb6e 100644
--- a/tests/EvoSC.Manialinks.Tests/EvoSC.Manialinks.Tests.csproj
+++ b/tests/EvoSC.Manialinks.Tests/EvoSC.Manialinks.Tests.csproj
@@ -9,12 +9,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit" Version="2.6.3" />
+        <PackageReference Include="xunit" Version="2.8.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
diff --git a/tests/EvoSC.Testing.Tests/EvoSC.Testing.Tests.csproj b/tests/EvoSC.Testing.Tests/EvoSC.Testing.Tests.csproj
index 4b1caa41b..8ceacb16d 100644
--- a/tests/EvoSC.Testing.Tests/EvoSC.Testing.Tests.csproj
+++ b/tests/EvoSC.Testing.Tests/EvoSC.Testing.Tests.csproj
@@ -10,12 +10,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit" Version="2.6.3" />
+        <PackageReference Include="xunit" Version="2.8.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
diff --git a/tests/EvoSC.Tests/EvoSC.Tests.csproj b/tests/EvoSC.Tests/EvoSC.Tests.csproj
index b5f47e83f..907dd812e 100644
--- a/tests/EvoSC.Tests/EvoSC.Tests.csproj
+++ b/tests/EvoSC.Tests/EvoSC.Tests.csproj
@@ -10,7 +10,7 @@
     <ItemGroup>
         <PackageReference Include="Flurl" Version="3.0.6" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -19,7 +19,7 @@
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit" Version="2.6.3" />
+        <PackageReference Include="xunit" Version="2.8.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
diff --git a/tests/Modules/ASayModule.Tests/ASayModule.Tests.csproj b/tests/Modules/ASayModule.Tests/ASayModule.Tests.csproj
index 22753f6f3..ed5b14ac3 100644
--- a/tests/Modules/ASayModule.Tests/ASayModule.Tests.csproj
+++ b/tests/Modules/ASayModule.Tests/ASayModule.Tests.csproj
@@ -11,9 +11,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="Moq" Version="4.20.70" />
-        <PackageReference Include="xunit" Version="2.6.3" />
+        <PackageReference Include="xunit" Version="2.8.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
diff --git a/tests/Modules/CurrentMapModule.Tests/CurrentMapModule.Tests.csproj b/tests/Modules/CurrentMapModule.Tests/CurrentMapModule.Tests.csproj
index e0fe50c23..78e1dfc16 100644
--- a/tests/Modules/CurrentMapModule.Tests/CurrentMapModule.Tests.csproj
+++ b/tests/Modules/CurrentMapModule.Tests/CurrentMapModule.Tests.csproj
@@ -9,13 +9,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="Moq" Version="4.20.70" />
         <PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit" Version="2.6.3" />
+        <PackageReference Include="xunit" Version="2.8.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
diff --git a/tests/Modules/FastestCp.Tests/FastestCp.Tests.csproj b/tests/Modules/FastestCp.Tests/FastestCp.Tests.csproj
index 0db56029d..78c648182 100644
--- a/tests/Modules/FastestCp.Tests/FastestCp.Tests.csproj
+++ b/tests/Modules/FastestCp.Tests/FastestCp.Tests.csproj
@@ -9,13 +9,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="Moq" Version="4.20.70" />
         <PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit" Version="2.6.3" />
+        <PackageReference Include="xunit" Version="2.8.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
diff --git a/tests/Modules/LocalRecordsModule.Tests/Controllers/CommandsControllerTests.cs b/tests/Modules/LocalRecordsModule.Tests/Controllers/CommandsControllerTests.cs
new file mode 100644
index 000000000..35e3313f8
--- /dev/null
+++ b/tests/Modules/LocalRecordsModule.Tests/Controllers/CommandsControllerTests.cs
@@ -0,0 +1,27 @@
+using EvoSC.Common.Interfaces.Models;
+using EvoSC.Manialinks.Interfaces;
+using EvoSC.Modules.Official.LocalRecordsModule.Controllers;
+using EvoSC.Testing.Controllers;
+using Moq;
+
+namespace LocalRecordsModule.Tests.Controllers;
+
+public class CommandsControllerTests : CommandInteractionControllerTestBase<CommandsController>
+{
+    private Mock<IOnlinePlayer> _actor = new();
+    private Mock<IManialinkManager> _manialinkManager = new();
+    
+    public CommandsControllerTests()
+    {
+        InitMock(_actor.Object, _manialinkManager);
+    }
+
+    [Fact]
+    public async Task Reset_Locals_Is_Confirmed()
+    {
+        await Controller.ResetLocalsAsync();
+        
+        _manialinkManager.Verify(m => m.SendManialinkAsync(_actor.Object, "LocalRecordsModule.Dialogs.ConfirmResetDialog"));
+        AuditEventBuilder.Verify(m => m.Cancel());
+    }
+}
diff --git a/tests/Modules/LocalRecordsModule.Tests/Controllers/LocalRecordsManialinkControllerTests.cs b/tests/Modules/LocalRecordsModule.Tests/Controllers/LocalRecordsManialinkControllerTests.cs
new file mode 100644
index 000000000..b9c6ee6b6
--- /dev/null
+++ b/tests/Modules/LocalRecordsModule.Tests/Controllers/LocalRecordsManialinkControllerTests.cs
@@ -0,0 +1,56 @@
+using EvoSC.Common.Interfaces;
+using EvoSC.Common.Interfaces.Models;
+using EvoSC.Manialinks.Interfaces.Models;
+using EvoSC.Modules.Official.LocalRecordsModule.Controllers;
+using EvoSC.Modules.Official.LocalRecordsModule.Interfaces.Services;
+using EvoSC.Testing;
+using EvoSC.Testing.Controllers;
+using GbxRemoteNet.Interfaces;
+using Moq;
+
+namespace LocalRecordsModule.Tests.Controllers;
+
+public class LocalRecordsManialinkControllerTests : ManialinkControllerTestBase<LocalRecordsManialinkController>
+{
+    private readonly Mock<IManialinkActionContext> _manialinkActionContext = new();
+    private readonly Mock<IOnlinePlayer> _actor = new();
+    private readonly Mock<ILocalRecordsService> _localRecordsService = new();
+    private readonly (Mock<IServerClient> Server, Mock<IGbxRemoteClient> Remote)
+        _server = Mocking.NewServerClientMock();
+
+    public LocalRecordsManialinkControllerTests()
+    {
+        InitMock(_actor.Object, _manialinkActionContext.Object, _localRecordsService, _server.Server);
+    }
+
+    [Fact]
+    public async Task Reset_Records_Confirmation_Resets_All_Records()
+    {
+        await Controller.ConfirmResetAsync(true);
+        
+        ManialinkManager.Verify(m => m.HideManialinkAsync("LocalRecordsModule.Dialogs.ConfirmResetDialog"));
+        _localRecordsService.Verify(m => m.ResetLocalRecordsAsync());
+        AuditEventBuilder.Verify(m => m.Success());
+    }
+    
+    [Fact]
+    public async Task Reset_Records_Cancel_Does_Not_Resets_All_Records()
+    {
+        await Controller.ConfirmResetAsync(false);
+        
+        ManialinkManager.Verify(m => m.HideManialinkAsync("LocalRecordsModule.Dialogs.ConfirmResetDialog"));
+        _localRecordsService.Verify(m => m.ResetLocalRecordsAsync(), Times.Never);
+        AuditEventBuilder.Verify(m => m.Success(), Times.Never);
+        AuditEventBuilder.Verify(m => m.Error(), Times.Never);
+    }
+
+    [Fact]
+    public async Task Reset_Records_Error_Is_Reported()
+    {
+        _localRecordsService.Setup(m => m.ResetLocalRecordsAsync()).Throws<Exception>();
+        
+        await Assert.ThrowsAsync<Exception>(() => Controller.ConfirmResetAsync(true));
+        _server.Server.Verify(m => m.ErrorMessageAsync(It.IsAny<string>()));
+        AuditEventBuilder.Verify(m => m.Error());
+    }
+}
diff --git a/tests/Modules/LocalRecordsModule.Tests/Controllers/WidgetUpdateControllerTests.cs b/tests/Modules/LocalRecordsModule.Tests/Controllers/WidgetUpdateControllerTests.cs
new file mode 100644
index 000000000..546fa2137
--- /dev/null
+++ b/tests/Modules/LocalRecordsModule.Tests/Controllers/WidgetUpdateControllerTests.cs
@@ -0,0 +1,70 @@
+using EvoSC.Common.Interfaces.Models;
+using EvoSC.Common.Interfaces.Models.Enums;
+using EvoSC.Common.Interfaces.Services;
+using EvoSC.Common.Models.Maps;
+using EvoSC.Common.Models.Players;
+using EvoSC.Modules.Official.LocalRecordsModule.Controllers;
+using EvoSC.Modules.Official.LocalRecordsModule.Interfaces.Services;
+using EvoSC.Modules.Official.PlayerRecords.Database.Models;
+using EvoSC.Modules.Official.PlayerRecords.Events;
+using EvoSC.Testing.Controllers;
+using GbxRemoteNet.Events;
+using Moq;
+
+namespace LocalRecordsModule.Tests.Controllers;
+
+public class WidgetUpdateControllerTests : EventControllerTestBase<WidgetUpdateController>
+{
+    private readonly Mock<ILocalRecordsService> _localRecordsService = new();
+    private readonly Mock<IPlayerManagerService> _playerManagerService = new();
+    
+    public WidgetUpdateControllerTests()
+    {
+        InitMock(_localRecordsService, _playerManagerService);
+    }
+
+    [Fact]
+    public async Task Widget_Shown_For_Player_On_Join()
+    {
+        var player = new OnlinePlayer
+        {
+            Id = 1,
+            AccountId = "a467a996-eba5-44bf-9e2b-8543b50f39ae",
+            NickName = "snixtho",
+            UbisoftName = "snixtho",
+            State = PlayerState.Playing
+        };
+        
+        _playerManagerService.Setup(m => m.GetOnlinePlayerAsync("a467a996-eba5-44bf-9e2b-8543b50f39ae"))
+            .ReturnsAsync(player);
+        
+        await Controller.OnPlayerConnectAsync(null, new PlayerConnectGbxEventArgs { Login = "pGepluulRL-eK4VDtQ85rg" });
+        
+        _localRecordsService.Verify(m => m.ShowWidgetAsync(player));
+    }
+
+    [Fact]
+    public async Task Widget_Is_Updated_When_New_Map_Starts()
+    {
+        await Controller.OnBeginMapAsync(null, new MapGbxEventArgs());
+        
+        _localRecordsService.Verify(m => m.ShowWidgetToAllAsync());
+    }
+
+    [Fact]
+    public async Task Local_Records_Are_Updated_When_Player_Gets_Pb()
+    {
+        var record = new DbPlayerRecord();
+        var player = new Player();
+        var map = new Map();
+
+        var args = new PbRecordUpdateEventArgs
+        {
+            Player = player, Map = map, Record = record, Status = RecordUpdateStatus.New
+        };
+
+        await Controller.OnPbAsync(null, args);
+        
+        _localRecordsService.Verify(m => m.UpdatePbAsync(record));
+    }
+}
diff --git a/tests/Modules/LocalRecordsModule.Tests/GlobalUsings.cs b/tests/Modules/LocalRecordsModule.Tests/GlobalUsings.cs
new file mode 100644
index 000000000..c802f4480
--- /dev/null
+++ b/tests/Modules/LocalRecordsModule.Tests/GlobalUsings.cs
@@ -0,0 +1 @@
+global using Xunit;
diff --git a/tests/Modules/LocalRecordsModule.Tests/LocalRecordsModule.Tests.csproj b/tests/Modules/LocalRecordsModule.Tests/LocalRecordsModule.Tests.csproj
new file mode 100644
index 000000000..ae41820e7
--- /dev/null
+++ b/tests/Modules/LocalRecordsModule.Tests/LocalRecordsModule.Tests.csproj
@@ -0,0 +1,37 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </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.4.5">
+      <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\LocalRecordsModule\LocalRecordsModule.csproj" />
+    <ProjectReference Include="..\..\EvoSC.Common.Tests\EvoSC.Common.Tests.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/LocalRecordsModule.Tests/LocalRecordsModuleTests.cs b/tests/Modules/LocalRecordsModule.Tests/LocalRecordsModuleTests.cs
new file mode 100644
index 000000000..076647489
--- /dev/null
+++ b/tests/Modules/LocalRecordsModule.Tests/LocalRecordsModuleTests.cs
@@ -0,0 +1,32 @@
+using EvoSC.Manialinks.Interfaces;
+using EvoSC.Modules.Official.LocalRecordsModule.Interfaces.Services;
+using Moq;
+
+namespace LocalRecordsModule.Tests;
+
+public class LocalRecordsModuleTests
+{
+    [Fact]
+    public async Task Widget_Is_Shown_To_All_On_Enable()
+    {
+        var manialinks = new Mock<IManialinkManager>();
+        var localRecords = new Mock<ILocalRecordsService>();
+        var module = new EvoSC.Modules.Official.LocalRecordsModule.LocalRecordsModule(manialinks.Object, localRecords.Object);
+
+        await module.EnableAsync();
+        
+        localRecords.Verify(m => m.ShowWidgetToAllAsync());
+    }
+    
+    [Fact]
+    public async Task Widget_Is_Hidden_On_Disable()
+    {
+        var manialinks = new Mock<IManialinkManager>();
+        var localRecords = new Mock<ILocalRecordsService>();
+        var module = new EvoSC.Modules.Official.LocalRecordsModule.LocalRecordsModule(manialinks.Object, localRecords.Object);
+
+        await module.DisableAsync();
+
+        manialinks.Verify(m => m.HideManialinkAsync("LocalRecordsModule.LocalRecordsWidget"));
+    }
+}
diff --git a/tests/Modules/LocalRecordsModule.Tests/Services/LocalRecordsServiceTests.cs b/tests/Modules/LocalRecordsModule.Tests/Services/LocalRecordsServiceTests.cs
new file mode 100644
index 000000000..36085949f
--- /dev/null
+++ b/tests/Modules/LocalRecordsModule.Tests/Services/LocalRecordsServiceTests.cs
@@ -0,0 +1,318 @@
+using EvoSC.Common.Database.Models.Maps;
+using EvoSC.Common.Database.Models.Player;
+using EvoSC.Common.Interfaces;
+using EvoSC.Common.Interfaces.Models;
+using EvoSC.Common.Interfaces.Models.Enums;
+using EvoSC.Common.Interfaces.Services;
+using EvoSC.Common.Interfaces.Themes;
+using EvoSC.Common.Models.Maps;
+using EvoSC.Common.Models.Players;
+using EvoSC.Common.Tests;
+using EvoSC.Common.Themes;
+using EvoSC.Manialinks;
+using EvoSC.Manialinks.Interfaces;
+using EvoSC.Modules.Official.LocalRecordsModule.Config;
+using EvoSC.Modules.Official.LocalRecordsModule.Database.Models;
+using EvoSC.Modules.Official.LocalRecordsModule.Interfaces;
+using EvoSC.Modules.Official.LocalRecordsModule.Interfaces.Database;
+using EvoSC.Modules.Official.LocalRecordsModule.Interfaces.Services;
+using EvoSC.Modules.Official.LocalRecordsModule.Services;
+using EvoSC.Modules.Official.PlayerRecords.Database.Models;
+using EvoSC.Modules.Official.PlayerRecords.Interfaces;
+using EvoSC.Modules.Official.PlayerRecords.Interfaces.Models;
+using EvoSC.Testing;
+using GbxRemoteNet.Interfaces;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualBasic;
+using Moq;
+
+namespace LocalRecordsModule.Tests.Services;
+
+using MockData = (
+    ILocalRecordsService Service,
+    Mock<IMapService> MapService,
+    Mock<ILocalRecordRepository> LocalRecordRepository,
+    Mock<IPlayerManagerService> PlayerManagerService,
+    Mock<IManialinkManager> ManialinkManager,
+    ILogger<LocalRecordsService> Logger,
+    Mock<ILocalRecordsSettings> Settings,
+    (Mock<IServerClient> Client, Mock<IGbxRemoteClient> Remote) Server,
+    Mock<IThemeManager> ThemeManager,
+    Mock<IPlayerRecordsRepository> PlayerRecordsRepository);
+
+public class LocalRecordsServiceTests
+{
+    private MockData NewLocalRecordsServiceMock()
+    {
+        var mapService = new Mock<IMapService>();
+        var localRecordRepository = new Mock<ILocalRecordRepository>();
+        var playerManager = new Mock<IPlayerManagerService>();
+        var manialinkManager = new Mock<IManialinkManager>();
+        var logger = LoggerSetup.CreateLogger<LocalRecordsService>();
+        var settings = new Mock<ILocalRecordsSettings>();
+        var server = Mocking.NewServerClientMock();
+        var themeManager = new Mock<IThemeManager>();
+        var playerRecordsRepository = new Mock<IPlayerRecordsRepository>();
+
+        themeManager.SetupGet(m => m.Theme)
+            .Returns(new DynamicThemeOptions(new Dictionary<string, object> { { "Info", "FFF" } }));
+        
+        var localRecordsService = new LocalRecordsService(
+            mapService.Object,
+            localRecordRepository.Object,
+            playerManager.Object,
+            manialinkManager.Object,
+            logger,
+            settings.Object,
+            server.Client.Object,
+            themeManager.Object,
+            playerRecordsRepository.Object
+        );
+
+        return (
+            localRecordsService,
+            mapService,
+            localRecordRepository,
+            playerManager,
+            manialinkManager,
+            logger,
+            settings,
+            server,
+            themeManager,
+            playerRecordsRepository
+        );
+    }
+
+    private (IMap Map, IPlayer Player) SetupMockRecords(MockData mock)
+    {
+        var currentMap = new Map { Id = 1234, Uid = "my map" };
+        var player = new Player { Id = 3, AccountId = "myplayer", NickName = "my player" };
+
+        DbPlayerRecord[] records =
+        [
+            new DbPlayerRecord
+            {
+                Id = 1,
+                MapId = currentMap.Id,
+                Score = 1337,
+                RecordType = PlayerRecordType.Time,
+                DbMap = new DbMap(currentMap),
+                DbPlayer = new DbPlayer{ Id = 2, AccountId = "myplayer2", NickName = "my player2"}
+            },
+            new DbPlayerRecord
+            {
+                Id = 2,
+                MapId = currentMap.Id,
+                Score = 1337,
+                RecordType = PlayerRecordType.Time,
+                DbMap = new DbMap(currentMap),
+                DbPlayer = new DbPlayer{ Id = 3, AccountId = "myplayer3", NickName = "my player3"}
+            },
+            new DbPlayerRecord
+            {
+                Id = 3,
+                MapId = currentMap.Id,
+                Score = 1337,
+                RecordType = PlayerRecordType.Time,
+                DbMap = new DbMap(currentMap),
+                DbPlayer =  new DbPlayer(player)
+            },
+            new DbPlayerRecord
+            {
+                Id = 4,
+                MapId = currentMap.Id,
+                Score = 1337,
+                RecordType = PlayerRecordType.Time,
+                DbMap = new DbMap(currentMap),
+                DbPlayer = new DbPlayer{ Id = 4, AccountId = "myplayer4", NickName = "my player4"}
+            },
+            new DbPlayerRecord
+            {
+                Id = 5,
+                MapId = currentMap.Id,
+                Score = 1337,
+                RecordType = PlayerRecordType.Time,
+                DbMap = new DbMap(currentMap),
+                DbPlayer = new DbPlayer{ Id = 5, AccountId = "myplayer5", NickName = "my player5"}
+            },
+        ];
+
+        mock.MapService.Setup(m => m.GetCurrentMapAsync()).ReturnsAsync(currentMap);
+        mock.LocalRecordRepository.Setup(m => m.GetLocalRecordsOfMapByIdAsync(currentMap.Id))
+            .ReturnsAsync(records.Select(r => new DbLocalRecord
+            {
+                Id = 0,
+                MapId = (long)r.MapId!,
+                RecordId = r.Id,
+                Position = (int)r.Id,
+                DbMap = r.DbMap,
+                DbRecord = r
+            }));
+
+        return (currentMap, player);
+    }
+
+    [Fact]
+    public async Task GetLocalsOfCurrentMap_Returns_Local_Records_Of_CurrentMap()
+    {
+        var mock = NewLocalRecordsServiceMock();
+        SetupMockRecords(mock);
+        var records = await mock.Service.GetLocalsOfCurrentMapAsync();
+
+        Assert.Equal(5, records.Length);
+        Assert.All(records, r => Assert.Equal("my map", r.Map.Uid));
+    }
+
+    [Fact]
+    public async Task Current_Map_Not_Found_Throws_Error()
+    {
+        var mock = NewLocalRecordsServiceMock();
+
+        mock.MapService.Setup(m => m.GetCurrentMapAsync()).ReturnsAsync((IMap?)null);
+
+        await Assert.ThrowsAsync<InvalidOperationException>(() => mock.Service.GetLocalsOfCurrentMapAsync());
+    }
+
+    [Fact]
+    public async Task Widget_Is_Shown_To_Player()
+    {
+        var mock = NewLocalRecordsServiceMock();
+        var mockSetup = SetupMockRecords(mock);
+
+        await mock.Service.ShowWidgetAsync(mockSetup.Player);
+
+        mock.ManialinkManager.Verify(m =>
+            m.SendManialinkAsync(mockSetup.Player, "LocalRecordsModule.LocalRecordsWidget", It.IsAny<object>()));
+    }
+
+    [Fact]
+    public async Task Widget_Is_Shown_To_All()
+    {
+        var mock = NewLocalRecordsServiceMock();
+        var mockSetup = SetupMockRecords(mock);
+        var player1 = new OnlinePlayer { Id = 1, AccountId = "player1", State = PlayerState.Playing };
+        var player2 = new OnlinePlayer { Id = 2, AccountId = "player2", State = PlayerState.Playing };
+        var player3 = new OnlinePlayer { Id = 3, AccountId = "player3", State = PlayerState.Playing };
+
+        mock.PlayerManagerService
+            .Setup(m => m.GetOnlinePlayersAsync())
+            .ReturnsAsync([player1, player2, player3]);
+
+        var transaction = new Mock<IManialinkTransaction>();
+        mock.ManialinkManager.Setup(m => m.CreateTransaction()).Returns(transaction.Object);
+
+        await mock.Service.ShowWidgetToAllAsync();
+
+        transaction.Verify(m => m.SendManialinkAsync(player1, "LocalRecordsModule.LocalRecordsWidget", It.IsAny<object>()), Times.Once);
+        transaction.Verify(m => m.SendManialinkAsync(player2, "LocalRecordsModule.LocalRecordsWidget", It.IsAny<object>()), Times.Once);
+        transaction.Verify(m => m.SendManialinkAsync(player3, "LocalRecordsModule.LocalRecordsWidget", It.IsAny<object>()), Times.Once);
+    }
+
+    [Fact]
+    public async Task New_Pb_Is_Not_Good_Enough()
+    {
+        var mock = NewLocalRecordsServiceMock();
+        var newPb = new DbPlayerRecord
+        {
+            Id = 0,
+            PlayerId = 0,
+            MapId = null,
+            Score = 0,
+            RecordType = PlayerRecordType.Time,
+            Checkpoints = null,
+            CreatedAt = default,
+            UpdatedAt = default,
+            DbPlayer = null,
+            DbMap = null
+        };
+
+        mock.LocalRecordRepository
+            .Setup(m => m.GetRecordOfPlayerInMapAsync(newPb.Player, newPb.Map))
+            .ReturnsAsync((DbLocalRecord?)null);
+
+        mock.LocalRecordRepository
+            .Setup(m => m.AddOrUpdateRecordAsync(newPb.Map, newPb))
+            .ReturnsAsync((DbLocalRecord?)null);
+
+        await mock.Service.UpdatePbAsync(newPb);
+        
+        mock.Server.Client.Verify(m => m.InfoMessageAsync(It.IsAny<string>()), Times.Never);
+    }
+
+    [Fact]
+    public async Task New_Pb_Is_New_Local_Record()
+    {
+        var mock = NewLocalRecordsServiceMock();
+        var mockSetup = SetupMockRecords(mock);
+        var newPb = new DbPlayerRecord
+        {
+            PlayerId = 1, Score = 12345, RecordType = PlayerRecordType.Time, DbPlayer = new DbPlayer(mockSetup.Player)
+        };
+        var localRecord = new DbLocalRecord { DbRecord = newPb, Position = 1337 };
+
+        mock.LocalRecordRepository
+            .Setup(m => m.GetRecordOfPlayerInMapAsync(newPb.Player, newPb.Map))
+            .ReturnsAsync((DbLocalRecord?)null);
+
+        mock.LocalRecordRepository
+            .Setup(m => m.AddOrUpdateRecordAsync(newPb.Map, newPb))
+            .ReturnsAsync(localRecord);
+
+        await mock.Service.UpdatePbAsync(newPb);
+
+        mock.Server.Client.Verify(m => m.InfoMessageAsync(It.Is<string>(s => s.Contains("gained the"))), Times.Once);
+    }
+    
+    [Fact]
+    public async Task New_Pb_Is_Improved_From_Old_Record()
+    {
+        var mock = NewLocalRecordsServiceMock();
+        var mockSetup = SetupMockRecords(mock);
+        var newPb = new DbPlayerRecord
+        {
+            PlayerId = 1, Score = 12345, RecordType = PlayerRecordType.Time, DbPlayer = new DbPlayer(mockSetup.Player),
+        };
+        var oldPlayerRecord = new DbPlayerRecord()
+        {
+            Score = 123456, RecordType = PlayerRecordType.Time, DbPlayer = new DbPlayer(mockSetup.Player)
+        };
+        var oldRecord = new DbLocalRecord { DbRecord = oldPlayerRecord, Position = 1337};
+        var localRecord = new DbLocalRecord { DbRecord = newPb, Position = 1337 };
+
+        mock.LocalRecordRepository
+            .Setup(m => m.GetRecordOfPlayerInMapAsync(newPb.Player, newPb.Map))
+            .ReturnsAsync((DbLocalRecord?)oldRecord);
+
+        mock.LocalRecordRepository
+            .Setup(m => m.AddOrUpdateRecordAsync(newPb.Map, newPb))
+            .ReturnsAsync(localRecord);
+
+        await mock.Service.UpdatePbAsync(newPb);
+
+        mock.Server.Client.Verify(m => m.InfoMessageAsync(It.Is<string>(s => s.Contains("improved the"))), Times.Once);
+    }
+    
+    [Fact]
+    public async Task New_Pb_Is_Equaled_To_Old_Record()
+    {
+        var mock = NewLocalRecordsServiceMock();
+        var mockSetup = SetupMockRecords(mock);
+        var newPb = new DbPlayerRecord
+        {
+            PlayerId = 1, Score = 12345, RecordType = PlayerRecordType.Time, DbPlayer = new DbPlayer(mockSetup.Player),
+        };
+        var localRecord = new DbLocalRecord { DbRecord = newPb, Position = 1337 };
+
+        mock.LocalRecordRepository
+            .Setup(m => m.GetRecordOfPlayerInMapAsync(newPb.Player, newPb.Map))
+            .ReturnsAsync((DbLocalRecord?)localRecord);
+
+        mock.LocalRecordRepository
+            .Setup(m => m.AddOrUpdateRecordAsync(newPb.Map, newPb))
+            .ReturnsAsync(localRecord);
+
+        await mock.Service.UpdatePbAsync(newPb);
+
+        mock.Server.Client.Verify(m => m.InfoMessageAsync(It.Is<string>(s => s.Contains("equaled their"))), Times.Once);
+    }
+}
diff --git a/tests/Modules/MapListModule.Tests/MapListModule.Tests.csproj b/tests/Modules/MapListModule.Tests/MapListModule.Tests.csproj
index 05167034a..478b4ee96 100644
--- a/tests/Modules/MapListModule.Tests/MapListModule.Tests.csproj
+++ b/tests/Modules/MapListModule.Tests/MapListModule.Tests.csproj
@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
-    <PackageReference Include="xunit" Version="2.6.3"/>
+    <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>
diff --git a/tests/Modules/MapQueueModuleTests/MapQueueModuleTests.csproj b/tests/Modules/MapQueueModuleTests/MapQueueModuleTests.csproj
index 98c22487c..a1b6670c6 100644
--- a/tests/Modules/MapQueueModuleTests/MapQueueModuleTests.csproj
+++ b/tests/Modules/MapQueueModuleTests/MapQueueModuleTests.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.6.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
diff --git a/tests/Modules/MapsModule.Tests/MapsModule.Tests.csproj b/tests/Modules/MapsModule.Tests/MapsModule.Tests.csproj
index 596cf2d39..a8d287d31 100644
--- a/tests/Modules/MapsModule.Tests/MapsModule.Tests.csproj
+++ b/tests/Modules/MapsModule.Tests/MapsModule.Tests.csproj
@@ -11,12 +11,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit" Version="2.6.3" />
+        <PackageReference Include="xunit" Version="2.8.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
diff --git a/tests/Modules/MatchManagerModule.Tests/MatchManagerModule.Tests.csproj b/tests/Modules/MatchManagerModule.Tests/MatchManagerModule.Tests.csproj
index 4bff1a19b..85a98614d 100644
--- a/tests/Modules/MatchManagerModule.Tests/MatchManagerModule.Tests.csproj
+++ b/tests/Modules/MatchManagerModule.Tests/MatchManagerModule.Tests.csproj
@@ -10,8 +10,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-        <PackageReference Include="xunit" Version="2.6.3" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+        <PackageReference Include="xunit" Version="2.8.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
diff --git a/tests/Modules/MatchReadyModule.Tests/MatchReadyModule.Tests.csproj b/tests/Modules/MatchReadyModule.Tests/MatchReadyModule.Tests.csproj
index 99c1e0f16..4f029621e 100644
--- a/tests/Modules/MatchReadyModule.Tests/MatchReadyModule.Tests.csproj
+++ b/tests/Modules/MatchReadyModule.Tests/MatchReadyModule.Tests.csproj
@@ -9,9 +9,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="Moq" Version="4.20.70" />
-        <PackageReference Include="xunit" Version="2.6.3" />
+        <PackageReference Include="xunit" Version="2.8.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
diff --git a/tests/Modules/MatchTrackerModule.Tests/MatchTrackerModule.Tests.csproj b/tests/Modules/MatchTrackerModule.Tests/MatchTrackerModule.Tests.csproj
index 4611d84f1..60a5aa63c 100644
--- a/tests/Modules/MatchTrackerModule.Tests/MatchTrackerModule.Tests.csproj
+++ b/tests/Modules/MatchTrackerModule.Tests/MatchTrackerModule.Tests.csproj
@@ -11,8 +11,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-        <PackageReference Include="xunit" Version="2.6.3" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+        <PackageReference Include="xunit" Version="2.8.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
diff --git a/tests/Modules/MotdModule.Tests/MotdModule.Tests.csproj b/tests/Modules/MotdModule.Tests/MotdModule.Tests.csproj
index 8d97ad595..078a6fa64 100644
--- a/tests/Modules/MotdModule.Tests/MotdModule.Tests.csproj
+++ b/tests/Modules/MotdModule.Tests/MotdModule.Tests.csproj
@@ -10,9 +10,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="MockHttpClient" Version="1.11.0" />
-        <PackageReference Include="xunit" Version="2.6.3" />
+        <PackageReference Include="xunit" Version="2.8.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
diff --git a/tests/Modules/NextMapModule.Tests/NextMapModule.Tests.csproj b/tests/Modules/NextMapModule.Tests/NextMapModule.Tests.csproj
index d555b0d9c..8a0cf66e8 100644
--- a/tests/Modules/NextMapModule.Tests/NextMapModule.Tests.csproj
+++ b/tests/Modules/NextMapModule.Tests/NextMapModule.Tests.csproj
@@ -11,12 +11,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit" Version="2.6.3" />
+        <PackageReference Include="xunit" Version="2.8.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
diff --git a/tests/Modules/OpenPlanetModule.Tests/OpenPlanetModule.Tests.csproj b/tests/Modules/OpenPlanetModule.Tests/OpenPlanetModule.Tests.csproj
index f8570d763..b72b7e922 100644
--- a/tests/Modules/OpenPlanetModule.Tests/OpenPlanetModule.Tests.csproj
+++ b/tests/Modules/OpenPlanetModule.Tests/OpenPlanetModule.Tests.csproj
@@ -11,8 +11,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-        <PackageReference Include="xunit" Version="2.6.3" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+        <PackageReference Include="xunit" Version="2.8.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
diff --git a/tests/Modules/Player.Tests/Player.Tests.csproj b/tests/Modules/Player.Tests/Player.Tests.csproj
index 2a7816f89..bc28570ad 100644
--- a/tests/Modules/Player.Tests/Player.Tests.csproj
+++ b/tests/Modules/Player.Tests/Player.Tests.csproj
@@ -11,12 +11,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit" Version="2.6.3" />
+        <PackageReference Include="xunit" Version="2.8.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
diff --git a/tests/Modules/SetName.Tests/SetName.Tests.csproj b/tests/Modules/SetName.Tests/SetName.Tests.csproj
index 3dc204b12..471e9dbe9 100644
--- a/tests/Modules/SetName.Tests/SetName.Tests.csproj
+++ b/tests/Modules/SetName.Tests/SetName.Tests.csproj
@@ -11,12 +11,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit" Version="2.6.3" />
+        <PackageReference Include="xunit" Version="2.8.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>