diff --git a/LANCommander.SDK/Providers/SettingsProvider.cs b/LANCommander.SDK/Providers/SettingsProvider.cs
index bbf07ef1..f57476d3 100644
--- a/LANCommander.SDK/Providers/SettingsProvider.cs
+++ b/LANCommander.SDK/Providers/SettingsProvider.cs
@@ -15,6 +15,8 @@ using Settings = LANCommander.SDK.Models.Settings;
 public class SettingsProvider<TSettings> : ISettingsProvider
     where TSettings : Settings, new()
 {
+    public const string FileName = "Settings.yaml";
+    
     private readonly string _filePath;
     private readonly IOptionsMonitor<TSettings> _optionsMonitor;
     
diff --git a/LANCommander.Server.Data.SQLite/Migrations/20231103052501_RemoveGameIconProperty.cs b/LANCommander.Server.Data.SQLite/Migrations/20231103052501_RemoveGameIconProperty.cs
index ccf6dc12..8cea6ed8 100644
--- a/LANCommander.Server.Data.SQLite/Migrations/20231103052501_RemoveGameIconProperty.cs
+++ b/LANCommander.Server.Data.SQLite/Migrations/20231103052501_RemoveGameIconProperty.cs
@@ -12,8 +12,6 @@ namespace LANCommander.Migrations
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            var settings = SettingService.GetSettings();
-
             // Migrate any old icons from the filesystem
             if (Directory.Exists("Icon"))
                 foreach (var file in Directory.EnumerateFiles("Icon"))
diff --git a/LANCommander.Server.Data.SQLite/Migrations/20240220154307_CalculateMediaChecksum.cs b/LANCommander.Server.Data.SQLite/Migrations/20240220154307_CalculateMediaChecksum.cs
index d6c2a409..7202588c 100644
--- a/LANCommander.Server.Data.SQLite/Migrations/20240220154307_CalculateMediaChecksum.cs
+++ b/LANCommander.Server.Data.SQLite/Migrations/20240220154307_CalculateMediaChecksum.cs
@@ -12,8 +12,6 @@ namespace LANCommander.Migrations
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            var settings = SettingService.GetSettings();
-
             if (Directory.Exists("Media"))
             {
                 var files = Directory.EnumerateFiles("Media");
diff --git a/LANCommander.Server.Data.SQLite/Migrations/20241011014752_AddStorageLocations.cs b/LANCommander.Server.Data.SQLite/Migrations/20241011014752_AddStorageLocations.cs
index 56e01d0a..bce688ab 100644
--- a/LANCommander.Server.Data.SQLite/Migrations/20241011014752_AddStorageLocations.cs
+++ b/LANCommander.Server.Data.SQLite/Migrations/20241011014752_AddStorageLocations.cs
@@ -13,8 +13,6 @@ namespace LANCommander.Migrations
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            var settings = SettingService.GetSettings();
-
             migrationBuilder.AddColumn<Guid>(
                 name: "StorageLocationId",
                 table: "Media",
diff --git a/LANCommander.Server.Data/DatabaseContext.cs b/LANCommander.Server.Data/DatabaseContext.cs
index 75264aea..2c21c84c 100644
--- a/LANCommander.Server.Data/DatabaseContext.cs
+++ b/LANCommander.Server.Data/DatabaseContext.cs
@@ -1,7 +1,7 @@
 using LANCommander.Server.Data.Enums;
 using LANCommander.Server.Data.Interceptors;
 using LANCommander.Server.Data.Models;
-using Microsoft.AspNetCore.Identity;
+using LANCommander.Server.Settings.Enums;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 
diff --git a/LANCommander.Server.Data/Enums/DatabaseProvider.cs b/LANCommander.Server.Data/Enums/DatabaseProvider.cs
deleted file mode 100644
index 2dfb4a99..00000000
--- a/LANCommander.Server.Data/Enums/DatabaseProvider.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace LANCommander.Server.Data.Enums
-{
-    public enum DatabaseProvider
-    {
-        Unknown,
-        SQLite,
-        MySQL,
-        PostgreSQL
-    }
-}
diff --git a/LANCommander.Server.Data/Enums/ServerEngine.cs b/LANCommander.Server.Data/Enums/ServerEngine.cs
deleted file mode 100644
index e0ad64c4..00000000
--- a/LANCommander.Server.Data/Enums/ServerEngine.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace LANCommander.Server.Data.Enums;
-
-public enum ServerEngine
-{
-    Local,
-    Docker
-}
\ No newline at end of file
diff --git a/LANCommander.Server.Data/LANCommander.Server.Data.csproj b/LANCommander.Server.Data/LANCommander.Server.Data.csproj
index c0a5ad69..268cb67f 100644
--- a/LANCommander.Server.Data/LANCommander.Server.Data.csproj
+++ b/LANCommander.Server.Data/LANCommander.Server.Data.csproj
@@ -18,6 +18,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\LANCommander.SDK\LANCommander.SDK.csproj" />
+    <ProjectReference Include="..\LANCommander.Server.Settings\LANCommander.Server.Settings.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/LANCommander.Server.Data/Models/Server.cs b/LANCommander.Server.Data/Models/Server.cs
index d1eff347..b0666212 100644
--- a/LANCommander.Server.Data/Models/Server.cs
+++ b/LANCommander.Server.Data/Models/Server.cs
@@ -2,7 +2,7 @@
 using LANCommander.SDK.Enums;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
-using LANCommander.Server.Data.Enums;
+using LANCommander.Server.Settings.Enums;
 
 namespace LANCommander.Server.Data.Models
 {
diff --git a/LANCommander.Server.Services/Abstractions/IGitHubService.cs b/LANCommander.Server.Services/Abstractions/IGitHubService.cs
index f88c5da1..eb076271 100644
--- a/LANCommander.Server.Services/Abstractions/IGitHubService.cs
+++ b/LANCommander.Server.Services/Abstractions/IGitHubService.cs
@@ -1,4 +1,5 @@
 using LANCommander.Server.Services.Models;
+using LANCommander.Server.Settings.Enums;
 using Octokit;
 using Semver;
 
diff --git a/LANCommander.Server.Services/Abstractions/IVersionProvider.cs b/LANCommander.Server.Services/Abstractions/IVersionProvider.cs
index c48a8971..a8e1938b 100644
--- a/LANCommander.Server.Services/Abstractions/IVersionProvider.cs
+++ b/LANCommander.Server.Services/Abstractions/IVersionProvider.cs
@@ -1,4 +1,5 @@
 using LANCommander.Server.Services.Models;
+using LANCommander.Server.Settings.Enums;
 using Semver;
 
 namespace LANCommander.Server.Services.Abstractions;
diff --git a/LANCommander.Server.Services/ActionService.cs b/LANCommander.Server.Services/ActionService.cs
index 8b0dccd5..755ef339 100644
--- a/LANCommander.Server.Services/ActionService.cs
+++ b/LANCommander.Server.Services/ActionService.cs
@@ -11,10 +11,11 @@ namespace LANCommander.Server.Services
 {
     public sealed class ActionService(
         ILogger<ActionService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
-        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<Action>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<Action>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public override async Task<Action> AddAsync(Action entity)
         {
diff --git a/LANCommander.Server.Services/ArchiveClient.cs b/LANCommander.Server.Services/ArchiveClient.cs
index 29f77ee0..d300e321 100644
--- a/LANCommander.Server.Services/ArchiveClient.cs
+++ b/LANCommander.Server.Services/ArchiveClient.cs
@@ -21,11 +21,12 @@ namespace LANCommander.Server.Services
 {
     public sealed class ArchiveClient(
         ILogger<ArchiveClient> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
         IDbContextFactory<DatabaseContext> dbContextFactory,
-        StorageLocationService storageLocationService) : BaseDatabaseService<Archive>(logger, cache, mapper, httpContextAccessor, dbContextFactory), IArchiveClient
+        StorageLocationService storageLocationService) : BaseDatabaseService<Archive>(logger, settingsProvider, cache, mapper, httpContextAccessor, dbContextFactory), IArchiveClient
     {
         public async Task<Archive> GetLatestArchive(Expression<Func<Archive, bool>> predicate)
         {
diff --git a/LANCommander.Server.Services/AuthenticationService.cs b/LANCommander.Server.Services/AuthenticationService.cs
index f95ad63a..3b5bb6a2 100644
--- a/LANCommander.Server.Services/AuthenticationService.cs
+++ b/LANCommander.Server.Services/AuthenticationService.cs
@@ -17,11 +17,12 @@ namespace LANCommander.Server.Services
     public class AuthenticationService(
         ILogger<AuthenticationService> logger,
         IMapper mapper,
+        SettingsProvider<Settings.Settings> settingsProvider,
         UserService userService,
         RoleService roleService,
         ScriptService scriptService,
         ITokenProvider tokenProvider,
-        SDK.Services.ScriptClient scriptClient) : BaseService(logger)
+        SDK.Services.ScriptClient scriptClient) : BaseService(logger, settingsProvider)
     {
         public async Task<AuthToken> LoginAsync(string userName, string password)
         {
@@ -62,7 +63,7 @@ namespace LANCommander.Server.Services
                 
             _logger?.LogDebug("Password check for user {UserName} was successful", user.UserName);
 
-            if (_settings.Authentication.RequireApproval && !user.Approved && !await userService.IsInRoleAsync(user, RoleService.AdministratorRoleName))
+            if (_settingsProvider.CurrentValue.Server.Authentication.RequireApproval && !user.Approved && !await userService.IsInRoleAsync(user, RoleService.AdministratorRoleName))
                 throw new UserAuthenticationException("Account must be approved by an administrator");
                 
             var userRoles = await userService.GetRolesAsync(user);
@@ -85,7 +86,7 @@ namespace LANCommander.Server.Services
             var refreshToken = GenerateRefreshToken();
                 
             user.RefreshToken = refreshToken;
-            user.RefreshTokenExpiration = DateTime.UtcNow.AddDays(_settings.Authentication.TokenLifetime);
+            user.RefreshTokenExpiration = DateTime.UtcNow.AddDays(_settingsProvider.CurrentValue.Server.Authentication.TokenLifetime);
                 
             await userService.UpdateAsync(user);
 
@@ -171,9 +172,9 @@ namespace LANCommander.Server.Services
 
                 try
                 {
-                    if (_settings.Roles.DefaultRoleId == Guid.Empty)
+                    if (_settingsProvider.CurrentValue.Server.Roles.DefaultRoleId == Guid.Empty)
                     {
-                        var defaultRole = await roleService.GetAsync(_settings.Roles.DefaultRoleId);
+                        var defaultRole = await roleService.GetAsync(_settingsProvider.CurrentValue.Server.Roles.DefaultRoleId);
 
                         if (defaultRole != null)
                             await userService.AddToRoleAsync(user.UserName, defaultRole.Name);
@@ -221,7 +222,7 @@ namespace LANCommander.Server.Services
                 ValidateAudience = false,
                 ValidateIssuer = false,
                 ValidateIssuerSigningKey = true,
-                IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(_settings.Authentication.TokenSecret)),
+                IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(_settingsProvider.CurrentValue.Server.Authentication.TokenSecret)),
                 ValidateLifetime = false
             };
 
@@ -247,10 +248,10 @@ namespace LANCommander.Server.Services
         
         private JwtSecurityToken GetToken(List<Claim> authClaims)
         {
-            var authSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(_settings.Authentication.TokenSecret));
+            var authSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(_settingsProvider.CurrentValue.Server.Authentication.TokenSecret));
 
             var token = new JwtSecurityToken(
-                expires: DateTime.UtcNow.AddDays(_settings.Authentication.TokenLifetime),
+                expires: DateTime.UtcNow.AddDays(_settingsProvider.CurrentValue.Server.Authentication.TokenLifetime),
                 claims: authClaims,
                 signingCredentials: new SigningCredentials(authSigningKey, SecurityAlgorithms.HmacSha256)
             );
@@ -258,11 +259,11 @@ namespace LANCommander.Server.Services
             return token;
         }
 
-        public static async Task<List<Models.AuthenticationProvider>> GetAuthenticationProviderTemplatesAsync()
+        public static async Task<List<Settings.Models.AuthenticationProvider>> GetAuthenticationProviderTemplatesAsync()
         {
             var files = Directory.GetFiles(@"Templates/AuthenticationProviders", "*.yml", SearchOption.AllDirectories);
 
-            var externalProviders = new List<Models.AuthenticationProvider>();
+            var externalProviders = new List<Settings.Models.AuthenticationProvider>();
 
 
             var deserializer = new DeserializerBuilder()
@@ -275,7 +276,7 @@ namespace LANCommander.Server.Services
                 {
                     var contents = await File.ReadAllTextAsync(file);
 
-                    externalProviders.Add(deserializer.Deserialize<Models.AuthenticationProvider>(contents));
+                    externalProviders.Add(deserializer.Deserialize<Settings.Models.AuthenticationProvider>(contents));
                 }
                 catch { }
             }
diff --git a/LANCommander.Server.Services/CategoryService.cs b/LANCommander.Server.Services/CategoryService.cs
index 740203e1..e54d4581 100644
--- a/LANCommander.Server.Services/CategoryService.cs
+++ b/LANCommander.Server.Services/CategoryService.cs
@@ -10,10 +10,11 @@ namespace LANCommander.Server.Services
 {
     public sealed class CategoryService(
         ILogger<CategoryService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
-        IDbContextFactory<DatabaseContext> context) : BaseDatabaseService<Category>(logger, cache, mapper, httpContextAccessor, context)
+        IDbContextFactory<DatabaseContext> context) : BaseDatabaseService<Category>(logger, settingsProvider, cache, mapper, httpContextAccessor, context)
     {
         public override async Task<Category> AddAsync(Category entity)
         {
diff --git a/LANCommander.Server.Services/ChatMessageService.cs b/LANCommander.Server.Services/ChatMessageService.cs
index ab1a26b8..2f155db5 100644
--- a/LANCommander.Server.Services/ChatMessageService.cs
+++ b/LANCommander.Server.Services/ChatMessageService.cs
@@ -10,10 +10,11 @@ namespace LANCommander.Server.Services
 {
     public sealed class ChatMessageService(
         ILogger<ChatMessageService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
-        IDbContextFactory<DatabaseContext> context) : BaseDatabaseService<ChatMessage>(logger, cache, mapper, httpContextAccessor, context)
+        IDbContextFactory<DatabaseContext> context) : BaseDatabaseService<ChatMessage>(logger, settingsProvider, cache, mapper, httpContextAccessor, context)
     {
         public override async Task<ChatMessage> AddAsync(ChatMessage entity)
         {
diff --git a/LANCommander.Server.Services/ChatService.cs b/LANCommander.Server.Services/ChatService.cs
index 304a802f..1ce4cb51 100644
--- a/LANCommander.Server.Services/ChatService.cs
+++ b/LANCommander.Server.Services/ChatService.cs
@@ -8,11 +8,12 @@ namespace LANCommander.Server.Services
 {
     public sealed class ChatService(
         ILogger<ChatService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         ChatMessageService chatMessageService,
         ChatThreadService chatThreadService,
         ChatThreadReadStatusService chatThreadReadStatusService,
-        UserService userService) : BaseService(logger)
+        UserService userService) : BaseService(logger, settingsProvider)
     {
         private readonly ConcurrentDictionary<string, SemaphoreSlim> _locks = new();
         private readonly int _maxCachedMessages = 200;
diff --git a/LANCommander.Server.Services/ChatThreadReadStatusService.cs b/LANCommander.Server.Services/ChatThreadReadStatusService.cs
index 533f4828..67082457 100644
--- a/LANCommander.Server.Services/ChatThreadReadStatusService.cs
+++ b/LANCommander.Server.Services/ChatThreadReadStatusService.cs
@@ -1,11 +1,6 @@
-using AutoMapper;
-using LANCommander.Server.Data;
+using LANCommander.Server.Data;
 using LANCommander.Server.Data.Models;
-using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.ChangeTracking;
-using Microsoft.Extensions.Logging;
-using ZiggyCreatures.Caching.Fusion;
 
 namespace LANCommander.Server.Services
 {
diff --git a/LANCommander.Server.Services/ChatThreadService.cs b/LANCommander.Server.Services/ChatThreadService.cs
index 61402137..dcda4a4a 100644
--- a/LANCommander.Server.Services/ChatThreadService.cs
+++ b/LANCommander.Server.Services/ChatThreadService.cs
@@ -10,10 +10,11 @@ namespace LANCommander.Server.Services
 {
     public sealed class ChatThreadService(
         ILogger<ChatThreadService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
-        IDbContextFactory<DatabaseContext> context) : BaseDatabaseService<ChatThread>(logger, cache, mapper, httpContextAccessor, context)
+        IDbContextFactory<DatabaseContext> context) : BaseDatabaseService<ChatThread>(logger, settingsProvider, cache, mapper, httpContextAccessor, context)
     {
         public override async Task<ChatThread> AddAsync(ChatThread entity)
         {
diff --git a/LANCommander.Server.Services/CollectionService.cs b/LANCommander.Server.Services/CollectionService.cs
index b97023de..93d93d81 100644
--- a/LANCommander.Server.Services/CollectionService.cs
+++ b/LANCommander.Server.Services/CollectionService.cs
@@ -10,10 +10,11 @@ namespace LANCommander.Server.Services
 {
     public sealed class CollectionService(
         ILogger<CollectionService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
-        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<Collection>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<Collection>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public override async Task<Collection> AddAsync(Collection entity)
         {
diff --git a/LANCommander.Server.Services/CompanyService.cs b/LANCommander.Server.Services/CompanyService.cs
index afbc3257..cf2b54ea 100644
--- a/LANCommander.Server.Services/CompanyService.cs
+++ b/LANCommander.Server.Services/CompanyService.cs
@@ -10,10 +10,11 @@ namespace LANCommander.Server.Services
 {
     public sealed class CompanyService(
         ILogger<CompanyService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
-        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<Company>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<Company>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public override async Task<Company> AddAsync(Company entity)
         {
diff --git a/LANCommander.Server.Services/EngineService.cs b/LANCommander.Server.Services/EngineService.cs
index 6ebb1163..8bee6063 100644
--- a/LANCommander.Server.Services/EngineService.cs
+++ b/LANCommander.Server.Services/EngineService.cs
@@ -10,10 +10,11 @@ namespace LANCommander.Server.Services
 {
     public sealed class EngineService(
         ILogger<EngineService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
-        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<Engine>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<Engine>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public override async Task<Engine> AddAsync(Engine entity)
         {
diff --git a/LANCommander.Server.Services/Extensions/IServiceCollectionExtensions.cs b/LANCommander.Server.Services/Extensions/IServiceCollectionExtensions.cs
index 9e1a0b72..6f0f4bbc 100644
--- a/LANCommander.Server.Services/Extensions/IServiceCollectionExtensions.cs
+++ b/LANCommander.Server.Services/Extensions/IServiceCollectionExtensions.cs
@@ -1,21 +1,21 @@
 using LANCommander.SDK;
+using LANCommander.SDK.Interceptors;
 using LANCommander.SDK.Models;
 using LANCommander.Server.Services.Abstractions;
 using LANCommander.Server.Services.Factories;
+using LANCommander.Server.Services.Interceptors;
 using LANCommander.Server.Services.MediaGrabbers;
 using LANCommander.Server.Services.ServerEngines;
 using Microsoft.Extensions.DependencyInjection;
-using Settings = LANCommander.Server.Services.Models.Settings;
 
 namespace LANCommander.Server.Services.Extensions;
 
 public static class IServiceCollectionExtensions
 {
-    public static IServiceCollection AddLANCommanderServer(this IServiceCollection services, Settings settings)
+    public static IServiceCollection AddLANCommanderServer(this IServiceCollection services)
     {
         services.AddScoped<IGitHubService, GitHubService>();
         services.AddScoped<IdentityContextFactory>();
-        services.AddScoped<SettingService>();
         services.AddScoped<AuthenticationService>();
         services.AddScoped<ArchiveClient>();
         services.AddScoped<StorageLocationService>();
@@ -63,6 +63,7 @@ public static class IServiceCollectionExtensions
         services.AddSingleton<IServerEngine>(provider => provider.GetService<DockerServerEngine>());
         
         services.AddSingleton<IPXRelayService>();
+        services.AddSingleton<IBeaconMessageInterceptor, BeaconMessageInterceptor>();
 
         services.AddAutoMapper(cfg => { }, typeof(MappingProfile));
         services.AddFusionCache();
diff --git a/LANCommander.Server.Services/GameCustomFieldService.cs b/LANCommander.Server.Services/GameCustomFieldService.cs
index 7052bfce..6d38b357 100644
--- a/LANCommander.Server.Services/GameCustomFieldService.cs
+++ b/LANCommander.Server.Services/GameCustomFieldService.cs
@@ -2,8 +2,6 @@
 using LANCommander.Server.Data;
 using LANCommander.Server.Data.Models;
 using LANCommander.Server.Services.Extensions;
-using LANCommander.SDK;
-using LANCommander.SDK.Enums;
 using System.Linq.Expressions;
 using ZiggyCreatures.Caching.Fusion;
 using LANCommander.Server.Services.Models;
@@ -15,10 +13,11 @@ namespace LANCommander.Server.Services
 {
     public class GameCustomFieldService(
         ILogger<GameCustomFieldService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
-        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<GameCustomField>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<GameCustomField>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public override async Task<GameCustomField> AddAsync(GameCustomField entity)
         {
diff --git a/LANCommander.Server.Services/GameSaveService.cs b/LANCommander.Server.Services/GameSaveService.cs
index 05c051a9..684ddc7a 100644
--- a/LANCommander.Server.Services/GameSaveService.cs
+++ b/LANCommander.Server.Services/GameSaveService.cs
@@ -3,7 +3,6 @@ using LANCommander.Server.Data;
 using LANCommander.Server.Data.Models;
 using LANCommander.Helpers;
 using LANCommander.SDK.Enums;
-using LANCommander.Server.Models;
 using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
@@ -13,11 +12,12 @@ namespace LANCommander.Server.Services
 {
     public sealed class GameSaveService(
         ILogger<GameSaveService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
         IDbContextFactory<DatabaseContext> contextFactory,
-        StorageLocationService storageLocationService) : BaseDatabaseService<GameSave>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        StorageLocationService storageLocationService) : BaseDatabaseService<GameSave>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public override async Task<GameSave> AddAsync(GameSave entity)
         {
diff --git a/LANCommander.Server.Services/GameService.cs b/LANCommander.Server.Services/GameService.cs
index ee95a578..f304e3f3 100644
--- a/LANCommander.Server.Services/GameService.cs
+++ b/LANCommander.Server.Services/GameService.cs
@@ -6,7 +6,6 @@ using LANCommander.Server.Services.Extensions;
 using LANCommander.SDK;
 using LANCommander.SDK.Enums;
 using System.Linq.Expressions;
-using LANCommander.SDK.Services;
 using ZiggyCreatures.Caching.Fusion;
 using LANCommander.Server.Services.Models;
 using Microsoft.Extensions.Logging;
@@ -17,13 +16,14 @@ namespace LANCommander.Server.Services
 {
     public class GameService(
         ILogger<GameService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
         IDbContextFactory<DatabaseContext> contextFactory,
         ArchiveClient archiveClient,
         MediaService mediaService,
-        SDK.Services.ScriptClient scriptClient) : BaseDatabaseService<Game>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        SDK.Services.ScriptClient scriptClient) : BaseDatabaseService<Game>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public override async Task<Game> AddAsync(Game entity)
         {
diff --git a/LANCommander.Server.Services/GenreService.cs b/LANCommander.Server.Services/GenreService.cs
index 9dc00716..7753ddc9 100644
--- a/LANCommander.Server.Services/GenreService.cs
+++ b/LANCommander.Server.Services/GenreService.cs
@@ -10,10 +10,11 @@ namespace LANCommander.Server.Services
 {
     public sealed class GenreService(
         ILogger<GenreService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
-        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<Genre>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<Genre>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public override async Task<Genre> AddAsync(Genre entity)
         {
diff --git a/LANCommander.Server.Services/GitHubService.cs b/LANCommander.Server.Services/GitHubService.cs
index cd0ac0e5..43d26a37 100644
--- a/LANCommander.Server.Services/GitHubService.cs
+++ b/LANCommander.Server.Services/GitHubService.cs
@@ -1,5 +1,6 @@
 using LANCommander.Server.Services.Abstractions;
 using LANCommander.Server.Services.Models;
+using LANCommander.Server.Settings.Enums;
 using Microsoft.Extensions.Logging;
 using Octokit;
 using Semver;
diff --git a/LANCommander.Server.Services/IGDBService.cs b/LANCommander.Server.Services/IGDBService.cs
index 3a81dd2d..ea90acb1 100644
--- a/LANCommander.Server.Services/IGDBService.cs
+++ b/LANCommander.Server.Services/IGDBService.cs
@@ -11,11 +11,12 @@ namespace LANCommander.Server.Services
 {
     public class IGDBService(
         ILogger<IGDBService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         GameService gameService,
         EngineService engineService,
         CompanyService companyService,
         GenreService genreService,
-        TagService tagService) : BaseService(logger), IDisposable
+        TagService tagService) : BaseService(logger, settingsProvider), IDisposable
     {
         private const string DefaultFields = "*";
         private IGDBClient Client;
@@ -32,8 +33,8 @@ namespace LANCommander.Server.Services
 
         public void Authenticate()
         {
-            ClientId = _settings.IGDBClientId;
-            ClientSecret = _settings.IGDBClientSecret;
+            ClientId = _settingsProvider.CurrentValue.Server.IGDB.ClientId;
+            ClientSecret = _settingsProvider.CurrentValue.Server.IGDB.ClientSecret;
 
             try
             {
diff --git a/LANCommander.Server.Services/IPXRelayService.cs b/LANCommander.Server.Services/IPXRelayService.cs
index 7c2be849..a0df7d67 100644
--- a/LANCommander.Server.Services/IPXRelayService.cs
+++ b/LANCommander.Server.Services/IPXRelayService.cs
@@ -9,23 +9,21 @@ namespace LANCommander.Server.Services
         private Task? _relayTask;
         private IPXRelay? _relay;
 
-        public IPXRelayService(ILogger<IPXRelayService> logger) : base(logger)
+        public IPXRelayService(ILogger<IPXRelayService> logger, SettingsProvider<Settings.Settings> settingsProvider) : base(logger, settingsProvider)
         {
             Init(logger);
         }
 
         public void Init(ILogger logger)
         {
-            var settings = SettingService.GetSettings();
-
             StopAsync().Wait();
 
-            _relay = new IPXRelay(settings.IPXRelay.Port, logger);
+            _relay = new IPXRelay(_settingsProvider.CurrentValue.Server.IPXRelay.Port, logger);
 
-            if (!settings.IPXRelay.Logging)
+            if (!_settingsProvider.CurrentValue.Server.IPXRelay.Logging)
                 _relay.DisableLogging();
 
-            if (settings.IPXRelay.Enabled)
+            if (_settingsProvider.CurrentValue.Server.IPXRelay.Enabled)
             {
                 _relayCts = new CancellationTokenSource();
                 _relayTask = Task.Run(async () =>
diff --git a/LANCommander.Server/Interceptors/BeaconMessageInterceptor.cs b/LANCommander.Server.Services/Interceptors/BeaconMessageInterceptor.cs
similarity index 54%
rename from LANCommander.Server/Interceptors/BeaconMessageInterceptor.cs
rename to LANCommander.Server.Services/Interceptors/BeaconMessageInterceptor.cs
index 37187354..b3ccecd1 100644
--- a/LANCommander.Server/Interceptors/BeaconMessageInterceptor.cs
+++ b/LANCommander.Server.Services/Interceptors/BeaconMessageInterceptor.cs
@@ -1,22 +1,19 @@
 using System.Net;
 using LANCommander.SDK.Interceptors;
 using LANCommander.SDK.Models;
-using LANCommander.Server.Services;
 
-namespace LANCommander.Server.Interceptors;
+namespace LANCommander.Server.Services.Interceptors;
 
-public class BeaconMessageInterceptor : IBeaconMessageInterceptor
+public class BeaconMessageInterceptor(SettingsProvider<Settings.Settings> settingsProvider) : IBeaconMessageInterceptor
 {
     public async Task<BeaconMessage> ExecuteAsync(BeaconMessage message, IPEndPoint interfaceEndPoint)
     {
         if (String.IsNullOrWhiteSpace(message.Address))
         {
-            var settings = SettingService.GetSettings();
-
-            if (settings.UseSSL)
-                message.Address = $"https://{interfaceEndPoint.Address.ToString()}:{settings.SSLPort}";
+            if (settingsProvider.CurrentValue.Server.Http.UseSSL)
+                message.Address = $"https://{interfaceEndPoint.Address.ToString()}:{settingsProvider.CurrentValue.Server.Http.SSLPort}";
             else
-                message.Address = $"http://{interfaceEndPoint.Address.ToString()}:{settings.Port}";
+                message.Address = $"http://{interfaceEndPoint.Address.ToString()}:{settingsProvider.CurrentValue.Server.Http.Port}";
         }
 
         return message;
diff --git a/LANCommander.Server.Services/IssueService.cs b/LANCommander.Server.Services/IssueService.cs
index 53d1e865..a032119e 100644
--- a/LANCommander.Server.Services/IssueService.cs
+++ b/LANCommander.Server.Services/IssueService.cs
@@ -1,4 +1,5 @@
-using LANCommander.Server.Data;
+using System.Configuration;
+using LANCommander.Server.Data;
 using LANCommander.Server.Data.Models;
 using AutoMapper;
 using Microsoft.AspNetCore.Http;
@@ -10,10 +11,11 @@ namespace LANCommander.Server.Services
 {
     public sealed class IssueService(
         ILogger<IssueService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
-        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<Issue>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<Issue>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public override async Task<Issue> AddAsync(Issue entity)
         {
diff --git a/LANCommander.Server.Services/KeyService.cs b/LANCommander.Server.Services/KeyService.cs
index df36018c..4df16807 100644
--- a/LANCommander.Server.Services/KeyService.cs
+++ b/LANCommander.Server.Services/KeyService.cs
@@ -11,10 +11,11 @@ namespace LANCommander.Server.Services
 {
     public sealed class KeyService(
         ILogger<KeyService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
-        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<Key>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<Key>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public override async Task<Key> AddAsync(Key entity)
         {
diff --git a/LANCommander.Server.Services/LANCommander.Server.Services.csproj b/LANCommander.Server.Services/LANCommander.Server.Services.csproj
index 7781d811..4cd6a32e 100644
--- a/LANCommander.Server.Services/LANCommander.Server.Services.csproj
+++ b/LANCommander.Server.Services/LANCommander.Server.Services.csproj
@@ -29,6 +29,7 @@
   <ItemGroup>
     <ProjectReference Include="..\LANCommander.SDK\LANCommander.SDK.csproj" />
     <ProjectReference Include="..\LANCommander.Server.Data\LANCommander.Server.Data.csproj" />
+    <ProjectReference Include="..\LANCommander.Server.Settings\LANCommander.Server.Settings.csproj" />
     <ProjectReference Include="..\LANCommander.Steam\LANCommander.Steam.csproj" />
   </ItemGroup>
 
diff --git a/LANCommander.Server.Services/LibraryService.cs b/LANCommander.Server.Services/LibraryService.cs
index f436a70e..e2248732 100644
--- a/LANCommander.Server.Services/LibraryService.cs
+++ b/LANCommander.Server.Services/LibraryService.cs
@@ -1,4 +1,5 @@
-using LANCommander.Server.Data;
+using System.Configuration;
+using LANCommander.Server.Data;
 using LANCommander.Server.Data.Models;
 using Microsoft.Extensions.Logging;
 using AutoMapper;
@@ -11,12 +12,13 @@ namespace LANCommander.Server.Services
 {
     public sealed class LibraryService(
         ILogger<LibraryService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
         IDbContextFactory<DatabaseContext> contextFactory,
         GameService gameService,
-        UserService userService) : BaseDatabaseService<Library>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        UserService userService) : BaseDatabaseService<Library>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public override async Task<Library> AddAsync(Library entity)
         {
diff --git a/LANCommander.Server.Services/Mappers/MappingProfile.cs b/LANCommander.Server.Services/Mappers/MappingProfile.cs
index 72306f71..17c92d60 100644
--- a/LANCommander.Server.Services/Mappers/MappingProfile.cs
+++ b/LANCommander.Server.Services/Mappers/MappingProfile.cs
@@ -53,7 +53,7 @@ namespace LANCommander.Server
                     dest.Cover,
                     opt => opt.MapFrom(src => src.Media.Where(m => m.Type == SDK.Enums.MediaType.Cover).FirstOrDefault()));
 
-            CreateMap<Services.Models.AuthenticationProvider, SDK.Models.AuthenticationProvider>();
+            CreateMap<Settings.Models.AuthenticationProvider, SDK.Models.AuthenticationProvider>();
 
             CreateMap<Data.Models.Game, EntityReference>()
                 .ForMember(dest => dest.Name,
diff --git a/LANCommander.Server.Services/MediaGrabbers/SteamGridDBMediaGrabber.cs b/LANCommander.Server.Services/MediaGrabbers/SteamGridDBMediaGrabber.cs
index 82788610..9d2fc82c 100644
--- a/LANCommander.Server.Services/MediaGrabbers/SteamGridDBMediaGrabber.cs
+++ b/LANCommander.Server.Services/MediaGrabbers/SteamGridDBMediaGrabber.cs
@@ -20,11 +20,9 @@ namespace LANCommander.Server.Services.MediaGrabbers
             SteamGridDbFormats.Webp
         };
 
-        public SteamGridDBMediaGrabber()
+        public SteamGridDBMediaGrabber(SettingsProvider<Settings.Settings> settingsProvider)
         {
-            var settings = SettingService.GetSettings();
-
-            SteamGridDb = new SteamGridDb(settings.Media.SteamGridDbApiKey);
+            SteamGridDb = new SteamGridDb(settingsProvider.CurrentValue.Server.Media.SteamGridDbApiKey);
             SteamClient = new SteamClient();
         }
 
diff --git a/LANCommander.Server.Services/MediaService.cs b/LANCommander.Server.Services/MediaService.cs
index bcace099..2c4f0362 100644
--- a/LANCommander.Server.Services/MediaService.cs
+++ b/LANCommander.Server.Services/MediaService.cs
@@ -1,4 +1,5 @@
-using LANCommander.Server.Data;
+using System.Configuration;
+using LANCommander.Server.Data;
 using LANCommander.Server.Data.Models;
 using LANCommander.Helpers;
 using Syncfusion.PdfToImageConverter;
@@ -20,11 +21,12 @@ namespace LANCommander.Server.Services
 {
     public sealed class MediaService(
         ILogger<MediaService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
         IDbContextFactory<DatabaseContext> contextFactory,
-        StorageLocationService storageLocationService) : BaseDatabaseService<Media>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        StorageLocationService storageLocationService) : BaseDatabaseService<Media>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public override async Task<Media> AddAsync(Media entity)
         {
@@ -118,7 +120,7 @@ namespace LANCommander.Server.Services
 
         public string GetThumbnailPath(Media media)
         {
-            var config = _settings.Media.GetMediaTypeConfig(media.Type);
+            var config = _settingsProvider.CurrentValue.Server.Media.GetMediaTypeConfig(media.Type);
             
             if (config != null && config.Thumbnails.Enabled)
                 return $"{GetMediaPath(media)}.Thumb";
@@ -175,7 +177,7 @@ namespace LANCommander.Server.Services
             if (!File.Exists(source))
                 return String.Empty;
 
-            var config = _settings.Media.GetMediaTypeConfig(media.Type);
+            var config = _settingsProvider.CurrentValue.Server.Media.GetMediaTypeConfig(media.Type);
 
             Stream stream = null;
 
diff --git a/LANCommander.Server.Services/MultiplayerModeService.cs b/LANCommander.Server.Services/MultiplayerModeService.cs
index 40605461..c8552b6c 100644
--- a/LANCommander.Server.Services/MultiplayerModeService.cs
+++ b/LANCommander.Server.Services/MultiplayerModeService.cs
@@ -10,10 +10,11 @@ namespace LANCommander.Server.Services
 {
     public sealed class MultiplayerModeService(
         ILogger<MultiplayerModeService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
-        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<MultiplayerMode>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<MultiplayerMode>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public override async Task<MultiplayerMode> AddAsync(MultiplayerMode entity)
         {
diff --git a/LANCommander.Server.Services/PageService.cs b/LANCommander.Server.Services/PageService.cs
index a2745c93..206bd417 100644
--- a/LANCommander.Server.Services/PageService.cs
+++ b/LANCommander.Server.Services/PageService.cs
@@ -15,10 +15,11 @@ namespace LANCommander.Server.Services
 {
     public sealed class PageService(
         ILogger<PageService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
-        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<Page>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<Page>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public override async Task<Page> AddAsync(Page entity)
         {
diff --git a/LANCommander.Server.Services/PlatformService.cs b/LANCommander.Server.Services/PlatformService.cs
index da7c4d45..6e7e90c3 100644
--- a/LANCommander.Server.Services/PlatformService.cs
+++ b/LANCommander.Server.Services/PlatformService.cs
@@ -10,10 +10,11 @@ namespace LANCommander.Server.Services
 {
     public sealed class PlatformService(
         ILogger<PlatformService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
-        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<Platform>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<Platform>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public override async Task<Platform> AddAsync(Platform entity)
         {
diff --git a/LANCommander.Server.Services/PlaySessionService.cs b/LANCommander.Server.Services/PlaySessionService.cs
index 4229eceb..4cabeee6 100644
--- a/LANCommander.Server.Services/PlaySessionService.cs
+++ b/LANCommander.Server.Services/PlaySessionService.cs
@@ -11,11 +11,12 @@ namespace LANCommander.Server.Services
 {
     public sealed class PlaySessionService(
         ILogger<PlaySessionService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
         IDbContextFactory<DatabaseContext> contextFactory,
-        ServerService serverService) : BaseDatabaseService<PlaySession>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        ServerService serverService) : BaseDatabaseService<PlaySession>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public override async Task<PlaySession> AddAsync(PlaySession entity)
         {
diff --git a/LANCommander.Server.Services/RedistributableService.cs b/LANCommander.Server.Services/RedistributableService.cs
index 810d11c3..7c94f237 100644
--- a/LANCommander.Server.Services/RedistributableService.cs
+++ b/LANCommander.Server.Services/RedistributableService.cs
@@ -11,10 +11,11 @@ namespace LANCommander.Server.Services
 {
     public sealed class RedistributableService(
         ILogger<SDK.Services.RedistributableClient> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
-        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<Redistributable>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<Redistributable>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public override async Task<Redistributable> AddAsync(Redistributable entity)
         {
diff --git a/LANCommander.Server.Services/RoleService.cs b/LANCommander.Server.Services/RoleService.cs
index 8f36f666..b824d9c2 100644
--- a/LANCommander.Server.Services/RoleService.cs
+++ b/LANCommander.Server.Services/RoleService.cs
@@ -14,13 +14,14 @@ namespace LANCommander.Server.Services
 {
     public sealed class RoleService(
         ILogger<RoleService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
         IDbContextFactory<DatabaseContext> contextFactory,
         CollectionService collectionService,
         IdentityContextFactory identityContextFactory,
-        RoleManager<Role> roleManager) : BaseDatabaseService<Role>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        RoleManager<Role> roleManager) : BaseDatabaseService<Role>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public const string AdministratorRoleName = "Administrator";
 
diff --git a/LANCommander.Server.Services/SavePathService.cs b/LANCommander.Server.Services/SavePathService.cs
index 33069b57..7d9f652b 100644
--- a/LANCommander.Server.Services/SavePathService.cs
+++ b/LANCommander.Server.Services/SavePathService.cs
@@ -10,10 +10,11 @@ namespace LANCommander.Server.Services
 {
     public sealed class SavePathService(
         ILogger<SavePathService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
-        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<SavePath>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<SavePath>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public override async Task<SavePath> AddAsync(SavePath entity)
         {
diff --git a/LANCommander.Server.Services/ScriptService.cs b/LANCommander.Server.Services/ScriptService.cs
index 59abfdfc..99272d3c 100644
--- a/LANCommander.Server.Services/ScriptService.cs
+++ b/LANCommander.Server.Services/ScriptService.cs
@@ -13,10 +13,11 @@ namespace LANCommander.Server.Services
 {
     public sealed class ScriptService(
         ILogger<ScriptService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
-        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<Script>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<Script>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public override async Task<Script> AddAsync(Script script)
         {
diff --git a/LANCommander.Server.Services/ServerEngines/DockerServerEngine.cs b/LANCommander.Server.Services/ServerEngines/DockerServerEngine.cs
index 683c7dd5..73f0255d 100644
--- a/LANCommander.Server.Services/ServerEngines/DockerServerEngine.cs
+++ b/LANCommander.Server.Services/ServerEngines/DockerServerEngine.cs
@@ -9,6 +9,8 @@ using LANCommander.Server.Data.Enums;
 using LANCommander.Server.Services.Abstractions;
 using LANCommander.Server.Services.Enums;
 using LANCommander.Server.Services.Models;
+using LANCommander.Server.Settings.Enums;
+using LANCommander.Server.Settings.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -18,6 +20,7 @@ namespace LANCommander.Server.Services.ServerEngines;
 
 public class DockerServerEngine(
     ILogger<DockerServerEngine> logger,
+    SettingsProvider<Settings.Settings> settingsProvider,
     IServiceProvider serviceProvider,
     IMapper mapper,
     IOptions<SDK.Models.Settings> settings) : IServerEngine
@@ -30,9 +33,7 @@ public class DockerServerEngine(
 
     public async Task InitializeAsync()
     {
-        var settings = SettingService.GetSettings();
-
-        foreach (var serverEngineConfig in settings.Servers.ServerEngines.Where(se => se.Type == ServerEngine.Docker))
+        foreach (var serverEngineConfig in settingsProvider.CurrentValue.Server.GameServers.ServerEngines.Where(se => se.Type == ServerEngine.Docker))
         {
             if (serverEngineConfig != null && !String.IsNullOrWhiteSpace(serverEngineConfig.Address) && Uri.TryCreate(serverEngineConfig.Address, UriKind.Absolute, out var hostAddress))
                 _dockerClients[serverEngineConfig.Id] = new DockerClientConfiguration(hostAddress).CreateClient();
@@ -118,7 +119,7 @@ public class DockerServerEngine(
 
                 logger?.LogInformation("Executing script \"{ScriptName}\"", serverScript.Name);
 
-                if (settings.Value.Debug.EnableScriptDebugging)
+                if (settingsProvider.CurrentValue.Debug.EnableScriptDebugging)
                     script.EnableDebug();
 
                 await script.ExecuteAsync<int>();
@@ -171,7 +172,7 @@ public class DockerServerEngine(
 
                     logger?.LogInformation("Executing script \"{ScriptName}\"", serverScript.Name);
 
-                    if (settings.Value.Debug.EnableScriptDebugging)
+                    if (settingsProvider.CurrentValue.Debug.EnableScriptDebugging)
                         script.EnableDebug();
 
                     await script.ExecuteAsync<int>();
diff --git a/LANCommander.Server.Services/ServerEngines/LocalServerEngine.cs b/LANCommander.Server.Services/ServerEngines/LocalServerEngine.cs
index b0ef7b58..ad63e2b9 100644
--- a/LANCommander.Server.Services/ServerEngines/LocalServerEngine.cs
+++ b/LANCommander.Server.Services/ServerEngines/LocalServerEngine.cs
@@ -10,6 +10,7 @@ using LANCommander.Server.Services.Abstractions;
 using LANCommander.Server.Services.Enums;
 using LANCommander.Server.Services.Models;
 using LANCommander.Server.Services.Utilities;
+using LANCommander.Server.Settings.Enums;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
diff --git a/LANCommander.Server.Services/ServerHttpPathService.cs b/LANCommander.Server.Services/ServerHttpPathService.cs
index a6dd92d3..221de232 100644
--- a/LANCommander.Server.Services/ServerHttpPathService.cs
+++ b/LANCommander.Server.Services/ServerHttpPathService.cs
@@ -14,10 +14,11 @@ namespace LANCommander.Server.Services
 {
     public sealed class ServerHttpPathService(
         ILogger<ServerHttpPathService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
-        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<ServerHttpPath>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<ServerHttpPath>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public override async Task<ServerHttpPath> AddAsync(ServerHttpPath entity)
         {
diff --git a/LANCommander.Server.Services/ServerLogService.cs b/LANCommander.Server.Services/ServerLogService.cs
index 5b6896d8..d5e450d9 100644
--- a/LANCommander.Server.Services/ServerLogService.cs
+++ b/LANCommander.Server.Services/ServerLogService.cs
@@ -12,10 +12,11 @@ namespace LANCommander.Server.Services
 {
     public sealed class ServerConsoleService(
         ILogger<ServerConsoleService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
-        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<ServerConsole>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<ServerConsole>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public override async Task<ServerConsole> AddAsync(ServerConsole entity)
         {
diff --git a/LANCommander.Server.Services/ServerService.cs b/LANCommander.Server.Services/ServerService.cs
index 08552140..e91e06c2 100644
--- a/LANCommander.Server.Services/ServerService.cs
+++ b/LANCommander.Server.Services/ServerService.cs
@@ -16,12 +16,13 @@ namespace LANCommander.Server.Services
 {
     public sealed class ServerService(
         ILogger<ServerService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
         IDbContextFactory<DatabaseContext> contextFactory,
         IServiceProvider serviceProvider,
-        UserService userService) : BaseDatabaseService<Data.Models.Server>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        UserService userService) : BaseDatabaseService<Data.Models.Server>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public override async Task<Data.Models.Server> AddAsync(Data.Models.Server entity)
         {
diff --git a/LANCommander.Server.Services/SettingService.cs b/LANCommander.Server.Services/SettingService.cs
deleted file mode 100644
index 15d3ba81..00000000
--- a/LANCommander.Server.Services/SettingService.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using LANCommander.SDK.Factories;
-using LANCommander.Server.Models;
-using LANCommander.Server.Services.Factories;
-using Microsoft.Extensions.DependencyInjection;
-using YamlDotNet.Serialization;
-using YamlDotNet.Serialization.NamingConventions;
-
-namespace LANCommander.Server.Services
-{
-    public class SettingService
-    {
-        public static string WorkingDirectory { get; set; } = "";
-        private const string FileName = "Settings.Server.yml";
-
-        public static string SettingsFile
-        {
-            get
-            {
-                if (!string.IsNullOrWhiteSpace(WorkingDirectory))
-                    return Path.Combine(WorkingDirectory, FileName);
-                else
-                    return FileName;
-            }
-        }
-
-        private static Models.Settings Settings { get; set; }
-
-        public static Models.Settings LoadSettings()
-        {
-            if (File.Exists(SettingsFile))
-            {
-                var contents = File.ReadAllText(SettingsFile);
-
-                var deserializer = new DeserializerBuilder()
-                    .IgnoreUnmatchedProperties()
-                    .WithNamingConvention(PascalCaseNamingConvention.Instance)
-                    .Build();
-
-                Settings = deserializer.Deserialize<Models.Settings>(contents);
-            }
-            else
-            {
-                Settings = new Models.Settings();
-
-                SaveSettings(Settings);
-            }
-
-            return Settings;
-        }
-
-        public static void WriteSettings(Models.Settings settings)
-        {
-            if (settings == null)
-                return;
-
-            var serializer = YamlSerializerFactory.Create();
-
-            File.WriteAllText(SettingsFile, serializer.Serialize(settings));
-        }
-
-        public static Models.Settings GetSettings(bool forceLoad = false)
-        {
-            if (Settings == null || forceLoad)
-                Settings = LoadSettings();
-
-            return Settings;
-        }
-
-        public static void SaveSettings(Models.Settings settings, IServiceProvider? serviceProvider = null)
-        {
-            WriteSettings(settings);
-            Settings = settings;
-
-            ReloadSettings(settings, serviceProvider);
-        }
-
-        private static void ReloadSettings(Models.Settings settings, IServiceProvider? serviceProvider)
-        {
-            if (serviceProvider == null || settings == null)
-                return;
-
-            if (serviceProvider.GetService<UserService>() is var service)
-            {
-                service!.Reconfigure(settings);
-            }
-        }
-    }
-}
diff --git a/LANCommander.Server.Services/SetupService.cs b/LANCommander.Server.Services/SetupService.cs
index 840a5435..de55d5ca 100644
--- a/LANCommander.Server.Services/SetupService.cs
+++ b/LANCommander.Server.Services/SetupService.cs
@@ -2,6 +2,7 @@
 using LANCommander.Server.Data;
 using LANCommander.Server.Data.Enums;
 using LANCommander.Server.Data.Models;
+using LANCommander.Server.Settings.Enums;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
@@ -14,8 +15,9 @@ namespace LANCommander.Server.Services
 {
     public class SetupService(
         ILogger<SetupService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         UserManager<User> userManager,
-        IServiceProvider serviceProvider) : BaseService(logger), IDisposable
+        IServiceProvider serviceProvider) : BaseService(logger, settingsProvider), IDisposable
     {
         public async Task<bool> IsSetupInitialized()
         {
diff --git a/LANCommander.Server.Services/SteamCMDService.cs b/LANCommander.Server.Services/SteamCMDService.cs
index 2845b9ba..30b4f4bf 100644
--- a/LANCommander.Server.Services/SteamCMDService.cs
+++ b/LANCommander.Server.Services/SteamCMDService.cs
@@ -6,20 +6,21 @@ using System.Text;
 namespace LANCommander.Server.Services;
 
 public class SteamCMDService(
-    ILogger<SteamCMDService> logger) : BaseService(logger)
+    ILogger<SteamCMDService> logger,
+    SettingsProvider<Settings.Settings> settingsProvider) : BaseService(logger, settingsProvider)
 {
     public async Task<SteamCmdConnectionStatus> GetConnectionStatusAsync(string username)
     {
         try
         {
             // Auto-populate SteamCMD path if not configured
-            if (String.IsNullOrWhiteSpace(_settings.SteamCMD.Path))
+            if (String.IsNullOrWhiteSpace(_settingsProvider.CurrentValue.Server.SteamCMD.Path))
             {
                 var detectedPath = await AutoDetectSteamCmdPathAsync();
                 
                 if (!String.IsNullOrWhiteSpace(detectedPath))
                 {
-                    _settings.SteamCMD.Path = detectedPath;
+                    _settingsProvider.CurrentValue.Server.SteamCMD.Path = detectedPath;
                     _logger.LogInformation("Auto-detected SteamCMD at: {Path}", detectedPath);
                 }
                 else
@@ -29,9 +30,9 @@ public class SteamCMDService(
                 }
             }
 
-            if (!File.Exists(_settings.SteamCMD.Path))
+            if (!File.Exists(_settingsProvider.CurrentValue.Server.SteamCMD.Path))
             {
-                _logger.LogWarning("SteamCMD executable not found at configured path: {Path}", _settings.SteamCMD.Path);
+                _logger.LogWarning("SteamCMD executable not found at configured path: {Path}", _settingsProvider.CurrentValue.Server.SteamCMD.Path);
                 return SteamCmdConnectionStatus.NotInstalled;
             }
 
@@ -164,15 +165,15 @@ public class SteamCMDService(
     {
         try
         {
-            if (string.IsNullOrWhiteSpace(_settings.SteamCMD.Path))
+            if (string.IsNullOrWhiteSpace(_settingsProvider.CurrentValue.Server.SteamCMD.Path))
             {
                 _logger.LogError("SteamCMD path is not configured");
                 return false;
             }
 
-            if (!File.Exists(_settings.SteamCMD.Path))
+            if (!File.Exists(_settingsProvider.CurrentValue.Server.SteamCMD.Path))
             {
-                _logger.LogError("SteamCMD executable not found at configured path: {Path}", _settings.SteamCMD.Path);
+                _logger.LogError("SteamCMD executable not found at configured path: {Path}", _settingsProvider.CurrentValue.Server.SteamCMD.Path);
                 return false;
             }
 
@@ -204,15 +205,15 @@ public class SteamCMDService(
     {
         try
         {
-            if (string.IsNullOrWhiteSpace(_settings.SteamCMD.Path))
+            if (string.IsNullOrWhiteSpace(_settingsProvider.CurrentValue.Server.SteamCMD.Path))
             {
                 _logger.LogError("SteamCMD path is not configured");
                 return false;
             }
 
-            if (!File.Exists(_settings.SteamCMD.Path))
+            if (!File.Exists(_settingsProvider.CurrentValue.Server.SteamCMD.Path))
             {
-                _logger.LogError("SteamCMD executable not found at configured path: {Path}", _settings.SteamCMD.Path);
+                _logger.LogError("SteamCMD executable not found at configured path: {Path}", _settingsProvider.CurrentValue.Server.SteamCMD.Path);
                 return false;
             }
 
@@ -242,15 +243,15 @@ public class SteamCMDService(
     {
         try
         {
-            if (string.IsNullOrWhiteSpace(_settings.SteamCMD.Path))
+            if (string.IsNullOrWhiteSpace(_settingsProvider.CurrentValue.Server.SteamCMD.Path))
             {
                 _logger.LogError("SteamCMD path is not configured");
                 return false;
             }
 
-            if (!File.Exists(_settings.SteamCMD.Path))
+            if (!File.Exists(_settingsProvider.CurrentValue.Server.SteamCMD.Path))
             {
-                _logger.LogError("SteamCMD executable not found at configured path: {Path}", _settings.SteamCMD.Path);
+                _logger.LogError("SteamCMD executable not found at configured path: {Path}", _settingsProvider.CurrentValue.Server.SteamCMD.Path);
                 return false;
             }
 
@@ -330,7 +331,7 @@ public class SteamCMDService(
     {
         try
         {
-            var executablePath = String.IsNullOrWhiteSpace(steamCmdPath) ? _settings.SteamCMD.Path : steamCmdPath;
+            var executablePath = String.IsNullOrWhiteSpace(steamCmdPath) ? _settingsProvider.CurrentValue.Server.SteamCMD.Path : steamCmdPath;
             
             var processStartInfo = new ProcessStartInfo
             {
diff --git a/LANCommander.Server.Services/StorageLocationService.cs b/LANCommander.Server.Services/StorageLocationService.cs
index 635ce5c1..581e1134 100644
--- a/LANCommander.Server.Services/StorageLocationService.cs
+++ b/LANCommander.Server.Services/StorageLocationService.cs
@@ -10,10 +10,11 @@ namespace LANCommander.Server.Services
 {
     public sealed class StorageLocationService(
         ILogger<StorageLocationService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
-        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<StorageLocation>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<StorageLocation>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public override async Task<StorageLocation> AddAsync(StorageLocation entity)
         {
diff --git a/LANCommander.Server.Services/TagService.cs b/LANCommander.Server.Services/TagService.cs
index 79badafa..720c4389 100644
--- a/LANCommander.Server.Services/TagService.cs
+++ b/LANCommander.Server.Services/TagService.cs
@@ -10,10 +10,11 @@ namespace LANCommander.Server.Services
 {
     public sealed class TagService(
         ILogger<TagService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
-        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<Tag>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<Tag>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public override async Task<Tag> AddAsync(Tag entity)
         {
diff --git a/LANCommander.Server.Services/UpdateService.cs b/LANCommander.Server.Services/UpdateService.cs
index 0e8073f1..b0841421 100644
--- a/LANCommander.Server.Services/UpdateService.cs
+++ b/LANCommander.Server.Services/UpdateService.cs
@@ -12,6 +12,7 @@ using LANCommander.Server.Services.Abstractions;
 using LANCommander.Server.Services.Enums;
 using LANCommander.Server.Services.Exceptions;
 using LANCommander.Server.Services.Models;
+using LANCommander.Server.Settings.Enums;
 using Microsoft.Extensions.DependencyInjection;
 using ZiggyCreatures.Caching.Fusion;
 
@@ -19,11 +20,12 @@ namespace LANCommander.Server.Services
 {
     public sealed class UpdateService(
         ILogger<UpdateService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IHostApplicationLifetime applicationLifetime,
         IServiceProvider serviceProvider,
         IVersionProvider versionProvider,
         IGitHubService gitHubService,
-        ServerService serverService) : BaseService(logger)
+        ServerService serverService) : BaseService(logger, settingsProvider)
     {
         public const string ArtifactUrlBase = "/download/Launcher/";
 
@@ -31,12 +33,12 @@ namespace LANCommander.Server.Services
         {
             List<LauncherArtifact> launchers = [];
 
-            if (_settings.Launcher.HostUpdates)
+            if (_settingsProvider.CurrentValue.Server.Launcher.HostUpdates)
             {
                 launchers.AddRange(GetLauncherArtifactsFromLocalFiles());
             }
 
-            if (launchers.Count == 0 || _settings.Launcher.IncludeOnlineUpdates)
+            if (launchers.Count == 0 || _settingsProvider.CurrentValue.Server.Launcher.IncludeOnlineUpdates)
             {
                 var githubLaunchers = await GetLauncherArtifactsFromGitHubAsync().ToListAsync();
                 launchers.AddRange(githubLaunchers);
@@ -48,8 +50,8 @@ namespace LANCommander.Server.Services
         public IEnumerable<LauncherArtifact> GetLauncherArtifactsFromLocalFiles()
         {
             var currentVersion = versionProvider.GetCurrentVersion();
-            var downloadedLaunchers = Directory.GetFiles(_settings.Launcher.StoragePath, $"LANCommander.Launcher*v{currentVersion.WithoutMetadata()}.*");
-            var downloadedInstallers = Directory.GetFiles(_settings.Launcher.StoragePath, $"LANCommander.Launcher-{currentVersion.WithoutMetadata()}*Setup*.*");
+            var downloadedLaunchers = Directory.GetFiles(_settingsProvider.CurrentValue.Server.Launcher.StoragePath, $"LANCommander.Launcher*v{currentVersion.WithoutMetadata()}.*");
+            var downloadedInstallers = Directory.GetFiles(_settingsProvider.CurrentValue.Server.Launcher.StoragePath, $"LANCommander.Launcher-{currentVersion.WithoutMetadata()}*Setup*.*");
 
             var downloads = downloadedLaunchers.Concat(downloadedInstallers).Distinct();
 
@@ -61,21 +63,21 @@ namespace LANCommander.Server.Services
         {
             var currentVersion = versionProvider.GetCurrentVersion();
             
-            if (!String.IsNullOrWhiteSpace(_settings.Launcher.VersionOverride))
-                currentVersion = SemVersion.Parse(_settings.Launcher.VersionOverride, SemVersionStyles.AllowV);
+            if (!String.IsNullOrWhiteSpace(_settingsProvider.CurrentValue.Server.Launcher.VersionOverride))
+                currentVersion = SemVersion.Parse(_settingsProvider.CurrentValue.Server.Launcher.VersionOverride, SemVersionStyles.AllowV);
 
             var releaseChannel = versionProvider.GetReleaseChannel(currentVersion);
             
-            if (releaseChannel != _settings.Update.ReleaseChannel)
-                releaseChannel = _settings.Update.ReleaseChannel;
+            if (releaseChannel != _settingsProvider.CurrentValue.Server.Update.ReleaseChannel)
+                releaseChannel = _settingsProvider.CurrentValue.Server.Update.ReleaseChannel;
             
             var tag = $"v{currentVersion.WithoutMetadata()}";
 
             if (releaseChannel == ReleaseChannel.Nightly)
                 tag = "nightly";
             
-            if (!String.IsNullOrWhiteSpace(_settings.Launcher.VersionOverride))
-                tag = _settings.Launcher.VersionOverride;
+            if (!String.IsNullOrWhiteSpace(_settingsProvider.CurrentValue.Server.Launcher.VersionOverride))
+                tag = _settingsProvider.CurrentValue.Server.Launcher.VersionOverride;
             
             logger.LogInformation($"Searching for artifacts for v{currentVersion.WithoutMetadata()}");
 
@@ -127,7 +129,7 @@ namespace LANCommander.Server.Services
 
         public async Task<bool> UpdateAvailableAsync()
         {
-            var latestVersion = await gitHubService.GetLatestVersionAsync(_settings.Update.ReleaseChannel);
+            var latestVersion = await gitHubService.GetLatestVersionAsync(_settingsProvider.CurrentValue.Server.Update.ReleaseChannel);
 
             var sortOrder = versionProvider.GetCurrentVersion().ComparePrecedenceTo(latestVersion);
 
@@ -164,7 +166,7 @@ namespace LANCommander.Server.Services
                 client.DownloadFileCompleted += ReleaseDownloaded;
                 client.QueryString.Add("Version", release.TagName);
 
-                await client.DownloadFileTaskAsync(new Uri(releaseFile), Path.Combine(_settings.Update.StoragePath, $"{release.TagName}.zip"));
+                await client.DownloadFileTaskAsync(new Uri(releaseFile), Path.Combine(_settingsProvider.CurrentValue.Server.Update.StoragePath, $"{release.TagName}.zip"));
             }
         }
         
@@ -196,7 +198,7 @@ namespace LANCommander.Server.Services
                     var uri = new Uri(releaseFile);
 
                     client.QueryString.Add("Version", release.TagName);
-                    await client.DownloadFileTaskAsync(uri, Path.Combine(_settings.Update.StoragePath, $"{release.TagName}.zip"));
+                    await client.DownloadFileTaskAsync(uri, Path.Combine(_settingsProvider.CurrentValue.Server.Update.StoragePath, $"{release.TagName}.zip"));
                 }
             }
         }
@@ -231,7 +233,7 @@ namespace LANCommander.Server.Services
         private void ReleaseDownloaded(object? sender, System.ComponentModel.AsyncCompletedEventArgs e)
         {
             string version = ((WebClient)sender).QueryString["Version"];
-            string path = Path.Combine(_settings.Update.StoragePath, $"{version}.zip");
+            string path = Path.Combine(_settingsProvider.CurrentValue.Server.Update.StoragePath, $"{version}.zip");
 
             _logger?.LogInformation("Update version {Version} has been downloaded", version);
 
@@ -257,7 +259,7 @@ namespace LANCommander.Server.Services
             var process = new ProcessStartInfo();
 
             process.FileName = processExecutable;
-            process.Arguments = $"-Version {version} -Path \"{_settings.Update.StoragePath}\" -Executable {Process.GetCurrentProcess().MainModule.FileName}";
+            process.Arguments = $"-Version {version} -Path \"{_settingsProvider.CurrentValue.Server.Update.StoragePath}\" -Executable {Process.GetCurrentProcess().MainModule.FileName}";
             process.UseShellExecute = true;
 
             Process.Start(process);
@@ -274,12 +276,12 @@ namespace LANCommander.Server.Services
 
         public string GetLauncherFileLocation(string objectKey)
         {
-            return Path.Combine(_settings.Launcher.StoragePath, objectKey);
+            return Path.Combine(_settingsProvider.CurrentValue.Server.Launcher.StoragePath, objectKey);
         }
 
         public LauncherArtifact GetLauncherArtifact(string objectKey)
         {
-            string name = Path.Combine(_settings.Launcher.StoragePath, objectKey);
+            string name = Path.Combine(_settingsProvider.CurrentValue.Server.Launcher.StoragePath, objectKey);
             return GetArtifactFromName(name);
         }
     }
diff --git a/LANCommander.Server.Services/UserCustomFieldService.cs b/LANCommander.Server.Services/UserCustomFieldService.cs
index a82c97f0..bef3c890 100644
--- a/LANCommander.Server.Services/UserCustomFieldService.cs
+++ b/LANCommander.Server.Services/UserCustomFieldService.cs
@@ -10,10 +10,11 @@ namespace LANCommander.Server.Services
 {
     public sealed class UserCustomFieldService(
         ILogger<UserCustomFieldService> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
-        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<UserCustomField>(logger, cache, mapper, httpContextAccessor, contextFactory)
+        IDbContextFactory<DatabaseContext> contextFactory) : BaseDatabaseService<UserCustomField>(logger, settingsProvider, cache, mapper, httpContextAccessor, contextFactory)
     {
         public override async Task<UserCustomField> AddAsync(UserCustomField entity)
         {
diff --git a/LANCommander.Server.Services/UserService.cs b/LANCommander.Server.Services/UserService.cs
index 076e019d..61a25cf0 100644
--- a/LANCommander.Server.Services/UserService.cs
+++ b/LANCommander.Server.Services/UserService.cs
@@ -27,11 +27,12 @@ namespace LANCommander.Server.Services
 
         public UserService(
             ILogger<UserService> logger,
+            SettingsProvider<Settings.Settings> settingsProvider,
             IMapper mapper,
             IFusionCache cache,
             CollectionService collectionService,
             IDbContextFactory<DatabaseContext> contextFactory,
-            IdentityContextFactory identityContextFactory) : base(logger)
+            IdentityContextFactory identityContextFactory) : base(logger, settingsProvider)
         {
             IdentityContext = identityContextFactory.Create();
             CollectionService = collectionService;
@@ -40,17 +41,17 @@ namespace LANCommander.Server.Services
             Cache = cache;
         }
 
-        public void Reconfigure(Settings settings)
+        public void Reconfigure()
         {
             var options = IdentityContext.UserManager.Options;
-            if (options == null || settings == null) 
+            if (options == null) 
                 return;
 
-            options.Password.RequireNonAlphanumeric = settings.Authentication.PasswordRequireNonAlphanumeric;
-            options.Password.RequireLowercase = settings.Authentication.PasswordRequireLowercase;
-            options.Password.RequireUppercase = settings.Authentication.PasswordRequireUppercase;
-            options.Password.RequireDigit = settings.Authentication.PasswordRequireDigit;
-            options.Password.RequiredLength = settings.Authentication.PasswordRequiredLength;
+            options.Password.RequireNonAlphanumeric = _settingsProvider.CurrentValue.Server.Authentication.PasswordRequireNonAlphanumeric;
+            options.Password.RequireLowercase = _settingsProvider.CurrentValue.Server.Authentication.PasswordRequireLowercase;
+            options.Password.RequireUppercase = _settingsProvider.CurrentValue.Server.Authentication.PasswordRequireUppercase;
+            options.Password.RequireDigit = _settingsProvider.CurrentValue.Server.Authentication.PasswordRequireDigit;
+            options.Password.RequiredLength = _settingsProvider.CurrentValue.Server.Authentication.PasswordRequiredLength;
         }
 
         public async Task<User> GetAsync(string userName)
diff --git a/LANCommander.Server.Services/_BaseDatabaseService.cs b/LANCommander.Server.Services/_BaseDatabaseService.cs
index 623cd20d..7eab6441 100644
--- a/LANCommander.Server.Services/_BaseDatabaseService.cs
+++ b/LANCommander.Server.Services/_BaseDatabaseService.cs
@@ -15,10 +15,11 @@ namespace LANCommander.Server.Services
 {
     public abstract class BaseDatabaseService<T>(
         ILogger logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         IFusionCache cache,
         IMapper mapper,
         IHttpContextAccessor httpContextAccessor,
-        IDbContextFactory<DatabaseContext> dbContextFactory) : BaseService(logger), IBaseDatabaseService<T> where T : class, IBaseModel
+        IDbContextFactory<DatabaseContext> dbContextFactory) : BaseService(logger, settingsProvider), IBaseDatabaseService<T> where T : class, IBaseModel
     {
         protected readonly List<Func<IQueryable<T>, IQueryable<T>>> _modifiers = new();
 
diff --git a/LANCommander.Server.Services/_BaseService.cs b/LANCommander.Server.Services/_BaseService.cs
index d4afbf8a..2c30a387 100644
--- a/LANCommander.Server.Services/_BaseService.cs
+++ b/LANCommander.Server.Services/_BaseService.cs
@@ -1,16 +1,16 @@
-using LANCommander.Server.Services.Models;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace LANCommander.Server.Services
 {
     public abstract class BaseService
     {
         protected readonly ILogger _logger;
-        protected readonly Settings _settings = SettingService.GetSettings();
+        protected readonly SettingsProvider<Settings.Settings> _settingsProvider;
 
-        public BaseService(ILogger logger)
+        public BaseService(ILogger logger, SettingsProvider<Settings.Settings> settingsProvider)
         {
             _logger = logger;
+            _settingsProvider = settingsProvider;
             
             Initialize();
         }
diff --git a/LANCommander.Server.Services/Models/Settings.cs b/LANCommander.Server.Settings.Legacy/Settings.cs
similarity index 99%
rename from LANCommander.Server.Services/Models/Settings.cs
rename to LANCommander.Server.Settings.Legacy/Settings.cs
index 4c6fc7a1..a9cfc2ab 100644
--- a/LANCommander.Server.Services/Models/Settings.cs
+++ b/LANCommander.Server.Settings.Legacy/Settings.cs
@@ -1,5 +1,4 @@
 using LANCommander.Server.Data.Enums;
-using System.Text.RegularExpressions;
 using Humanizer.Bytes;
 using LANCommander.SDK.Enums;
 using Microsoft.AspNetCore.Http;
diff --git a/LANCommander.Server.Settings/Enums/AuthenticationProviderType.cs b/LANCommander.Server.Settings/Enums/AuthenticationProviderType.cs
new file mode 100644
index 00000000..d3a94bce
--- /dev/null
+++ b/LANCommander.Server.Settings/Enums/AuthenticationProviderType.cs
@@ -0,0 +1,8 @@
+namespace LANCommander.Server.Settings.Enums;
+
+public enum AuthenticationProviderType
+{
+    OAuth2,
+    OpenIdConnect,
+    Saml,
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Enums/DatabaseProvider.cs b/LANCommander.Server.Settings/Enums/DatabaseProvider.cs
new file mode 100644
index 00000000..6659c9f0
--- /dev/null
+++ b/LANCommander.Server.Settings/Enums/DatabaseProvider.cs
@@ -0,0 +1,9 @@
+namespace LANCommander.Server.Settings.Enums;
+
+public enum DatabaseProvider
+{
+    Unknown,
+    SQLite,
+    MySQL,
+    PostgreSQL
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Enums/LauncherArchitecture.cs b/LANCommander.Server.Settings/Enums/LauncherArchitecture.cs
new file mode 100644
index 00000000..8b786218
--- /dev/null
+++ b/LANCommander.Server.Settings/Enums/LauncherArchitecture.cs
@@ -0,0 +1,7 @@
+namespace LANCommander.Server.Settings.Enums;
+
+public enum LauncherArchitecture
+{
+    x64,
+    arm64,
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Enums/LauncherPlatform.cs b/LANCommander.Server.Settings/Enums/LauncherPlatform.cs
new file mode 100644
index 00000000..1c38a33f
--- /dev/null
+++ b/LANCommander.Server.Settings/Enums/LauncherPlatform.cs
@@ -0,0 +1,8 @@
+namespace LANCommander.Server.Settings.Enums;
+
+public enum LauncherPlatform
+{
+    Windows,
+    Linux,
+    macOS,
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Enums/LogInterval.cs b/LANCommander.Server.Settings/Enums/LogInterval.cs
new file mode 100644
index 00000000..932d44dd
--- /dev/null
+++ b/LANCommander.Server.Settings/Enums/LogInterval.cs
@@ -0,0 +1,11 @@
+namespace LANCommander.Server.Settings.Enums;
+
+public enum LogInterval
+{
+    Infinite,
+    Year,
+    Month,
+    Day,
+    Hour,
+    Minute,
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Enums/LoggingProviderType.cs b/LANCommander.Server.Settings/Enums/LoggingProviderType.cs
new file mode 100644
index 00000000..a770d03c
--- /dev/null
+++ b/LANCommander.Server.Settings/Enums/LoggingProviderType.cs
@@ -0,0 +1,10 @@
+namespace LANCommander.Server.Settings.Enums;
+
+public enum LoggingProviderType
+{
+    File,
+    Console,
+    SignalR,
+    Seq,
+    ElasticSearch,
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Enums/ReleaseChannel.cs b/LANCommander.Server.Settings/Enums/ReleaseChannel.cs
new file mode 100644
index 00000000..295839e1
--- /dev/null
+++ b/LANCommander.Server.Settings/Enums/ReleaseChannel.cs
@@ -0,0 +1,8 @@
+namespace LANCommander.Server.Settings.Enums;
+
+public enum ReleaseChannel
+{
+    Stable,
+    Prerelease,
+    Nightly,
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Enums/ServerEngine.cs b/LANCommander.Server.Settings/Enums/ServerEngine.cs
new file mode 100644
index 00000000..3e64ea0b
--- /dev/null
+++ b/LANCommander.Server.Settings/Enums/ServerEngine.cs
@@ -0,0 +1,7 @@
+namespace LANCommander.Server.Settings.Enums;
+
+public enum ServerEngine
+{
+    Local,
+    Docker,
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Enums/Theme.cs b/LANCommander.Server.Settings/Enums/Theme.cs
new file mode 100644
index 00000000..62e3554b
--- /dev/null
+++ b/LANCommander.Server.Settings/Enums/Theme.cs
@@ -0,0 +1,7 @@
+namespace LANCommander.Server.Settings.Enums;
+
+public enum Theme
+{
+    Light,
+    Dark,
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/LANCommander.Server.Settings.csproj b/LANCommander.Server.Settings/LANCommander.Server.Settings.csproj
new file mode 100644
index 00000000..998c75f1
--- /dev/null
+++ b/LANCommander.Server.Settings/LANCommander.Server.Settings.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net9.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" />
+      <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\LANCommander.SDK\LANCommander.SDK.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/LANCommander.Server.Settings/Models/ArchiveSettings.cs b/LANCommander.Server.Settings/Models/ArchiveSettings.cs
new file mode 100644
index 00000000..b509b265
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/ArchiveSettings.cs
@@ -0,0 +1,8 @@
+namespace LANCommander.Server.Settings.Models;
+
+public class ArchiveSettings
+{
+    public bool EnablePatching { get; set; } = false;
+    public bool AllowInsecureDownloads { get; set; } = false;
+    public int MaxChunkSize { get; set; } = 50;
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/AuthenticationProvider.cs b/LANCommander.Server.Settings/Models/AuthenticationProvider.cs
new file mode 100644
index 00000000..795bc254
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/AuthenticationProvider.cs
@@ -0,0 +1,26 @@
+using LANCommander.Server.Settings.Enums;
+
+namespace LANCommander.Server.Settings.Models;
+
+public class AuthenticationProvider
+{
+    public string Name { get; set; }
+    public string Slug { get; set; }
+    public AuthenticationProviderType Type { get; set; } = AuthenticationProviderType.OAuth2;
+    public string Color { get; set; }
+    public string Icon { get; set; }
+    public string Documentation { get; set; }
+    public string ClientId { get; set; }
+    public string ClientSecret { get; set; }
+    public string AuthorizationEndpoint { get; set; }
+    public string TokenEndpoint { get; set; }
+    public string UserInfoEndpoint { get; set; }
+    public string ConfigurationUrl { get; set; }
+    public IEnumerable<string> Scopes { get; set; } = new List<string>();
+    public IEnumerable<ClaimMapping> ClaimMappings { get; set; } = new List<ClaimMapping>();
+        
+    public string GetCustomFieldName()
+    {
+        return $"ExternalId/{Slug}";
+    }
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/AuthenticationSettings.cs b/LANCommander.Server.Settings/Models/AuthenticationSettings.cs
new file mode 100644
index 00000000..fb81e8aa
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/AuthenticationSettings.cs
@@ -0,0 +1,29 @@
+using Microsoft.AspNetCore.Http;
+
+namespace LANCommander.Server.Settings.Models;
+
+public class AuthenticationSettings
+{
+    public bool RequireApproval { get; set; } = false;
+    public string TokenSecret { get; set; } = Guid.NewGuid().ToString();
+    public int TokenLifetime { get; set; } = 30;
+    public bool PasswordRequireNonAlphanumeric { get; set; } = false;
+    public bool PasswordRequireLowercase { get; set; } = false;
+    public bool PasswordRequireUppercase { get; set; } = false;
+    public bool PasswordRequireDigit { get; set; } = true;
+    public int PasswordRequiredLength { get; set; } = 8;
+
+    public CookiePolicy HttpCookiePolicy { get; set; } = new()
+    {
+        SameSite = SameSiteMode.Lax,
+        Secure = CookieSecurePolicy.None
+    };
+
+    public CookiePolicy HttpsCookiePolicy { get; set; } = new()
+    {
+        SameSite = SameSiteMode.None,
+        Secure = CookieSecurePolicy.SameAsRequest
+    };
+        
+    public IEnumerable<AuthenticationProvider> AuthenticationProviders { get; set; } = new List<AuthenticationProvider>();
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/BackupSettings.cs b/LANCommander.Server.Settings/Models/BackupSettings.cs
new file mode 100644
index 00000000..fb459529
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/BackupSettings.cs
@@ -0,0 +1,6 @@
+namespace LANCommander.Server.Settings.Models;
+
+public class BackupSettings
+{
+    public string StoragePath { get; set; } = "Backups";
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/BeaconSettings.cs b/LANCommander.Server.Settings/Models/BeaconSettings.cs
new file mode 100644
index 00000000..67b8641b
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/BeaconSettings.cs
@@ -0,0 +1,9 @@
+namespace LANCommander.Server.Settings.Models;
+
+public class BeaconSettings
+{
+    public bool Enabled { get; set; } = true;
+    public string Name { get; set; } = "LANCommander";
+    public string Address { get; set; } = String.Empty;
+    public int Port { get; set; } = 35891;
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/ClaimMapping.cs b/LANCommander.Server.Settings/Models/ClaimMapping.cs
new file mode 100644
index 00000000..c9234bcb
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/ClaimMapping.cs
@@ -0,0 +1,7 @@
+namespace LANCommander.Server.Settings.Models;
+
+public class ClaimMapping
+{
+    public string Name { get; set; }
+    public string Value { get; set; }
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/CookiePolicy.cs b/LANCommander.Server.Settings/Models/CookiePolicy.cs
new file mode 100644
index 00000000..028b07a9
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/CookiePolicy.cs
@@ -0,0 +1,9 @@
+using Microsoft.AspNetCore.Http;
+
+namespace LANCommander.Server.Settings.Models;
+
+public class CookiePolicy
+{
+    public SameSiteMode SameSite { get; set; } = SameSiteMode.None;
+    public CookieSecurePolicy Secure { get; set; } = CookieSecurePolicy.SameAsRequest;
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/DatabaseSettings.cs b/LANCommander.Server.Settings/Models/DatabaseSettings.cs
new file mode 100644
index 00000000..ae1f6a44
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/DatabaseSettings.cs
@@ -0,0 +1,9 @@
+using LANCommander.Server.Settings.Enums;
+
+namespace LANCommander.Server.Settings.Models;
+
+public class DatabaseSettings
+{
+    public DatabaseProvider Provider { get; set; } = DatabaseProvider.Unknown;
+    public string ConnectionString { get; set; } = String.Empty;
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/GameServerSettings.cs b/LANCommander.Server.Settings/Models/GameServerSettings.cs
new file mode 100644
index 00000000..dcecc984
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/GameServerSettings.cs
@@ -0,0 +1,22 @@
+using LANCommander.Server.Settings.Enums;
+
+namespace LANCommander.Server.Settings.Models;
+
+public class GameServerSettings
+{
+    public string StoragePath { get; set; } = "Servers";
+    public IEnumerable<ServerEngineConfiguration> ServerEngines { get; set; } = new List<ServerEngineConfiguration>()
+    {
+        new ServerEngineConfiguration
+        {
+            Name = "Local",
+            Type = ServerEngine.Local,
+        },
+        new ServerEngineConfiguration
+        {
+            Name = "Docker",
+            Type = ServerEngine.Docker,
+            Address = "unix:///var/run/docker.sock",
+        }
+    };
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/HttpSettings.cs b/LANCommander.Server.Settings/Models/HttpSettings.cs
new file mode 100644
index 00000000..8cbb3128
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/HttpSettings.cs
@@ -0,0 +1,10 @@
+namespace LANCommander.Server.Settings.Models;
+
+public class HttpSettings
+{
+    public int Port { get; set; } = 1337;
+    public int SSLPort { get; set; } = 31337;
+    public bool UseSSL { get; set; } = false;
+    public string CertificatePath { get; set; } = String.Empty;
+    public string CertificatePassword { get; set; } = String.Empty;
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/IGDBSettings.cs b/LANCommander.Server.Settings/Models/IGDBSettings.cs
new file mode 100644
index 00000000..c1ea3c97
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/IGDBSettings.cs
@@ -0,0 +1,7 @@
+namespace LANCommander.Server.Settings.Models;
+
+public class IGDBSettings
+{
+    public string ClientId { get; set; } = String.Empty;
+    public string ClientSecret { get; set; } = String.Empty;
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/IPXRelaySettings.cs b/LANCommander.Server.Settings/Models/IPXRelaySettings.cs
new file mode 100644
index 00000000..60b3f09b
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/IPXRelaySettings.cs
@@ -0,0 +1,9 @@
+namespace LANCommander.Server.Settings.Models;
+
+public class IPXRelaySettings
+{
+    public bool Enabled { get; set; } = false;
+    public string Host { get; set; } = String.Empty;
+    public int Port { get; set; } = 213;
+    public bool Logging { get; set; } = false;
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/LauncherSettings.cs b/LANCommander.Server.Settings/Models/LauncherSettings.cs
new file mode 100644
index 00000000..c636f24d
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/LauncherSettings.cs
@@ -0,0 +1,19 @@
+using LANCommander.Server.Settings.Enums;
+
+namespace LANCommander.Server.Settings.Models;
+
+public class LauncherSettings
+{
+    public string StoragePath { get; set; } = "Launcher";
+    /// <summary>
+    /// Whether to include locally downloaded launcher files and provide these for download
+    /// </summary>
+    public bool HostUpdates { get; set; } = true;
+    /// <summary>
+    /// Whether to include online launcher files to link to for download
+    /// </summary>
+    public bool IncludeOnlineUpdates { get; set; } = false;
+    public string VersionOverride { get; set; } = String.Empty;
+    public IEnumerable<LauncherArchitecture> Architectures { get; set; } = new[] { LauncherArchitecture.x64, LauncherArchitecture.arm64 };
+    public IEnumerable<LauncherPlatform> Platforms { get; set; } = new[] { LauncherPlatform.Windows };
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/LibrarySettings.cs b/LANCommander.Server.Settings/Models/LibrarySettings.cs
new file mode 100644
index 00000000..379aa36e
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/LibrarySettings.cs
@@ -0,0 +1,6 @@
+namespace LANCommander.Server.Settings.Models;
+
+public class LibrarySettings
+{
+    public bool EnableUserLibraries { get; set; } = true;
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/LogSettings.cs b/LANCommander.Server.Settings/Models/LogSettings.cs
new file mode 100644
index 00000000..bb5e910b
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/LogSettings.cs
@@ -0,0 +1,29 @@
+using LANCommander.Server.Settings.Enums;
+using Microsoft.Extensions.Logging;
+
+namespace LANCommander.Server.Settings.Models;
+
+public class LogSettings
+{
+    public bool IgnorePings { get; set; } = true;
+    public IEnumerable<LoggingProvider> Providers { get; set; } = [
+        new()
+        {
+            Name = "Console",
+            MinimumLevel = LogLevel.Information, Type = LoggingProviderType.Console
+        },
+        new()
+        {
+            Name = "File",
+            MinimumLevel = LogLevel.Information,
+            Type = LoggingProviderType.File,
+            ConnectionString = "Logs"
+        },
+        new()
+        {
+            Name = "Server Console",
+            MinimumLevel = LogLevel.Information,
+            Type = LoggingProviderType.SignalR
+        },
+    ];
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/LoggingProvider.cs b/LANCommander.Server.Settings/Models/LoggingProvider.cs
new file mode 100644
index 00000000..7142d0b3
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/LoggingProvider.cs
@@ -0,0 +1,15 @@
+using LANCommander.Server.Settings.Enums;
+using Microsoft.Extensions.Logging;
+
+namespace LANCommander.Server.Settings.Models;
+
+public class LoggingProvider
+{
+    public string Name { get; set; }
+    public LogLevel MinimumLevel { get; set; } = LogLevel.Information;
+    public bool Enabled { get; set; } = true;
+    public LoggingProviderType Type { get; set; } = LoggingProviderType.Console;
+    public LogInterval? ArchiveEvery { get; set; }
+    public int MaxArchiveFiles { get; set; } = 10;
+    public string ConnectionString { get; set; } = String.Empty;
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/MediaSettings.cs b/LANCommander.Server.Settings/Models/MediaSettings.cs
new file mode 100644
index 00000000..f246bd35
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/MediaSettings.cs
@@ -0,0 +1,86 @@
+using Humanizer.Bytes;
+using LANCommander.SDK.Enums;
+
+namespace LANCommander.Server.Settings.Models;
+
+    public class MediaSettings
+    {
+        public string SteamGridDbApiKey { get; set; } = String.Empty;
+
+        public IEnumerable<MediaTypeSettings> MediaTypes { get; set; } =
+            new List<MediaTypeSettings>()
+            {
+                new MediaTypeSettings
+                {
+                    Type = MediaType.Icon,
+                    MaxFileSize = 2 * ByteSize.BytesInMegabyte,
+                    Thumbnails = new MediaTypeThumbnailSettings
+                    {
+                        MinSize = new ThumbnailSize(32, 32),
+                        MaxSize = new ThumbnailSize(128, 128),
+                    }
+                },
+                new MediaTypeSettings
+                {
+                    Type = MediaType.Cover,
+                    MaxFileSize = 6 * ByteSize.BytesInMegabyte,
+                    Thumbnails = new MediaTypeThumbnailSettings
+                    {
+                        MinSize = new ThumbnailSize(240, 360),
+                        MaxSize = new ThumbnailSize(600, 900),
+                    }
+                },
+                new MediaTypeSettings
+                {
+                    Type = MediaType.Background,
+                    MaxFileSize = 8 * ByteSize.BytesInMegabyte,
+                    Thumbnails = new MediaTypeThumbnailSettings
+                    {
+                        MinSize = new ThumbnailSize(690, 310),
+                        MaxSize = new ThumbnailSize(3840, 1240),
+                    }
+                },
+                new MediaTypeSettings
+                {
+                    Type = MediaType.Avatar,
+                    MaxFileSize = 2 * ByteSize.BytesInMegabyte,
+                    Thumbnails = new MediaTypeThumbnailSettings
+                    {
+                        MinSize = new ThumbnailSize(64, 64),
+                        MaxSize = new ThumbnailSize(256, 256),
+                    }
+                },
+                new MediaTypeSettings
+                {
+                    Type = MediaType.Logo,
+                    MaxFileSize = 4 * ByteSize.BytesInMegabyte,
+                    Thumbnails = new MediaTypeThumbnailSettings
+                    {
+                        MinSize = new ThumbnailSize(400, 400),
+                        MaxSize = new ThumbnailSize(1000, 1000),
+                    }
+                },
+                new MediaTypeSettings
+                {
+                    Type = MediaType.Manual,
+                    MaxFileSize = 4 * ByteSize.BytesInMegabyte,
+                    Thumbnails = new MediaTypeThumbnailSettings
+                    {
+                        MinSize = new ThumbnailSize(240, 360),
+                        MaxSize = new ThumbnailSize(600, 900),
+                    }
+                },
+                new MediaTypeSettings
+                {
+                    Type = MediaType.PageImage,
+                    MaxFileSize = 4 * ByteSize.BytesInMegabyte,
+                    Thumbnails = new MediaTypeThumbnailSettings
+                    {
+                        MinSize = new ThumbnailSize(480, 480),
+                        MaxSize = new ThumbnailSize(1920, 1920),
+                    }
+                },
+            };
+
+        public MediaTypeSettings? GetMediaTypeConfig(MediaType type) => MediaTypes.FirstOrDefault(x => x.Type == type);
+    }
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/MediaTypeSettings.cs b/LANCommander.Server.Settings/Models/MediaTypeSettings.cs
new file mode 100644
index 00000000..a3101c14
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/MediaTypeSettings.cs
@@ -0,0 +1,10 @@
+using LANCommander.SDK.Enums;
+
+namespace LANCommander.Server.Settings.Models;
+
+public class MediaTypeSettings
+{
+    public MediaType Type { get; set; }
+    public long MaxFileSize { get; set; }
+    public MediaTypeThumbnailSettings Thumbnails { get; set; } = new();
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/MediaTypeThumbnailSettings.cs b/LANCommander.Server.Settings/Models/MediaTypeThumbnailSettings.cs
new file mode 100644
index 00000000..8219de74
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/MediaTypeThumbnailSettings.cs
@@ -0,0 +1,10 @@
+namespace LANCommander.Server.Settings.Models;
+
+public class MediaTypeThumbnailSettings
+{
+    public ThumbnailSize MinSize { get; set; }
+    public ThumbnailSize MaxSize { get; set; }
+    public int Scale { get; set; } = 50;
+    public bool Enabled { get; set; } = true;
+    public int Quality { get; set; } = 75;
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/MetadataSettings.cs b/LANCommander.Server.Settings/Models/MetadataSettings.cs
new file mode 100644
index 00000000..ac5b779e
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/MetadataSettings.cs
@@ -0,0 +1,6 @@
+namespace LANCommander.Server.Settings.Models;
+
+public class MetadataSettings
+{
+    public IGDBSettings IGDB { get; set; }
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/RoleSettings.cs b/LANCommander.Server.Settings/Models/RoleSettings.cs
new file mode 100644
index 00000000..372f6d33
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/RoleSettings.cs
@@ -0,0 +1,7 @@
+namespace LANCommander.Server.Settings.Models;
+
+public class RoleSettings
+{
+    public Guid DefaultRoleId { get; set; }
+    public bool RestrictGamesByCollection { get; set; } = false;
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/ScriptSettings.cs b/LANCommander.Server.Settings/Models/ScriptSettings.cs
new file mode 100644
index 00000000..49288ff3
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/ScriptSettings.cs
@@ -0,0 +1,7 @@
+namespace LANCommander.Server.Settings.Models;
+
+public class ScriptSettings
+{
+    public bool EnableAutomaticRepackaging { get; set; } = false;
+    public int RepackageEvery { get; set; } = 24;
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/ServerEngineConfiguration.cs b/LANCommander.Server.Settings/Models/ServerEngineConfiguration.cs
new file mode 100644
index 00000000..d208719c
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/ServerEngineConfiguration.cs
@@ -0,0 +1,11 @@
+using LANCommander.Server.Settings.Enums;
+
+namespace LANCommander.Server.Settings.Models;
+
+public class ServerEngineConfiguration
+{
+    public Guid Id { get; set; } = Guid.NewGuid();
+    public string Name { get; set; } = "Local";
+    public ServerEngine Type { get; set; } = ServerEngine.Local;
+    public string Address { get; set; } = String.Empty;
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/ServerSettings.cs b/LANCommander.Server.Settings/Models/ServerSettings.cs
new file mode 100644
index 00000000..d9438616
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/ServerSettings.cs
@@ -0,0 +1,23 @@
+namespace LANCommander.Server.Settings.Models;
+
+public class ServerSettings
+{
+    public ArchiveSettings Archives { get; set; } = new();
+    public AuthenticationSettings Authentication { get; set; } = new();
+    public BackupSettings Backups { get; set; } = new();
+    public BeaconSettings Beacon { get; set; } = new();
+    public DatabaseSettings Database { get; set; } = new();
+    public HttpSettings Http { get; set; } = new();
+    public IGDBSettings IGDB { get; set; } = new();
+    public IPXRelaySettings IPXRelay { get; set; } = new();
+    public LauncherSettings Launcher { get; set; } = new();
+    public LibrarySettings Library { get; set; } = new();
+    public LogSettings Logs { get; set; } = new();
+    public MediaSettings Media { get; set; } = new();
+    public RoleSettings Roles { get; set; } = new();
+    public ScriptSettings Scripts { get; set; } = new();
+    public GameServerSettings GameServers { get; set; } = new();
+    public SteamCmdSettings SteamCMD { get; set; } = new();
+    public UpdateSettings Update { get; set; } = new();
+    public UserSaveSettings UserSaves { get; set; } = new();
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/SteamCmdProfile.cs b/LANCommander.Server.Settings/Models/SteamCmdProfile.cs
new file mode 100644
index 00000000..bad12b96
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/SteamCmdProfile.cs
@@ -0,0 +1,7 @@
+namespace LANCommander.Server.Settings.Models;
+
+public class SteamCmdProfile
+{
+    public string Username { get; set; } = String.Empty;
+    public string InstallDirectory { get; set; } = String.Empty;
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/SteamCmdSettings.cs b/LANCommander.Server.Settings/Models/SteamCmdSettings.cs
new file mode 100644
index 00000000..bddad72e
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/SteamCmdSettings.cs
@@ -0,0 +1,8 @@
+namespace LANCommander.Server.Settings.Models;
+
+public class SteamCmdSettings
+{
+    public string Path { get; set; } = String.Empty;
+    public string InstallDirectory { get; set; } = "";
+    public ICollection<SteamCmdProfile> Profiles { get; set; } = new List<SteamCmdProfile>();
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/ThumbnailSize.cs b/LANCommander.Server.Settings/Models/ThumbnailSize.cs
new file mode 100644
index 00000000..3dffc095
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/ThumbnailSize.cs
@@ -0,0 +1,17 @@
+namespace LANCommander.Server.Settings.Models;
+
+public class ThumbnailSize
+{
+    public int Width { get; set; }
+    public int Height { get; set; }
+
+    public ThumbnailSize()
+    {
+    }
+
+    public ThumbnailSize(int width, int height)
+    {
+        Width = width;
+        Height = height;
+    }
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/UpdateSettings.cs b/LANCommander.Server.Settings/Models/UpdateSettings.cs
new file mode 100644
index 00000000..a3cf4b4e
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/UpdateSettings.cs
@@ -0,0 +1,9 @@
+using LANCommander.Server.Settings.Enums;
+
+namespace LANCommander.Server.Settings.Models;
+
+public class UpdateSettings
+{
+    public string StoragePath { get; set; } = "Updates";
+    public ReleaseChannel ReleaseChannel { get; set; } = ReleaseChannel.Stable;
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Models/UserSaveSettings.cs b/LANCommander.Server.Settings/Models/UserSaveSettings.cs
new file mode 100644
index 00000000..ebab4433
--- /dev/null
+++ b/LANCommander.Server.Settings/Models/UserSaveSettings.cs
@@ -0,0 +1,7 @@
+namespace LANCommander.Server.Settings.Models;
+
+public class UserSaveSettings
+{
+    public int MaxSize { get; set; } = 25;
+    public int MaxSaves { get; set; } = 0;
+}
\ No newline at end of file
diff --git a/LANCommander.Server.Settings/Settings.cs b/LANCommander.Server.Settings/Settings.cs
new file mode 100644
index 00000000..30352b81
--- /dev/null
+++ b/LANCommander.Server.Settings/Settings.cs
@@ -0,0 +1,10 @@
+using LANCommander.Server.Settings.Models;
+
+namespace LANCommander.Server.Settings;
+
+public class Settings : SDK.Models.Settings
+{
+    public ServerSettings Server { get; set; } = new();
+    
+    private static DriveInfo[] Drives = DriveInfo.GetDrives();
+}
\ No newline at end of file
diff --git a/LANCommander.Server/Controllers/Api/ArchivesController.cs b/LANCommander.Server/Controllers/Api/ArchivesController.cs
index 95d71499..5a65977f 100644
--- a/LANCommander.Server/Controllers/Api/ArchivesController.cs
+++ b/LANCommander.Server/Controllers/Api/ArchivesController.cs
@@ -22,8 +22,9 @@ namespace LANCommander.Server.Controllers.Api
 
         public ArchivesController(
             ILogger<ArchivesController> logger,
+            SettingsProvider<Settings.Settings> settingsProvider,
             IFusionCache cache,
-            ArchiveClient archiveClient) : base(logger)
+            ArchiveClient archiveClient) : base(logger, settingsProvider)
         {
             Cache = cache;
             _archiveClient = archiveClient;
diff --git a/LANCommander.Server/Controllers/Api/AuthController.cs b/LANCommander.Server/Controllers/Api/AuthController.cs
index 591bd1a3..84cb7fd3 100644
--- a/LANCommander.Server/Controllers/Api/AuthController.cs
+++ b/LANCommander.Server/Controllers/Api/AuthController.cs
@@ -3,17 +3,11 @@ using LANCommander.Server.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.IdentityModel.Tokens;
-using System.IdentityModel.Tokens.Jwt;
-using System.Security.Claims;
-using System.Security.Cryptography;
-using System.Text;
 using AutoMapper;
 using LANCommander.SDK.Models;
 using Microsoft.AspNetCore.Authentication;
 using ZiggyCreatures.Caching.Fusion;
 using AuthenticationService = LANCommander.Server.Services.AuthenticationService;
-using User = LANCommander.Server.Data.Models.User;
 using LANCommander.Server.Services.Exceptions;
 
 namespace LANCommander.Server.Controllers.Api
@@ -46,7 +40,8 @@ namespace LANCommander.Server.Controllers.Api
             RoleService roleService,
             IFusionCache cache,
             IMapper mapper,
-            ILogger<AuthController> logger) : base(logger)
+            ILogger<AuthController> logger,
+            SettingsProvider<Settings.Settings> settingsProvider) : base(logger, settingsProvider)
         {
             AuthenticationService = authenticationService;
             UserService = userService;
@@ -192,7 +187,7 @@ namespace LANCommander.Server.Controllers.Api
         [HttpGet("AuthenticationProviders")]
         public IActionResult GetAuthenticationProviders()
         {
-            return Ok(Mapper.Map<IEnumerable<AuthenticationProvider>>(Settings.Authentication.AuthenticationProviders));
+            return Ok(Mapper.Map<IEnumerable<AuthenticationProvider>>(SettingsProvider.CurrentValue.Server.Authentication.AuthenticationProviders));
         }
 
         static ErrorResponse.ErrorInfo FromIdentityResult(IdentityError error)
diff --git a/LANCommander.Server/Controllers/Api/DepotController.cs b/LANCommander.Server/Controllers/Api/DepotController.cs
index 9a732bb5..085d1a7e 100644
--- a/LANCommander.Server/Controllers/Api/DepotController.cs
+++ b/LANCommander.Server/Controllers/Api/DepotController.cs
@@ -32,6 +32,7 @@ namespace LANCommander.Server.Controllers.Api
 
         public DepotController(
             ILogger<DepotController> logger,
+            SettingsProvider<Settings.Settings> settingsProvider,
             IMapper mapper,
             IFusionCache cache,
             GameService gameService,
@@ -42,7 +43,7 @@ namespace LANCommander.Server.Controllers.Api
             PlatformService platformService,
             TagService tagService,
             LibraryService libraryService,
-            UserService userService) : base(logger)
+            UserService userService) : base(logger, settingsProvider)
         {
             Mapper = mapper;
             Cache = cache;
@@ -103,7 +104,7 @@ namespace LANCommander.Server.Controllers.Api
                 return results;
             }, TimeSpan.MaxValue, tags: ["Depot"]);
 
-            if (Settings.Roles.RestrictGamesByCollection)
+            if (SettingsProvider.CurrentValue.Server.Roles.RestrictGamesByCollection)
             {
                 var collections = await UserService.GetCollectionsAsync(user);
 
diff --git a/LANCommander.Server/Controllers/Api/ExportController.cs b/LANCommander.Server/Controllers/Api/ExportController.cs
index 50367180..9a7649be 100644
--- a/LANCommander.Server/Controllers/Api/ExportController.cs
+++ b/LANCommander.Server/Controllers/Api/ExportController.cs
@@ -16,7 +16,8 @@ public class ExportController : BaseApiController
     
     public ExportController(
         ExportService exportService,
-        ILogger<ExportController> logger) : base(logger)
+        ILogger<ExportController> logger,
+        SettingsProvider<Settings.Settings> settingsProvider) : base(logger, settingsProvider)
     {
         ExportService = exportService;
     }
diff --git a/LANCommander.Server/Controllers/Api/GamesController.cs b/LANCommander.Server/Controllers/Api/GamesController.cs
index c10411e6..67b8ccea 100644
--- a/LANCommander.Server/Controllers/Api/GamesController.cs
+++ b/LANCommander.Server/Controllers/Api/GamesController.cs
@@ -1,15 +1,12 @@
 using AutoMapper;
 using LANCommander.SDK.Enums;
-using LANCommander.Server.Data;
 using LANCommander.Server.Data.Models;
 using LANCommander.Server.Extensions;
 using LANCommander.Server.ImportExport;
-using LANCommander.Server.Models;
 using LANCommander.Server.Services;
 using LANCommander.Server.Services.Abstractions;
 using LANCommander.Server.Services.Enums;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using ZiggyCreatures.Caching.Fusion;
@@ -35,6 +32,7 @@ namespace LANCommander.Server.Controllers.Api
 
         public GamesController(
             ILogger<GamesController> logger,
+            SettingsProvider<Settings.Settings> settingsProvider,
             IServiceProvider serviceProvider,
             IFusionCache cache,
             IMapper mapper,
@@ -45,7 +43,7 @@ namespace LANCommander.Server.Controllers.Api
             UserService userService,
             PlaySessionService playSessionService,
             ServerService serverService,
-            ImportContext importContext) : base(logger)
+            ImportContext importContext) : base(logger, settingsProvider)
         {
             GameService = gameService;
 
@@ -84,7 +82,7 @@ namespace LANCommander.Server.Controllers.Api
                     mappedGame.InLibrary = userLibrary.Games.Any(g => g.Id == mappedGame.Id);
             }
 
-            if (Settings.Roles.RestrictGamesByCollection && !User.IsInRole(RoleService.AdministratorRoleName))
+            if (SettingsProvider.CurrentValue.Server.Roles.RestrictGamesByCollection && !User.IsInRole(RoleService.AdministratorRoleName))
             {
                 var roles = await UserService.GetRolesAsync(user);
 
@@ -305,7 +303,7 @@ namespace LANCommander.Server.Controllers.Api
         [HttpGet("{id}/Download")]
         public async Task<IActionResult> DownloadAsync(Guid id)
         {
-            if (!Settings.Archives.AllowInsecureDownloads && (User == null || User.Identity == null || !User.Identity.IsAuthenticated))
+            if (!SettingsProvider.CurrentValue.Server.Archives.AllowInsecureDownloads && (User == null || User.Identity == null || !User.Identity.IsAuthenticated))
             {
                 Logger?.LogError("User is not authorized to download game with ID {GameId}", id);
                 return Unauthorized();
diff --git a/LANCommander.Server/Controllers/Api/IssueController.cs b/LANCommander.Server/Controllers/Api/IssueController.cs
index 4adb3ca5..83118a7f 100644
--- a/LANCommander.Server/Controllers/Api/IssueController.cs
+++ b/LANCommander.Server/Controllers/Api/IssueController.cs
@@ -18,9 +18,10 @@ namespace LANCommander.Server.Controllers.Api
 
         public IssueController(
             ILogger<IssueController> logger,
+            SettingsProvider<Settings.Settings> settingsProvider,
             GameService gameService,
             IssueService issueService,
-            UserService userService) : base(logger)
+            UserService userService) : base(logger, settingsProvider)
         {
             GameService = gameService;
             IssueService = issueService;
diff --git a/LANCommander.Server/Controllers/Api/KeysController.cs b/LANCommander.Server/Controllers/Api/KeysController.cs
index 11d81c81..65a74b11 100644
--- a/LANCommander.Server/Controllers/Api/KeysController.cs
+++ b/LANCommander.Server/Controllers/Api/KeysController.cs
@@ -1,15 +1,9 @@
 using AutoMapper;
-using LANCommander.Server.Data;
-using LANCommander.Server.Data.Models;
-using LANCommander.Server.Extensions;
 using LANCommander.Server.Services;
 using LANCommander.SDK.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Identity;
-using LANCommander.Server.Models;
 using LANCommander.SDK.Enums;
-using Microsoft.EntityFrameworkCore;
 
 namespace LANCommander.Server.Controllers.Api
 {
@@ -25,10 +19,11 @@ namespace LANCommander.Server.Controllers.Api
 
         public KeysController(
             ILogger<KeysController> logger,
+            SettingsProvider<Settings.Settings> settingsProvider,
             IMapper mapper,
             KeyService keyService,
             GameService gameService,
-            UserService userService) : base(logger)
+            UserService userService) : base(logger, settingsProvider)
         {
             Mapper = mapper;
             KeyService = keyService;
diff --git a/LANCommander.Server/Controllers/Api/LauncherController.cs b/LANCommander.Server/Controllers/Api/LauncherController.cs
index 28dca820..25fb8c26 100644
--- a/LANCommander.Server/Controllers/Api/LauncherController.cs
+++ b/LANCommander.Server/Controllers/Api/LauncherController.cs
@@ -17,8 +17,9 @@ namespace LANCommander.Server.Controllers.Api
 
         public LauncherController(
             ILogger<LauncherController> logger,
+            SettingsProvider<Settings.Settings> settingsProvider,
             IVersionProvider versionProvider,
-            IGitHubService gitHubService) : base(logger)
+            IGitHubService gitHubService) : base(logger, settingsProvider)
         {
             _versionProvider = versionProvider;
             _gitHubService = gitHubService;
@@ -29,11 +30,10 @@ namespace LANCommander.Server.Controllers.Api
         public async Task<IActionResult> DownloadAsync()
         {
             var version = _versionProvider.GetCurrentVersion();
-            var settings = SettingService.GetSettings();
             var fileName = $"LANCommander.Launcher-Windows-x64-v{version.WithoutMetadata()}.zip";
-            var path = Path.Combine(settings.Launcher.StoragePath, fileName);
+            var path = Path.Combine(SettingsProvider.CurrentValue.Server.Launcher.StoragePath, fileName);
 
-            if (!System.IO.File.Exists(path) || !settings.Launcher.HostUpdates)
+            if (!System.IO.File.Exists(path) || !SettingsProvider.CurrentValue.Server.Launcher.HostUpdates)
             {
                 var release = await _gitHubService.GetReleaseAsync(version);
 
diff --git a/LANCommander.Server/Controllers/Api/LibraryController.cs b/LANCommander.Server/Controllers/Api/LibraryController.cs
index 49933840..dafacc41 100644
--- a/LANCommander.Server/Controllers/Api/LibraryController.cs
+++ b/LANCommander.Server/Controllers/Api/LibraryController.cs
@@ -24,12 +24,13 @@ namespace LANCommander.Server.Controllers.Api
 
         public LibraryController(
             ILogger<LibraryController> logger,
+            SettingsProvider<Settings.Settings> settingsProvider,
             IMapper mapper,
             IFusionCache cache,
             GameService gameService,
             LibraryService libraryService,
             DatabaseContext databaseContext,
-            UserService userService) : base(logger)
+            UserService userService) : base(logger, settingsProvider)
         {
             Mapper = mapper;
             Cache = cache;
@@ -44,7 +45,7 @@ namespace LANCommander.Server.Controllers.Api
         {
             try
             {
-                if (!Settings.Library.EnableUserLibraries)
+                if (!SettingsProvider.CurrentValue.Server.Library.EnableUserLibraries)
                 {
                     var games = await Cache.GetOrSetAsync<IEnumerable<SDK.Models.Game>>("Games", async _ => {
                         Logger?.LogDebug("Mapped games cache is empty, repopulating");
diff --git a/LANCommander.Server/Controllers/Api/MediaController.cs b/LANCommander.Server/Controllers/Api/MediaController.cs
index bce00b60..a9b06218 100644
--- a/LANCommander.Server/Controllers/Api/MediaController.cs
+++ b/LANCommander.Server/Controllers/Api/MediaController.cs
@@ -1,9 +1,4 @@
 using AutoMapper;
-using LANCommander.Server.Data;
-using LANCommander.Server.Data.Models;
-using LANCommander.Server.Extensions;
-using LANCommander.Server.Models;
-using LANCommander.SDK;
 using LANCommander.Server.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -20,8 +15,9 @@ namespace LANCommander.Server.Controllers.Api
 
         public MediaController(
             ILogger<MediaController> logger,
+            SettingsProvider<Settings.Settings> settingsProvider,
             IMapper mapper,
-            MediaService mediaService) : base(logger)
+            MediaService mediaService) : base(logger, settingsProvider)
         {
             Mapper = mapper;
             MediaService = mediaService;
diff --git a/LANCommander.Server/Controllers/Api/PlaySessionsController.cs b/LANCommander.Server/Controllers/Api/PlaySessionsController.cs
index 29430454..548eca3d 100644
--- a/LANCommander.Server/Controllers/Api/PlaySessionsController.cs
+++ b/LANCommander.Server/Controllers/Api/PlaySessionsController.cs
@@ -1,8 +1,6 @@
 using AutoMapper;
-using LANCommander.Server.Data.Models;
 using LANCommander.Server.Services;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
@@ -20,10 +18,11 @@ namespace LANCommander.Server.Controllers.Api
 
         public PlaySessionsController(
             ILogger<PlaySessionsController> logger,
+            SettingsProvider<Settings.Settings> settingsProvider,
             IMapper mapper,
             PlaySessionService playSessionService,
             GameService gameService,
-            UserService userService) : base(logger)
+            UserService userService) : base(logger, settingsProvider)
         {
             Mapper = mapper;
             PlaySessionService = playSessionService;
diff --git a/LANCommander.Server/Controllers/Api/ProfileController.cs b/LANCommander.Server/Controllers/Api/ProfileController.cs
index ac959047..b3adbaa4 100644
--- a/LANCommander.Server/Controllers/Api/ProfileController.cs
+++ b/LANCommander.Server/Controllers/Api/ProfileController.cs
@@ -2,13 +2,7 @@
 using LANCommander.Server.Models;
 using LANCommander.Server.Services;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.IdentityModel.Tokens;
-using System.IdentityModel.Tokens.Jwt;
-using System.Security.Claims;
-using System.Security.Cryptography;
-using System.Text;
 
 namespace LANCommander.Server.Controllers.Api
 {
@@ -23,9 +17,10 @@ namespace LANCommander.Server.Controllers.Api
 
         public ProfileController(
             ILogger<ProfileController> logger,
+            SettingsProvider<Settings.Settings> settingsProvider,
             UserService userService,
             MediaService mediaService,
-            UserCustomFieldService userCustomFieldService) : base(logger)
+            UserCustomFieldService userCustomFieldService) : base(logger, settingsProvider)
         {
             UserService = userService;
             MediaService = mediaService;
diff --git a/LANCommander.Server/Controllers/Api/RedistributablesController.cs b/LANCommander.Server/Controllers/Api/RedistributablesController.cs
index 4a94cdee..8be89510 100644
--- a/LANCommander.Server/Controllers/Api/RedistributablesController.cs
+++ b/LANCommander.Server/Controllers/Api/RedistributablesController.cs
@@ -2,11 +2,9 @@
 using LANCommander.Server.Data.Models;
 using LANCommander.Server.Extensions;
 using LANCommander.Server.ImportExport;
-using LANCommander.Server.Models;
 using LANCommander.Server.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
 
 namespace LANCommander.Server.Controllers.Api
 {
@@ -23,11 +21,12 @@ namespace LANCommander.Server.Controllers.Api
 
         public RedistributablesController(
             ILogger<RedistributablesController> logger, 
+            SettingsProvider<Settings.Settings> settingsProvider,
             IMapper mapper,
             RedistributableService redistributableService,
             StorageLocationService storageLocationService,
             ArchiveClient archiveClient,
-            ImportContext importContext) : base(logger)
+            ImportContext importContext) : base(logger, settingsProvider)
         {
             Mapper = mapper;
             RedistributableService = redistributableService;
diff --git a/LANCommander.Server/Controllers/Api/UploadController.cs b/LANCommander.Server/Controllers/Api/UploadController.cs
index 62e466df..41bcaa7d 100644
--- a/LANCommander.Server/Controllers/Api/UploadController.cs
+++ b/LANCommander.Server/Controllers/Api/UploadController.cs
@@ -1,10 +1,7 @@
-using HarfBuzzSharp;
-using LANCommander.Server.Data.Models;
+using LANCommander.Server.Data.Models;
 using LANCommander.Server.Models;
 using LANCommander.Server.Services;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Octokit.Internal;
 using ZiggyCreatures.Caching.Fusion;
 
 namespace LANCommander.Server.Controllers.Api
@@ -19,9 +16,10 @@ namespace LANCommander.Server.Controllers.Api
 
         public UploadController(
             ILogger<UploadController> logger,
+            SettingsProvider<Settings.Settings> settingsProvider,
             StorageLocationService storageLocationService,
             ArchiveClient archiveClient,
-            IFusionCache cache) : base(logger)
+            IFusionCache cache) : base(logger, settingsProvider)
         {
             StorageLocationService = storageLocationService;
             _archiveClient = archiveClient;
diff --git a/LANCommander.Server/Controllers/Api/_BaseApiController.cs b/LANCommander.Server/Controllers/Api/_BaseApiController.cs
index b4e45ee5..2909f017 100644
--- a/LANCommander.Server/Controllers/Api/_BaseApiController.cs
+++ b/LANCommander.Server/Controllers/Api/_BaseApiController.cs
@@ -1,18 +1,16 @@
-using LANCommander.Server.Services;
-using LANCommander.Server.Services.Models;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace LANCommander.Server.Controllers.Api
 {
     public abstract class BaseApiController : ControllerBase
     {
         protected readonly ILogger Logger;
-        protected readonly Settings Settings;
+        protected readonly SettingsProvider<Settings.Settings> SettingsProvider;
 
-        public BaseApiController(ILogger logger)
+        public BaseApiController(ILogger logger, SettingsProvider<Settings.Settings> settingsProvider)
         {
             Logger = logger;
-            Settings = SettingService.GetSettings();
+            SettingsProvider = settingsProvider;
         }
     }
 }
diff --git a/LANCommander.Server/Controllers/GamesController.cs b/LANCommander.Server/Controllers/GamesController.cs
index 706cfa6f..c2d9f6af 100644
--- a/LANCommander.Server/Controllers/GamesController.cs
+++ b/LANCommander.Server/Controllers/GamesController.cs
@@ -1,6 +1,6 @@
 using LANCommander.Server.Services;
 using Microsoft.AspNetCore.Authorization;
-using LANCommander.SDK.Enums;
+
 using LANCommander.Server.ImportExport.Factories;
 
 namespace LANCommander.Server.Controllers
@@ -13,8 +13,9 @@ namespace LANCommander.Server.Controllers
 
         public GamesController(
             ILogger<GamesController> logger,
+            SettingsProvider<Settings.Settings> settingsProvider,
             GameService gameService,
-            ExportContextFactory exportContextFactory) : base(logger)
+            ExportContextFactory exportContextFactory) : base(logger, settingsProvider)
         {
             GameService = gameService;
             ExportContextFactory = exportContextFactory;
diff --git a/LANCommander.Server/Controllers/RedistributablesController.cs b/LANCommander.Server/Controllers/RedistributablesController.cs
index 3bda1c00..1908f6d2 100644
--- a/LANCommander.Server/Controllers/RedistributablesController.cs
+++ b/LANCommander.Server/Controllers/RedistributablesController.cs
@@ -16,9 +16,10 @@ namespace LANCommander.Server.Controllers
 
         public RedistributablesController(
             ILogger<RedistributablesController> logger,
+            SettingsProvider<Settings.Settings> settingsProvider,
             IMapper mapper,
             RedistributableService redistributableService,
-            ArchiveClient archiveClient) : base(logger)
+            ArchiveClient archiveClient) : base(logger, settingsProvider)
         {
             Mapper = mapper;
             RedistributableService = redistributableService;
diff --git a/LANCommander.Server/Controllers/ServerController.cs b/LANCommander.Server/Controllers/ServerController.cs
index d2c194cd..aeedbe27 100644
--- a/LANCommander.Server/Controllers/ServerController.cs
+++ b/LANCommander.Server/Controllers/ServerController.cs
@@ -13,8 +13,9 @@ namespace LANCommander.Server.Controllers
 
         public ServerController(
             ILogger<ServerController> logger,
+            SettingsProvider<Settings.Settings> settingsProvider,
             IMapper mapper,
-            ServerService serverService) : base(logger)
+            ServerService serverService) : base(logger, settingsProvider)
         {
             ServerService = serverService;
             Mapper = mapper;
diff --git a/LANCommander.Server/Controllers/UploadController.cs b/LANCommander.Server/Controllers/UploadController.cs
index 7f170434..602d23d9 100644
--- a/LANCommander.Server/Controllers/UploadController.cs
+++ b/LANCommander.Server/Controllers/UploadController.cs
@@ -1,9 +1,5 @@
-using HarfBuzzSharp;
-using LANCommander.Server.Data.Models;
-using LANCommander.Server.Models;
-using LANCommander.Server.Services;
+using LANCommander.Server.Services;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using ZiggyCreatures.Caching.Fusion;
 
@@ -18,9 +14,10 @@ namespace LANCommander.Server.Controllers
 
         public UploadController(
             ILogger<UploadController> logger,
+            SettingsProvider<Settings.Settings> settingsProvider,
             StorageLocationService storageLocationService,
             ArchiveClient archiveClient,
-            IFusionCache cache) : base(logger)
+            IFusionCache cache) : base(logger, settingsProvider)
         {
             StorageLocationService = storageLocationService;
             _archiveClient = archiveClient;
diff --git a/LANCommander.Server/Controllers/_BaseController.cs b/LANCommander.Server/Controllers/_BaseController.cs
index 049f0853..304502b5 100644
--- a/LANCommander.Server/Controllers/_BaseController.cs
+++ b/LANCommander.Server/Controllers/_BaseController.cs
@@ -1,6 +1,4 @@
-using LANCommander.Server.Services;
-using LANCommander.Server.Services.Models;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System.Text.Json;
 
 namespace LANCommander.Server.Controllers
@@ -8,12 +6,11 @@ namespace LANCommander.Server.Controllers
     public abstract class BaseController : Controller
     {
         protected readonly ILogger Logger;
-        protected readonly Settings Settings;
+        protected readonly SettingsProvider<Settings.Settings> SettingsProvider;
 
-        public BaseController(ILogger logger)
+        public BaseController(ILogger logger, SettingsProvider<Settings.Settings> settingsProvider)
         {
             Logger = logger;
-            Settings = SettingService.GetSettings();
         }
 
         protected void Alert(string message, string type = "info", bool dismissable = true)
diff --git a/LANCommander.Server/Endpoints/SaveEndpoints.cs b/LANCommander.Server/Endpoints/SaveEndpoints.cs
index 5cf6120f..ea2c7363 100644
--- a/LANCommander.Server/Endpoints/SaveEndpoints.cs
+++ b/LANCommander.Server/Endpoints/SaveEndpoints.cs
@@ -209,13 +209,13 @@ public static class SaveEndpoints
         Guid gameId,
         ClaimsPrincipal userPrincipal,
         HttpContext httpContext,
+        [FromServices] SettingsProvider<Settings.Settings> settingsProvider,
         [FromServices] IMapper mapper,
         [FromServices] UserService userService,
         [FromServices] GameService gameService,
         [FromServices] StorageLocationService storageLocationService,
         [FromServices] GameSaveService saveService)
     {
-        var settings = SettingService.GetSettings();
         var user = await userService.GetAsync(userPrincipal?.Identity?.Name ?? string.Empty);
 
         if (user == null)
@@ -270,7 +270,7 @@ public static class SaveEndpoints
                     await stream.CopyToAsync(fs);
                 }
 
-                if (settings.UserSaves.MaxSaves > 0)
+                if (settingsProvider.CurrentValue.Server.UserSaves.MaxSaves > 0)
                 {
                     var savesToCull = await saveService
                         .Query(q =>
@@ -278,7 +278,7 @@ public static class SaveEndpoints
                             return q
                                 .Where(s => s.UserId == user.Id && s.GameId == game.Id)
                                 .OrderByDescending(s => s.CreatedOn)
-                                .Skip(settings.UserSaves.MaxSaves);
+                                .Skip(settingsProvider.CurrentValue.Server.UserSaves.MaxSaves);
                         })
                         .GetAsync();
 
diff --git a/LANCommander.Server/Endpoints/SettingsEndpoints.cs b/LANCommander.Server/Endpoints/SettingsEndpoints.cs
index 431ae8c7..4c1766e5 100644
--- a/LANCommander.Server/Endpoints/SettingsEndpoints.cs
+++ b/LANCommander.Server/Endpoints/SettingsEndpoints.cs
@@ -14,21 +14,20 @@ public static class SettingsEndpoints
     }
     
     public static async Task<IResult> GetAsync(
+        [FromServices] SettingsProvider<Settings.Settings> settingsProvider,
         [FromServices] ServerService serverService,
         [FromServices] IMapper mapper)
     {
-        var settings = SettingService.GetSettings();
-
         var clientSettings = new
         {
             IPXRelay = new
             {
-                Host = settings.IPXRelay.Host,
-                Port = settings.IPXRelay.Port,
+                Host = settingsProvider.CurrentValue.Server.IPXRelay.Host,
+                Port = settingsProvider.CurrentValue.Server.IPXRelay.Port,
             },
             Library = new
             {
-                EnableUserLibraries = settings.Library.EnableUserLibraries,
+                EnableUserLibraries = settingsProvider.CurrentValue.Server.Library.EnableUserLibraries,
             }
         };
 
diff --git a/LANCommander.Server/Extensions/HttpContextExtensions.cs b/LANCommander.Server/Extensions/HttpContextExtensions.cs
index 93bd1b3a..324e6ce4 100644
--- a/LANCommander.Server/Extensions/HttpContextExtensions.cs
+++ b/LANCommander.Server/Extensions/HttpContextExtensions.cs
@@ -1,5 +1,6 @@
 using LANCommander.Server.Services;
 using LANCommander.Server.Services.Models;
+using LANCommander.Server.Settings.Models;
 using Microsoft.AspNetCore.Authentication;
 
 namespace LANCommander.Server.Extensions
@@ -8,9 +9,9 @@ namespace LANCommander.Server.Extensions
     {
         public static IEnumerable<AuthenticationProvider> GetExternalProviders(this HttpContext context)
         {
-            var settings = SettingService.GetSettings();
+            var settingsProvider = context.RequestServices.GetRequiredService<SettingsProvider<Settings.Settings>>();
             
-            return settings.Authentication.AuthenticationProviders;
+            return settingsProvider.CurrentValue.Server.Authentication.AuthenticationProviders;
         }
 
         public static async Task<bool> IsProviderSupportedAsync(this HttpContext context, string provider)
diff --git a/LANCommander.Server/Jobs/Background/DownloadLauncherArtifacts.cs b/LANCommander.Server/Jobs/Background/DownloadLauncherArtifacts.cs
index d38628e2..450c6f42 100644
--- a/LANCommander.Server/Jobs/Background/DownloadLauncherArtifacts.cs
+++ b/LANCommander.Server/Jobs/Background/DownloadLauncherArtifacts.cs
@@ -6,9 +6,9 @@ namespace LANCommander.Server.Jobs.Background
 {
     public class DownloadLauncherArtifacts(
         ILogger<DownloadLauncherArtifacts> logger,
+        SettingsProvider<Settings.Settings> settingsProvider,
         HttpClient httpClient,
-        UpdateService updateService,
-        Settings settings) : BaseBackgroundJob(logger)
+        UpdateService updateService) : BaseBackgroundJob(logger)
     {
         public override async Task ExecuteAsync()
         {
@@ -16,8 +16,8 @@ namespace LANCommander.Server.Jobs.Background
             var localArtifacts = updateService.GetLauncherArtifactsFromLocalFiles();
 
             var allowedArtifacts = artifacts.Where(a =>
-                settings.Launcher.Architectures.Contains(a.Architecture) &&
-                settings.Launcher.Platforms.Contains(a.Platform))
+                settingsProvider.CurrentValue.Server.Launcher.Architectures.Contains(a.Architecture) &&
+                settingsProvider.CurrentValue.Server.Launcher.Platforms.Contains(a.Platform))
                 .ToList();
 
             foreach (var artifact in allowedArtifacts)
@@ -27,7 +27,7 @@ namespace LANCommander.Server.Jobs.Background
                     if (!localArtifacts.Any(a => a.Name.EndsWith(artifact.Name)))
                     {
                         using (var downloadStream = await httpClient.GetStreamAsync(artifact.Url))
-                        using (var fs = new FileStream(Path.Combine(settings.Launcher.StoragePath, artifact.Name), FileMode.Create))
+                        using (var fs = new FileStream(Path.Combine(settingsProvider.CurrentValue.Server.Launcher.StoragePath, artifact.Name), FileMode.Create))
                         {
                             await downloadStream.CopyToAsync(fs);
                             op.Complete();
diff --git a/LANCommander.Server/Jobs/Recurring/AutomaticRepackage.cs b/LANCommander.Server/Jobs/Recurring/AutomaticRepackage.cs
index f1f83140..b9027714 100644
--- a/LANCommander.Server/Jobs/Recurring/AutomaticRepackage.cs
+++ b/LANCommander.Server/Jobs/Recurring/AutomaticRepackage.cs
@@ -5,6 +5,7 @@ using LANCommander.Server.Services;
 namespace LANCommander.Server.Jobs.Recurring;
 
 public sealed class AutomaticRepackage(
+    SettingsProvider<Settings.Settings> settingsProvider,
     GameService gameService,
     ScriptService scriptService,
     ILogger<AutomaticRepackage> logger) : BaseRecurringJob(logger)
@@ -13,10 +14,8 @@ public sealed class AutomaticRepackage(
     {
         get
         {
-            var settings = SettingService.GetSettings();
-
-            var minutes = settings.Scripts.RepackageEvery % 60;
-            var hours = settings.Scripts.RepackageEvery / 60;
+            var minutes = settingsProvider.CurrentValue.Server.Scripts.RepackageEvery % 60;
+            var hours = settingsProvider.CurrentValue.Server.Scripts.RepackageEvery / 60;
             var days = hours % 24;
 
             var minuteExpression = minutes > 0 ? $"*/{minutes}" : "*";
@@ -29,9 +28,7 @@ public sealed class AutomaticRepackage(
 
     public override async Task ExecuteAsync()
     {
-        var settings = SettingService.GetSettings();
-
-        if (!settings.Scripts.EnableAutomaticRepackaging)
+        if (!settingsProvider.CurrentValue.Server.Scripts.EnableAutomaticRepackaging)
         {
             logger.LogWarning("The automatic repackaging job attempted to execute, but automatic repackaging is disabled");
             return;
diff --git a/LANCommander.Server/LANCommander.Server.csproj b/LANCommander.Server/LANCommander.Server.csproj
index 786da9ce..f407a557 100644
--- a/LANCommander.Server/LANCommander.Server.csproj
+++ b/LANCommander.Server/LANCommander.Server.csproj
@@ -130,6 +130,7 @@
     <ProjectReference Include="..\LANCommander.Server.Data\LANCommander.Server.Data.csproj" />
     <ProjectReference Include="..\LANCommander.Server.ImportExport\LANCommander.Server.ImportExport.csproj" />
     <ProjectReference Include="..\LANCommander.Server.Services\LANCommander.Server.Services.csproj" />
+    <ProjectReference Include="..\LANCommander.Server.Settings\LANCommander.Server.Settings.csproj" />
     <ProjectReference Include="..\LANCommander.ServiceDefaults\LANCommander.ServiceDefaults.csproj" />
     <ProjectReference Include="..\LANCommander.Steam\LANCommander.Steam.csproj" />
     <ProjectReference Include="..\LANCommander.UI\LANCommander.UI.csproj" />
diff --git a/LANCommander.Server/LANCommanderMappingProfile.cs b/LANCommander.Server/LANCommanderMappingProfile.cs
index 6eb6a115..4780c7bb 100644
--- a/LANCommander.Server/LANCommanderMappingProfile.cs
+++ b/LANCommander.Server/LANCommanderMappingProfile.cs
@@ -48,7 +48,7 @@ namespace LANCommander.Server
                     dest.Cover,
                     opt => opt.MapFrom(src => src.Media.Where(m => m.Type == SDK.Enums.MediaType.Cover).FirstOrDefault()));
 
-            CreateMap<Services.Models.AuthenticationProvider, SDK.Models.AuthenticationProvider>();
+            CreateMap<Settings.Models.AuthenticationProvider, SDK.Models.AuthenticationProvider>();
 
             CreateMap<Data.Models.Game, EntityReference>()
                 .ForMember(dest => dest.Name,
diff --git a/LANCommander.Server/Logging/GameServerHubConnection.cs b/LANCommander.Server/Logging/GameServerHubConnection.cs
deleted file mode 100644
index 6014eb91..00000000
--- a/LANCommander.Server/Logging/GameServerHubConnection.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using LANCommander.Server.Services;
-using Microsoft.AspNetCore.SignalR.Client;
-
-namespace LANCommander.Logging
-{
-    public class GameServerHubConnection : IAsyncDisposable
-    {
-        private HubConnection? HubConnection;
-        private string HubUrl;
-
-        public GameServerHubConnection(string hubUrl)
-        {
-            var settings = SettingService.GetSettings();
-
-            HubUrl = hubUrl.Replace("${gdc:PortNumber}", settings.Port.ToString());
-        }
-
-        public async Task Log(Guid serverId, string message)
-        {
-            await EnsureConnection();
-
-            if (HubConnection != null)
-                await HubConnection.SendAsync("Log", serverId, message);
-        }
-
-        public async Task EnsureConnection()
-        {
-            if (HubConnection == null)
-            {
-                HubConnection = new HubConnectionBuilder()
-                .WithUrl(HubUrl)
-                .Build();
-
-                await HubConnection.StartAsync();
-            }
-            else if (HubConnection.State == HubConnectionState.Disconnected)
-            {
-                await HubConnection.StartAsync();
-            }
-        }
-
-        public async ValueTask DisposeAsync()
-        {
-            if (HubConnection != null)
-            {
-                try
-                {
-                    await HubConnection.StopAsync();
-                    await HubConnection.DisposeAsync();
-                }
-                catch (Exception ex)
-                {
-                    // NLog.Common.InternalLogger?.LogError(ex, "Exception in LoggingHubConnection.DisposeAsync");
-                }
-                finally
-                {
-                    HubConnection = null;
-                }
-            }
-        }
-    }
-}
diff --git a/LANCommander.Server/Logging/LoggingHubConnection.cs b/LANCommander.Server/Logging/LoggingHubConnection.cs
deleted file mode 100644
index 85be7542..00000000
--- a/LANCommander.Server/Logging/LoggingHubConnection.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using LANCommander.Server.Services;
-using Microsoft.AspNetCore.SignalR.Client;
-
-namespace LANCommander.Logging
-{
-    public class LoggingHubConnection : IAsyncDisposable
-    {
-        private HubConnection? HubConnection;
-        private string HubUrl;
-
-        public LoggingHubConnection(string hubUrl)
-        {
-            var settings = SettingService.GetSettings();
-
-            HubUrl = hubUrl.Replace("${gdc:PortNumber}", settings.Port.ToString());
-        }
-
-        public async Task Log(string message)
-        {
-            await EnsureConnection();
-
-            if (HubConnection != null)
-                await HubConnection.SendAsync("Log", message);
-        }
-
-        public async Task EnsureConnection()
-        {
-            if (HubConnection == null)
-            {
-                HubConnection = new HubConnectionBuilder()
-                    .WithUrl(HubUrl)
-                    .Build();
-
-                await HubConnection.StartAsync();
-            }
-            else if (HubConnection.State == HubConnectionState.Disconnected)
-            {
-                await HubConnection.StartAsync();
-            }
-        }
-
-        public async ValueTask DisposeAsync()
-        {
-            if (HubConnection != null)
-            {
-                try
-                {
-                    await HubConnection.StopAsync();
-                    await HubConnection.DisposeAsync();
-                }
-                catch (Exception ex)
-                {
-                    // NLog.Common.InternalLogger?.LogError(ex, "Exception in LoggingHubConnection.DisposeAsync");
-                }
-                finally
-                {
-                    HubConnection = null;
-                }
-            }
-        }
-    }
-}
diff --git a/LANCommander.Server/Program.cs b/LANCommander.Server/Program.cs
index 4debafb2..c0854604 100644
--- a/LANCommander.Server/Program.cs
+++ b/LANCommander.Server/Program.cs
@@ -1,7 +1,4 @@
-using LANCommander.Server;
-using LANCommander.Server.Services;
 using Serilog;
-using LANCommander.Server.Services.Models;
 using LANCommander.Server.UI;
 using LANCommander.Server.Startup;
 
@@ -10,28 +7,25 @@ var builder = WebApplication.CreateBuilder(args);
 if (args.Contains("--debugger"))
     builder.WaitForDebugger();
 
-if (args.Contains("--docker"))
-    SettingService.WorkingDirectory = "/app/config";
-
 builder.AddAsService();
 builder.AddLogger();
 
-Settings settings;
-
-builder.AddSettings(out settings);
+builder.AddSettings();
 
 builder.AddRazor();
 builder.AddSignalR();
 builder.AddCors();
 builder.AddControllers();
 builder.ConfigureKestrel();
-builder.ConfigureAuthentication(settings);
-builder.AddIdentity(settings);
+builder.ConfigureAuthentication();
+builder.AddIdentity();
 builder.AddHangfire();
 builder.AddOpenApi();
 builder.AddServerProcessStatusMonitor();
-builder.AddLANCommanderServices(settings);
-builder.AddDatabase(settings, args);
+builder.AddLANCommanderServices();
+builder.AddDatabase(args);
+
+builder.Services.AddHealthChecks();
 
 Log.Debug("Building Application");
 var app = builder.Build();
@@ -39,6 +33,8 @@ var app = builder.Build();
 app.UseCors("CorsPolicy");
 app.UseHttpsRedirection();
 
+app.MapHealthChecks("/Health");
+
 app.UseMiddlewares();
 
 // Configure the HTTP request pipeline.
diff --git a/LANCommander.Server/Providers/VersionProvider.cs b/LANCommander.Server/Providers/VersionProvider.cs
index 86a15ef1..a4c4abc2 100644
--- a/LANCommander.Server/Providers/VersionProvider.cs
+++ b/LANCommander.Server/Providers/VersionProvider.cs
@@ -3,6 +3,7 @@ using System.Reflection;
 using LANCommander.Server.Services;
 using LANCommander.Server.Services.Abstractions;
 using LANCommander.Server.Services.Models;
+using LANCommander.Server.Settings.Enums;
 using Semver;
 
 namespace LANCommander.Server.Providers;
diff --git a/LANCommander.Server/Startup/ApplicationSettings.cs b/LANCommander.Server/Startup/ApplicationSettings.cs
index 265ebf1c..40c6c385 100644
--- a/LANCommander.Server/Startup/ApplicationSettings.cs
+++ b/LANCommander.Server/Startup/ApplicationSettings.cs
@@ -1,46 +1,40 @@
-using LANCommander.Server.Services;
-using LANCommander.Server.Services.Models;
+using LANCommander.SDK;
 using Serilog;
+using YamlDotNet.Serialization;
+using YamlDotNet.Serialization.NamingConventions;
 
 namespace LANCommander.Server.Startup;
 
 public static class ApplicationSettings
 {
-    public static WebApplicationBuilder AddSettings(this WebApplicationBuilder builder, out Settings settings)
+    public static WebApplicationBuilder AddSettings(this WebApplicationBuilder builder)
     {
-        // Ensure that our default settings are persisted
-        if (!File.Exists(SettingService.SettingsFile))
+        var filePath = Path.Join(AppPaths.GetConfigDirectory(), SDK.Models.Settings.SETTINGS_FILE_NAME);
+        var settings = new Settings.Settings();
+
+        if (!File.Exists(filePath))
         {
-            var workingDirectory = Path.GetDirectoryName(SettingService.SettingsFile);
-    
-            if (!String.IsNullOrWhiteSpace(workingDirectory))
-                Directory.CreateDirectory(workingDirectory);
-    
-            settings = new Settings();
-            SettingService.SaveSettings(settings);
+            var serializer = new SerializerBuilder()
+                .WithNamingConvention(PascalCaseNamingConvention.Instance)
+                .Build();
+            
+            File.WriteAllText(filePath, serializer.Serialize(settings));
         }
+
+        var boostrap = new ConfigurationBuilder()
+            .AddYamlFile(filePath, false, true)
+            .Build();
         
-        builder.Configuration.AddYamlFile(SettingService.SettingsFile);
-        builder.Services.Configure<Settings>(builder.Configuration);
-        
-        settings = new Settings();
+        builder.Services.Configure<Settings.Settings>(boostrap);
         builder.Configuration.Bind(settings);
-        
-        // Add services to the container.
-        Log.Debug("Loading settings");
 
         Log.Debug("Validating settings");
         
-        if (settings.Authentication.TokenSecret.Length < 16)
+        if (settings.Server.Authentication.TokenSecret.Length < 16)
         {
             Log.Debug("JWT token secret is too short. Regenerating...");
-            settings.Authentication.TokenSecret = Guid.NewGuid().ToString();
-            SettingService.SaveSettings(settings);
+            settings.Server.Authentication.TokenSecret = Guid.NewGuid().ToString();
         }
-        
-        Log.Debug("Done validating settings");
-        
-        builder.Services.AddSingleton(settings);
 
         return builder;
     }
diff --git a/LANCommander.Server/Startup/Authentication.cs b/LANCommander.Server/Startup/Authentication.cs
index 674a62ee..af1b6342 100644
--- a/LANCommander.Server/Startup/Authentication.cs
+++ b/LANCommander.Server/Startup/Authentication.cs
@@ -5,6 +5,8 @@ using LANCommander.Server.Data.Models;
 using LANCommander.Server.Models;
 using LANCommander.Server.Services;
 using LANCommander.Server.Services.Models;
+using LANCommander.Server.Settings.Enums;
+using LANCommander.Server.Settings.Models;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
@@ -15,27 +17,27 @@ namespace LANCommander.Server.Startup;
 
 public static class Authentication
 {
-    public static WebApplicationBuilder ConfigureAuthentication(this WebApplicationBuilder builder, Settings settings)
+    public static WebApplicationBuilder ConfigureAuthentication(this WebApplicationBuilder builder)
     {
         builder.Services.AddCascadingAuthenticationState();
 
         return builder;
     }
     
-    public static AuthenticationBuilder AddAuthenticationProviders(this AuthenticationBuilder authBuilder, Settings settings)
+    public static AuthenticationBuilder AddAuthenticationProviders(this AuthenticationBuilder authBuilder, Settings.Settings settings)
     {
-        foreach (var authenticationProvider in settings.Authentication.AuthenticationProviders)
+        foreach (var authenticationProvider in settings.Server.Authentication.AuthenticationProviders)
         {
             try
             {
                 switch (authenticationProvider.Type)
                 {
                     case AuthenticationProviderType.OAuth2:
-                        authBuilder.AddOAuth(authenticationProvider);
+                        authBuilder.AddOAuth(authenticationProvider, settings);
                         break;
 
                     case AuthenticationProviderType.OpenIdConnect:
-                        authBuilder.AddOpenIdConnect(authenticationProvider);
+                        authBuilder.AddOpenIdConnect(authenticationProvider, settings);
                         break;
 
                     case AuthenticationProviderType.Saml:
@@ -53,7 +55,7 @@ public static class Authentication
         return authBuilder;
     }
     
-    public static AuthenticationBuilder AddOpenIdConnect(this AuthenticationBuilder authBuilder, AuthenticationProvider authenticationProvider)
+    public static AuthenticationBuilder AddOpenIdConnect(this AuthenticationBuilder authBuilder, AuthenticationProvider authenticationProvider, Settings.Settings settings)
     {
         if (String.IsNullOrWhiteSpace(authenticationProvider.Slug))
             return authBuilder;
@@ -68,29 +70,27 @@ public static class Authentication
             {
                 ValidateIssuer = false
             };
-
-            var settings = SettingService.GetSettings();
             
             options.CorrelationCookie.SecurePolicy = CookieSecurePolicy.SameAsRequest;
             options.NonceCookie.SecurePolicy = CookieSecurePolicy.SameAsRequest;
 
             if (options.MetadataAddress.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
             {
-                options.CorrelationCookie.SameSite = settings.Authentication.HttpsCookiePolicy.SameSite;
-                options.CorrelationCookie.SecurePolicy = settings.Authentication.HttpsCookiePolicy.Secure;
+                options.CorrelationCookie.SameSite = settings.Server.Authentication.HttpsCookiePolicy.SameSite;
+                options.CorrelationCookie.SecurePolicy = settings.Server.Authentication.HttpsCookiePolicy.Secure;
                 
-                options.NonceCookie.SameSite = settings.Authentication.HttpsCookiePolicy.SameSite;
-                options.NonceCookie.SecurePolicy = settings.Authentication.HttpsCookiePolicy.Secure;
+                options.NonceCookie.SameSite = settings.Server.Authentication.HttpsCookiePolicy.SameSite;
+                options.NonceCookie.SecurePolicy = settings.Server.Authentication.HttpsCookiePolicy.Secure;
                 
                 options.ResponseMode = OpenIdConnectResponseMode.Query;
             }
             else
             {
-                options.CorrelationCookie.SameSite = settings.Authentication.HttpCookiePolicy.SameSite;
-                options.CorrelationCookie.SecurePolicy = settings.Authentication.HttpCookiePolicy.Secure;
+                options.CorrelationCookie.SameSite = settings.Server.Authentication.HttpCookiePolicy.SameSite;
+                options.CorrelationCookie.SecurePolicy = settings.Server.Authentication.HttpCookiePolicy.Secure;
                 
-                options.NonceCookie.SameSite = settings.Authentication.HttpCookiePolicy.SameSite;
-                options.NonceCookie.SecurePolicy = settings.Authentication.HttpCookiePolicy.Secure;
+                options.NonceCookie.SameSite = settings.Server.Authentication.HttpCookiePolicy.SameSite;
+                options.NonceCookie.SecurePolicy = settings.Server.Authentication.HttpCookiePolicy.Secure;
                 
                 options.ResponseMode = OpenIdConnectResponseMode.Query;
             }
@@ -131,7 +131,7 @@ public static class Authentication
     }
 
     public static AuthenticationBuilder AddOAuth(this AuthenticationBuilder authBuilder,
-        AuthenticationProvider authenticationProvider)
+        AuthenticationProvider authenticationProvider, Settings.Settings settings)
     {
         if (String.IsNullOrWhiteSpace(authenticationProvider.Slug))
             return authBuilder;
diff --git a/LANCommander.Server/Startup/Beacon.cs b/LANCommander.Server/Startup/Beacon.cs
index eb5f8fbe..e7e2b8f3 100644
--- a/LANCommander.Server/Startup/Beacon.cs
+++ b/LANCommander.Server/Startup/Beacon.cs
@@ -1,6 +1,6 @@
 using LANCommander.SDK;
+using LANCommander.SDK.Interceptors;
 using LANCommander.SDK.Services;
-using LANCommander.Server.Interceptors;
 using LANCommander.Server.Services;
 
 namespace LANCommander.Server.Startup;
@@ -9,13 +9,14 @@ public static class Beacon
 {
     public static async Task StartBeaconAsync(this WebApplication app)
     {
-        var settings = SettingService.GetSettings();
+        var settingsProvider = app.Services.GetRequiredService<SettingsProvider<Settings.Settings>>();
         var beaconService = app.Services.GetRequiredService<BeaconClient>();
+        var interceptor = app.Services.GetRequiredService<IBeaconMessageInterceptor>();
         
         beaconService.Initialize();
-        beaconService.AddBeaconMessageInterceptor(new BeaconMessageInterceptor());
+        beaconService.AddBeaconMessageInterceptor(interceptor);
 
-        if (settings.Beacon.Enabled)
-            await beaconService.StartBeaconAsync(settings.Beacon.Port, settings.Beacon.Address, settings.Beacon.Name);
+        if (settingsProvider.CurrentValue.Server.Beacon.Enabled)
+            await beaconService.StartBeaconAsync(settingsProvider.CurrentValue.Server.Beacon.Port, settingsProvider.CurrentValue.Server.Beacon.Address, settingsProvider.CurrentValue.Server.Beacon.Name);
     }
 }
\ No newline at end of file
diff --git a/LANCommander.Server/Startup/Database.cs b/LANCommander.Server/Startup/Database.cs
index 153ea092..79312fb2 100644
--- a/LANCommander.Server/Startup/Database.cs
+++ b/LANCommander.Server/Startup/Database.cs
@@ -4,6 +4,7 @@ using LANCommander.Server.Data.Enums;
 using LANCommander.Server.Data.Models;
 using LANCommander.Server.Services;
 using LANCommander.Server.Services.Models;
+using LANCommander.Server.Settings.Enums;
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Octokit;
@@ -13,8 +14,11 @@ namespace LANCommander.Server.Startup;
 
 public static class Database
 {
-    public static WebApplicationBuilder AddDatabase(this WebApplicationBuilder builder, Settings settings, string[] args)
+    public static WebApplicationBuilder AddDatabase(this WebApplicationBuilder builder, string[] args)
     {
+        var settings = new Settings.Settings();
+        builder.Configuration.Bind(settings);
+        
         builder.Services.AddDbContextFactory<DatabaseContext>();
         builder.Services.AddDbContext<DatabaseContext>();
         builder.Services.AddDatabaseDeveloperPageExceptionFilter();
@@ -25,12 +29,12 @@ public static class Database
         if (!String.IsNullOrWhiteSpace(databaseProviderParameter))
             DatabaseContext.Provider = Enum.Parse<DatabaseProvider>(databaseProviderParameter);
         else
-            DatabaseContext.Provider = settings.DatabaseProvider;
+            DatabaseContext.Provider = settings.Server.Database.Provider;
 
         if (!String.IsNullOrWhiteSpace(connectionStringParameter))
             DatabaseContext.ConnectionString = connectionStringParameter;
         else
-            DatabaseContext.ConnectionString = settings.DatabaseConnectionString;
+            DatabaseContext.ConnectionString = settings.Server.Database.ConnectionString;
 
         return builder;
     }
@@ -42,14 +46,14 @@ public static class Database
             using var scope = app.Services.CreateAsyncScope();
             using var db = scope.ServiceProvider.GetRequiredService<DatabaseContext>();
             var logger = scope.ServiceProvider.GetRequiredService<ILogger<Program>>();
-            var settings = scope.ServiceProvider.GetRequiredService<Settings>();
+            var settingsProvider = scope.ServiceProvider.GetRequiredService<SettingsProvider<Settings.Settings>>();
             logger.LogDebug("Migrating database if required");
 
             if ((await db.Database.GetPendingMigrationsAsync()).Any())
             {
                 if (DatabaseContext.Provider == DatabaseProvider.SQLite)
                 {
-                    var dataSource = new SqliteConnectionStringBuilder(settings.DatabaseConnectionString).DataSource;
+                    var dataSource = new SqliteConnectionStringBuilder(settingsProvider.CurrentValue.Server.Database.ConnectionString).DataSource;
 
                     var backupName = Path.Combine("Backups", $"LANCommander.db.{DateTime.Now.ToString("dd-MM-yyyy-HH.mm.ss.bak")}");
 
diff --git a/LANCommander.Server/Startup/Filesystem.cs b/LANCommander.Server/Startup/Filesystem.cs
index 9fc1c638..954575c4 100644
--- a/LANCommander.Server/Startup/Filesystem.cs
+++ b/LANCommander.Server/Startup/Filesystem.cs
@@ -1,4 +1,5 @@
 using LANCommander.Server.Services.Models;
+using Microsoft.Extensions.Options;
 
 namespace LANCommander.Server.Startup;
 
@@ -6,15 +7,15 @@ public static class Filesystem
 {
     public static WebApplication PrepareDirectories(this WebApplication app)
     {
-        var settings = app.Services.GetRequiredService<Settings>();
+        var settings = app.Services.GetRequiredService<IOptions<Settings.Settings>>();
         var logger = app.Services.GetRequiredService<ILogger<Program>>();
         
         logger.LogDebug("Ensuring required directories exist");
 
         IEnumerable<string> directories = [
-            settings.Update.StoragePath,
-            settings.Launcher.StoragePath,
-            settings.Backups.StoragePath,
+            settings.Value.Server.Update.StoragePath,
+            settings.Value.Server.Launcher.StoragePath,
+            settings.Value.Server.Backups.StoragePath,
             "Snippets",
         ];
 
diff --git a/LANCommander.Server/Startup/Identity.cs b/LANCommander.Server/Startup/Identity.cs
index 787285bb..cb461a12 100644
--- a/LANCommander.Server/Startup/Identity.cs
+++ b/LANCommander.Server/Startup/Identity.cs
@@ -9,19 +9,22 @@ namespace LANCommander.Server.Startup;
 
 public static class Identity
 {
-    public static WebApplicationBuilder AddIdentity(this WebApplicationBuilder builder, Settings settings)
+    public static WebApplicationBuilder AddIdentity(this WebApplicationBuilder builder)
     {
+        var settings = new Settings.Settings();
+        builder.Configuration.Bind(settings);
+        
         Log.Debug("Initializing Identity");
         builder.Services.AddIdentityCore<User>((options) =>
         {
             options.SignIn.RequireConfirmedAccount = false;
             options.SignIn.RequireConfirmedEmail = false;
 
-            options.Password.RequireNonAlphanumeric = settings.Authentication.PasswordRequireNonAlphanumeric;
-            options.Password.RequireLowercase = settings.Authentication.PasswordRequireLowercase;
-            options.Password.RequireUppercase = settings.Authentication.PasswordRequireUppercase;
-            options.Password.RequireDigit = settings.Authentication.PasswordRequireDigit;
-            options.Password.RequiredLength = settings.Authentication.PasswordRequiredLength;
+            options.Password.RequireNonAlphanumeric = settings.Server.Authentication.PasswordRequireNonAlphanumeric;
+            options.Password.RequireLowercase = settings.Server.Authentication.PasswordRequireLowercase;
+            options.Password.RequireUppercase = settings.Server.Authentication.PasswordRequireUppercase;
+            options.Password.RequireDigit = settings.Server.Authentication.PasswordRequireDigit;
+            options.Password.RequiredLength = settings.Server.Authentication.PasswordRequiredLength;
         })
         .AddRoles<Role>()
         .AddEntityFrameworkStores<Data.DatabaseContext>()
@@ -47,7 +50,7 @@ public static class Identity
                     ValidateAudience = false,
                     // ValidAudience = configuration["JWT:ValidAudience"],
                     // ValidIssuer = configuration["JWT:ValidIssuer"],
-                    IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(settings.Authentication.TokenSecret))
+                    IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(settings.Server.Authentication.TokenSecret))
                 };
             })
             .AddAuthenticationProviders(settings)
@@ -60,15 +63,15 @@ public static class Identity
         
         builder.Services.Configure<CookiePolicyOptions>(options =>
         {
-            if (settings.UseSSL)
+            if (settings.Server.Http.UseSSL)
             {
-                options.Secure = settings.Authentication.HttpsCookiePolicy.Secure;
-                options.MinimumSameSitePolicy = settings.Authentication.HttpsCookiePolicy.SameSite;
+                options.Secure = settings.Server.Authentication.HttpsCookiePolicy.Secure;
+                options.MinimumSameSitePolicy = settings.Server.Authentication.HttpsCookiePolicy.SameSite;
             }
             else
             {
-                options.Secure = settings.Authentication.HttpCookiePolicy.Secure;
-                options.MinimumSameSitePolicy = settings.Authentication.HttpCookiePolicy.SameSite;
+                options.Secure = settings.Server.Authentication.HttpCookiePolicy.Secure;
+                options.MinimumSameSitePolicy = settings.Server.Authentication.HttpCookiePolicy.SameSite;
             }
         });
 
@@ -78,15 +81,15 @@ public static class Identity
             options.LogoutPath = "/Logout";
             options.AccessDeniedPath = "/AccessDenied";
             
-            if (settings.UseSSL)
+            if (settings.Server.Http.UseSSL)
             {
-                options.Cookie.SecurePolicy = settings.Authentication.HttpsCookiePolicy.Secure;
-                options.Cookie.SameSite = settings.Authentication.HttpsCookiePolicy.SameSite;
+                options.Cookie.SecurePolicy = settings.Server.Authentication.HttpsCookiePolicy.Secure;
+                options.Cookie.SameSite = settings.Server.Authentication.HttpsCookiePolicy.SameSite;
             }
             else
             {
-                options.Cookie.SecurePolicy = settings.Authentication.HttpCookiePolicy.Secure;
-                options.Cookie.SameSite = settings.Authentication.HttpCookiePolicy.SameSite;
+                options.Cookie.SecurePolicy = settings.Server.Authentication.HttpCookiePolicy.Secure;
+                options.Cookie.SameSite = settings.Server.Authentication.HttpCookiePolicy.SameSite;
             }
         });
 
diff --git a/LANCommander.Server/Startup/Kestrel.cs b/LANCommander.Server/Startup/Kestrel.cs
index a32c9dd5..2a62c22e 100644
--- a/LANCommander.Server/Startup/Kestrel.cs
+++ b/LANCommander.Server/Startup/Kestrel.cs
@@ -8,23 +8,23 @@ public static class Kestrel
 {
     public static WebApplicationBuilder ConfigureKestrel(this WebApplicationBuilder builder)
     {
-        var settings = builder.Configuration.Get<Settings>();
+        var settings = builder.Configuration.Get<Settings.Settings>();
 
-        if (settings?.UseSSL ?? false)
-            builder.WebHost.UseUrls($"http://*:{settings.Port}", $"https://*:{settings.SSLPort}");
+        if (settings?.Server.Http.UseSSL ?? false)
+            builder.WebHost.UseUrls($"http://*:{settings.Server.Http.Port}", $"https://*:{settings.Server.Http.SSLPort}");
         else
-            builder.WebHost.UseUrls($"http://*:{settings.Port}");
+            builder.WebHost.UseUrls($"http://*:{settings.Server.Http.Port}");
         
         builder.WebHost.ConfigureKestrel(options =>
         {
             options.Limits.MaxRequestBodySize = long.MaxValue;
             options.Limits.RequestHeadersTimeout = TimeSpan.FromMinutes(5);
             
-            if (settings.UseSSL)
+            if (settings.Server.Http.UseSSL)
             {
-                options.Listen(IPAddress.Any, settings.SSLPort, listenOptions =>
+                options.Listen(IPAddress.Any, settings.Server.Http.SSLPort, listenOptions =>
                 {
-                    listenOptions.UseHttps(settings.CertificatePath, settings.CertificatePassword);
+                    listenOptions.UseHttps(settings.Server.Http.CertificatePath, settings.Server.Http.CertificatePassword);
                 });
             }
         });
diff --git a/LANCommander.Server/Startup/Logger.cs b/LANCommander.Server/Startup/Logger.cs
index 68239219..9f3f922b 100644
--- a/LANCommander.Server/Startup/Logger.cs
+++ b/LANCommander.Server/Startup/Logger.cs
@@ -3,6 +3,8 @@ using LANCommander.Server.Configuration;
 using LANCommander.Server.Hubs;
 using LANCommander.Server.Parsers;
 using LANCommander.Server.Services.Models;
+using LANCommander.Server.Settings.Enums;
+using Microsoft.Extensions.Options;
 using Serilog;
 using Serilog.Events;
 using Serilog.Filters;
@@ -26,12 +28,12 @@ public static class Logger
             config.MinimumLevel.Verbose();
             config.Enrich.FromLogContext();
             
-            var settings = serviceProvider.GetRequiredService<Settings>();
+            var settings = serviceProvider.GetRequiredService<IOptions<Settings.Settings>>();
             
-            if (settings.Logs.IgnorePings)
+            if (settings.Value.Server.Logs.IgnorePings)
                 config.Filter.ByExcluding(Matching.WithProperty<string>("RequestPath", v => v.StartsWith("/api/Ping", StringComparison.OrdinalIgnoreCase)));
 
-            foreach (var provider in settings.Logs.Providers)
+            foreach (var provider in settings.Value.Server.Logs.Providers)
             {
                 LogEventLevel minimumLevel = provider.MinimumLevel switch
                 {
diff --git a/LANCommander.Server/Startup/Servers.cs b/LANCommander.Server/Startup/Servers.cs
index 01f8ad3a..3542068b 100644
--- a/LANCommander.Server/Startup/Servers.cs
+++ b/LANCommander.Server/Startup/Servers.cs
@@ -4,6 +4,7 @@ using LANCommander.Server.Data.Enums;
 using LANCommander.Server.Hubs;
 using LANCommander.Server.Services;
 using LANCommander.Server.Services.Abstractions;
+using LANCommander.Server.Settings.Enums;
 using Microsoft.AspNetCore.SignalR;
 
 namespace LANCommander.Server.Startup;
diff --git a/LANCommander.Server/Startup/Services.cs b/LANCommander.Server/Startup/Services.cs
index ca53fb80..098eb007 100644
--- a/LANCommander.Server/Startup/Services.cs
+++ b/LANCommander.Server/Startup/Services.cs
@@ -1,10 +1,8 @@
 using LANCommander.SDK.Extensions;
 using LANCommander.Server.ImportExport.Extensions;
 using LANCommander.Server.Providers;
-using LANCommander.Server.Services;
 using LANCommander.Server.Services.Abstractions;
 using LANCommander.Server.Services.Extensions;
-using LANCommander.Server.Services.Models;
 using LANCommander.UI.Extensions;
 using Serilog;
 
@@ -12,13 +10,13 @@ namespace LANCommander.Server.Startup;
 
 public static class Services
 {
-    public static WebApplicationBuilder AddLANCommanderServices(this WebApplicationBuilder builder, Settings settings)
+    public static WebApplicationBuilder AddLANCommanderServices(this WebApplicationBuilder builder)
     {
         Log.Debug("Registering services");
         
-        builder.Services.AddLANCommanderServer(settings);
+        builder.Services.AddLANCommanderServer();
         builder.Services.AddLANCommanderImportExport();
-        builder.Services.AddLANCommanderClient<SDK.Models.Settings>();
+        builder.Services.AddLANCommanderClient<Settings.Settings>();
         builder.Services.AddLANCommanderUI();
 
         builder.Services.AddSingleton<IVersionProvider, VersionProvider>();
diff --git a/LANCommander.Server/UI/App.razor b/LANCommander.Server/UI/App.razor
index a190999f..3dd3b2c8 100644
--- a/LANCommander.Server/UI/App.razor
+++ b/LANCommander.Server/UI/App.razor
@@ -1,15 +1,9 @@
 @using LANCommander.Server.Data
-@using LANCommander.Server.Services
-@using LANCommander.Server.Services.Models
-@using Microsoft.AspNetCore.Components.Authorization
-@using Microsoft.AspNetCore.Components.Web
-@using System.Security.Claims
+@using LANCommander.Server.Settings
+@using LANCommander.Server.Settings.Enums
+@using Microsoft.Extensions.Options
 @inject NavigationManager NavigationManager
-@inject IHttpContextAccessor HttpContextAccessor
-
-@{
-    var settings = SettingService.GetSettings();
-}
+@inject IOptions<Settings> Settings
 
 <!DOCTYPE html>
 <html lang="en">
@@ -17,18 +11,8 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <base href="/" />
-
-    @switch (SettingService.GetSettings().Theme)
-    {
-        case LANCommanderTheme.Light:
-            <link href="/_content/AntDesign/css/ant-design-blazor.css" rel="stylesheet" />
-            break;
-
-        case LANCommanderTheme.Dark:
-            <link href="/_content/AntDesign/css/ant-design-blazor.dark.css" rel="stylesheet" />
-            break;
-    }
-
+    
+    <link href="/_content/AntDesign/css/ant-design-blazor.dark.css" rel="stylesheet" />
     <link rel="stylesheet" href="_content/XtermBlazor/XtermBlazor.min.css"  />
     <link rel="stylesheet" href="_content/PSC.Blazor.Components.MarkdownEditor/css/markdowneditor.css" />
     <link rel="stylesheet" href="_content/PSC.Blazor.Components.MarkdownEditor/css/easymde.min.css" />
@@ -36,7 +20,7 @@
     <link rel="stylesheet" href="css/app.css" />
     <link rel="stylesheet" href="css/custom.css" />
 </head>
-<body data-theme="@settings.Theme">
+<body data-theme="dark">
 
 
     <div class="page-wrapper">
@@ -69,7 +53,7 @@
     <script src="_content/BlazorMonaco/lib/monaco-editor/min/vs/editor/editor.main.js"></script>
 
     <script>
-        Uploader.MaxChunkSize = @(settings.Archives.MaxChunkSize * 1024 * 1024)
+        Uploader.MaxChunkSize = @(Settings.Value.Server.Archives.MaxChunkSize * 1024 * 1024)
     </script>
 </body>
 </html>
@@ -77,7 +61,7 @@
 @code {
     protected override async Task OnInitializedAsync()
     {
-        if (DatabaseContext.Provider == Data.Enums.DatabaseProvider.Unknown && !NavigationManager.Uri.Contains("/FirstTimeSetup"))
+        if (DatabaseContext.Provider == DatabaseProvider.Unknown && !NavigationManager.Uri.Contains("/FirstTimeSetup"))
         {
             NavigationManager.NavigateTo("/FirstTimeSetup", true);
         }
diff --git a/LANCommander.Server/UI/Components/ArchiveUploader.razor b/LANCommander.Server/UI/Components/ArchiveUploader.razor
index e882c4af..734d7d1e 100644
--- a/LANCommander.Server/UI/Components/ArchiveUploader.razor
+++ b/LANCommander.Server/UI/Components/ArchiveUploader.razor
@@ -2,8 +2,7 @@
 @using LANCommander.SDK.Enums
 @using LANCommander.Server.Jobs.Background;
 @inject ArchiveClient ArchiveClient
-@inject HttpClient HttpClient
-@inject NavigationManager Navigator
+@inject SettingsProvider<Settings.Settings> SettingsProvider
 @inject IMessageService MessageService
 @inject IJSRuntime JS
 @inject ILogger<ArchiveUploader> Logger
@@ -134,16 +133,14 @@
 
             Archive? lastArchive = null;
 
-            var settings = SettingService.GetSettings();
-
-            if (settings.Archives.EnablePatching)
+            if (SettingsProvider.CurrentValue.Server.Archives.EnablePatching)
             {
                 if (Archive.GameId != Guid.Empty)
                     lastArchive = await ArchiveClient.GetLatestArchive(a => a.Id != Archive.Id && a.GameId == Archive.GameId);
                 else if (Archive.RedistributableId != Guid.Empty)
                     lastArchive = await ArchiveClient.GetLatestArchive(a => a.Id != Archive.Id && a.RedistributableId == Archive.RedistributableId);
 
-                if (lastArchive != null && settings.Archives.EnablePatching)
+                if (lastArchive != null && SettingsProvider.CurrentValue.Server.Archives.EnablePatching)
                     BackgroundJob.Enqueue<PatchArchiveBackgroundJob>(x => x.Execute(lastArchive.Id, Archive.Id));
             }
 
diff --git a/LANCommander.Server/UI/Components/AvatarUploader.razor b/LANCommander.Server/UI/Components/AvatarUploader.razor
index fce0ea2a..36c4116e 100644
--- a/LANCommander.Server/UI/Components/AvatarUploader.razor
+++ b/LANCommander.Server/UI/Components/AvatarUploader.razor
@@ -2,6 +2,7 @@
 @inherits OwningComponentBase
 @inject UserService UserService
 @inject MediaService MediaService
+@inject SettingsProvider<Settings.Settings> SettingsProvider
 @inject IMessageService MessageService
 
 <InputFile id="@("AvatarUpload")" OnChange="(e) => UploadAvatar(e)" hidden accept=".jpg,jpeg,.png" />
@@ -28,8 +29,6 @@
     [Parameter] public Guid UserId { get; set; }
     [Parameter] public string Width { get; set; } = "104px";
 
-    Settings Settings = SettingService.GetSettings();
-
     string AvatarUrl;
 
     User User = new User();
@@ -66,7 +65,7 @@
     async Task UploadAvatar(InputFileChangeEventArgs e)
     {
         var media = User.Media?.FirstOrDefault(m => m.Type == SDK.Enums.MediaType.Avatar);
-        var config = Settings.Media.GetMediaTypeConfig(MediaType.Avatar);
+        var config = SettingsProvider.CurrentValue.Server.Media.GetMediaTypeConfig(MediaType.Avatar);
 
         if (media == null)
             media = new Media
diff --git a/LANCommander.Server/UI/Components/MainMenu.razor b/LANCommander.Server/UI/Components/MainMenu.razor
index 02db0585..dac56aa7 100644
--- a/LANCommander.Server/UI/Components/MainMenu.razor
+++ b/LANCommander.Server/UI/Components/MainMenu.razor
@@ -19,6 +19,7 @@
                 <MenuItem RouterLink="/Logout">Logout</MenuItem>
             </ChildContent>
         </SubMenu>
+        <MenuItem RouterLink="/Chat" Icon="@IconType.Outline.Message">Chat</MenuItem>
         <MenuDivider/>
     }
     <SubMenu>
diff --git a/LANCommander.Server/UI/Components/RedirectToLogin.razor b/LANCommander.Server/UI/Components/RedirectToLogin.razor
index f4ba955d..ba3c8dd0 100644
--- a/LANCommander.Server/UI/Components/RedirectToLogin.razor
+++ b/LANCommander.Server/UI/Components/RedirectToLogin.razor
@@ -1,10 +1,13 @@
 @using LANCommander.Server.Data
+@using LANCommander.Server.Settings.Enums
+@@using LANCommander.Server.Settings.Enums
+using LANCommander.Server.Data
 @inject NavigationManager NavigationManager
 
 @code {
     protected override void OnInitialized()
     {
-        if (DatabaseContext.Provider == Data.Enums.DatabaseProvider.Unknown)
+        if (DatabaseContext.Provider == DatabaseProvider.Unknown)
         {
             NavigationManager.NavigateTo("/FirstTimeSetup");
         }
diff --git a/LANCommander.Server/UI/Pages/Account/Components/LauncherDownloadButton.razor b/LANCommander.Server/UI/Pages/Account/Components/LauncherDownloadButton.razor
index 2f073980..ab642445 100644
--- a/LANCommander.Server/UI/Pages/Account/Components/LauncherDownloadButton.razor
+++ b/LANCommander.Server/UI/Pages/Account/Components/LauncherDownloadButton.razor
@@ -1,4 +1,5 @@
 @using System.Collections
+@using LANCommander.Server.Settings.Enums
 @inject UpdateService UpdateService
 @inject NavigationManager NavigationManager
 
diff --git a/LANCommander.Server/UI/Pages/Account/Login.cshtml b/LANCommander.Server/UI/Pages/Account/Login.cshtml
index 3955eb7c..054d6f9c 100644
--- a/LANCommander.Server/UI/Pages/Account/Login.cshtml
+++ b/LANCommander.Server/UI/Pages/Account/Login.cshtml
@@ -1,9 +1,8 @@
 @page "/Login"
 @using LANCommander.Server.Extensions
-@using LANCommander.Server.Models
-@using LANCommander.Server.Services
-@using LANCommander.Server.Services.Models
+@using LANCommander.Server.Settings
 @model LANCommander.Server.UI.Pages.Account.LoginModel
+@inject SettingsProvider<Settings> SettingsProvider
 @{ Layout = "/UI/Views/Shared/_LayoutBasic.cshtml"; }
 
 @{
@@ -17,16 +16,7 @@
     <div class="ant-row login-box">
         <div class="ant-col ant-col-xs-24 ant-col-md-8 ant-col-lg-6 ant-col-md-push-4 ant-col-lg-push-6 login-form-pane">
             <div class="login-box-logo">
-                @switch (SettingService.GetSettings().Theme)
-                {
-                    case LANCommanderTheme.Light:
-                        <img src="~/static/logo.svg"/>
-                        break;
-
-                    case LANCommanderTheme.Dark:
-                        <img src="~/static/logo-dark.svg"/>
-                        break;
-                }
+                <img src="~/static/logo-dark.svg"/>
             </div>
 
             @foreach (var error in ModelState.SelectMany(x => x.Value.Errors))
diff --git a/LANCommander.Server/UI/Pages/Account/Login.cshtml.cs b/LANCommander.Server/UI/Pages/Account/Login.cshtml.cs
index df5b87fd..c5436061 100644
--- a/LANCommander.Server/UI/Pages/Account/Login.cshtml.cs
+++ b/LANCommander.Server/UI/Pages/Account/Login.cshtml.cs
@@ -20,7 +20,9 @@ using LANCommander.Server.Extensions;
 using LANCommander.Server.Data;
 using LANCommander.Server.Models;
 using LANCommander.Server.Services.Models;
+using LANCommander.Server.Settings.Enums;
 using Microsoft.AspNetCore.Components;
+using Microsoft.Extensions.Options;
 using ZiggyCreatures.Caching.Fusion;
 using User = LANCommander.Server.Data.Models.User;
 
@@ -33,19 +35,22 @@ namespace LANCommander.Server.UI.Pages.Account
         private readonly RoleService RoleService;
         private readonly IFusionCache Cache;
         private readonly ILogger<LoginModel> Logger;
+        private readonly IOptions<Server.Settings.Settings> Settings;
 
         public LoginModel(
             SignInManager<User> signInManager,
             UserService userService,
             RoleService roleService,
             IFusionCache cache,
-            ILogger<LoginModel> logger)
+            ILogger<LoginModel> logger,
+            IOptions<Server.Settings.Settings> settings)
         {
             SignInManager = signInManager;
             UserService = userService;
             RoleService = roleService;
             Cache = cache;
             Logger = logger;
+            Settings = settings;
         }
 
         /// <summary>
@@ -94,7 +99,7 @@ namespace LANCommander.Server.UI.Pages.Account
 
             ReturnUrl = returnUrl;
 
-            if (DatabaseContext.Provider == Data.Enums.DatabaseProvider.Unknown)
+            if (DatabaseContext.Provider == DatabaseProvider.Unknown)
                 return Redirect("/FirstTimeSetup");
 
             var administratorRole = await RoleService
@@ -147,9 +152,7 @@ namespace LANCommander.Server.UI.Pages.Account
 
             if (ModelState.IsValid)
             {
-                var settings = SettingService.GetSettings();
-
-                if (settings.Authentication.RequireApproval)
+                if (Settings.Value.Server.Authentication.RequireApproval)
                 {
                     var user = await UserService.GetAsync(Model.Username);
 
diff --git a/LANCommander.Server/UI/Pages/Account/Register.cshtml b/LANCommander.Server/UI/Pages/Account/Register.cshtml
index 200fd8dc..9aa533cb 100644
--- a/LANCommander.Server/UI/Pages/Account/Register.cshtml
+++ b/LANCommander.Server/UI/Pages/Account/Register.cshtml
@@ -19,16 +19,7 @@
     <div class="ant-row login-box">
         <div class="ant-col ant-col-xs-24 ant-col-md-8 ant-col-lg-6 ant-col-md-push-4 ant-col-lg-push-6 login-form-pane">
             <div class="login-box-logo">
-                @switch (SettingService.GetSettings().Theme)
-                {
-                    case LANCommanderTheme.Light:
-                        <img src="~/static/logo.svg"/>
-                        break;
-
-                    case LANCommanderTheme.Dark:
-                        <img src="~/static/logo-dark.svg"/>
-                        break;
-                }
+                <img src="~/static/logo-dark.svg"/>
             </div>
 
             @foreach (var error in ModelState.SelectMany(x => x.Value.Errors))
diff --git a/LANCommander.Server/UI/Pages/Account/Register.cshtml.cs b/LANCommander.Server/UI/Pages/Account/Register.cshtml.cs
index 2f7bd2cc..cf78e003 100644
--- a/LANCommander.Server/UI/Pages/Account/Register.cshtml.cs
+++ b/LANCommander.Server/UI/Pages/Account/Register.cshtml.cs
@@ -23,6 +23,8 @@ using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Logging;
 using LANCommander.Server.Services;
 using LANCommander.Server.Services.Models;
+using LANCommander.Server.Settings.Models;
+using Microsoft.Extensions.Options;
 
 namespace LANCommander.Server.UI.Pages.Account
 {
@@ -40,6 +42,7 @@ namespace LANCommander.Server.UI.Pages.Account
         private readonly ILogger<RegisterModel> Logger;
         private readonly RoleManager<Role> RoleManager;
         private readonly UserCustomFieldService UserCustomFieldService;
+        private readonly IOptions<Server.Settings.Settings> Settings;
 
         public RegisterModel(
             UserManager<User> userManager,
@@ -47,7 +50,8 @@ namespace LANCommander.Server.UI.Pages.Account
             SignInManager<User> signInManager,
             ILogger<RegisterModel> logger,
             RoleManager<Role> roleManager,
-            UserCustomFieldService userCustomFieldService)
+            UserCustomFieldService userCustomFieldService,
+            IOptions<Server.Settings.Settings> settings)
         {
             UserManager = userManager;
             UserStore = userStore;
@@ -55,6 +59,7 @@ namespace LANCommander.Server.UI.Pages.Account
             Logger = logger;
             RoleManager = roleManager;
             UserCustomFieldService = userCustomFieldService;
+            Settings = settings;
         }
 
         /// <summary>
@@ -79,8 +84,6 @@ namespace LANCommander.Server.UI.Pages.Account
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
         public IList<AuthenticationScheme> ExternalLogins { get; set; }
-        
-        public Services.Models.Settings Settings = SettingService.GetSettings();
 
         public async Task OnGetAsync(string returnUrl = null, string provider = null)
         {
@@ -95,7 +98,7 @@ namespace LANCommander.Server.UI.Pages.Account
                 Model.Password = Guid.Empty.ToString();
                 Model.PasswordConfirmation = Model.Password;
                 
-                AuthenticationProvider = Settings.Authentication.AuthenticationProviders.FirstOrDefault(p => p.Slug == provider);
+                AuthenticationProvider = Settings.Value.Server.Authentication.AuthenticationProviders.FirstOrDefault(p => p.Slug == provider);
             }
             else
             {
@@ -123,7 +126,7 @@ namespace LANCommander.Server.UI.Pages.Account
             {
                 var user = CreateUser();
 
-                if (!Settings.Authentication.RequireApproval)
+                if (!Settings.Value.Server.Authentication.RequireApproval)
                 {
                     user.Approved = true;
                     user.ApprovedOn = DateTime.UtcNow;
@@ -142,9 +145,9 @@ namespace LANCommander.Server.UI.Pages.Account
                 {
                     Logger.LogInformation("User created a new account.");
 
-                    if (Settings.Roles.DefaultRoleId != Guid.Empty)
+                    if (Settings.Value.Server.Roles.DefaultRoleId != Guid.Empty)
                     {
-                        var defaultRole = await RoleManager.FindByIdAsync(Settings.Roles.DefaultRoleId.ToString());
+                        var defaultRole = await RoleManager.FindByIdAsync(Settings.Value.Server.Roles.DefaultRoleId.ToString());
 
                         if (defaultRole != null)
                             await UserManager.AddToRoleAsync(user, defaultRole.Name);
@@ -153,7 +156,7 @@ namespace LANCommander.Server.UI.Pages.Account
                     // Registering using SSO
                     if (Model.RegistrationType == RegistrationType.AuthenticationProvider)
                     {
-                        AuthenticationProvider = Settings.Authentication.AuthenticationProviders.FirstOrDefault(p => p.Slug == provider);
+                        AuthenticationProvider = Settings.Value.Server.Authentication.AuthenticationProviders.FirstOrDefault(p => p.Slug == provider);
                         
                         await UserCustomFieldService.AddAsync(new UserCustomField
                         {
diff --git a/LANCommander.Server/UI/Pages/Dashboard/Charts/StorageUsage.razor b/LANCommander.Server/UI/Pages/Dashboard/Charts/StorageUsage.razor
index 69d66a35..28af87e3 100644
--- a/LANCommander.Server/UI/Pages/Dashboard/Charts/StorageUsage.razor
+++ b/LANCommander.Server/UI/Pages/Dashboard/Charts/StorageUsage.razor
@@ -35,7 +35,6 @@
     {
         if (firstRender)
         {
-            var settings = SettingService.GetSettings();
             var drives = DriveInfo.GetDrives();
             var root = Path.GetPathRoot(System.Reflection.Assembly.GetExecutingAssembly().Location);
 
diff --git a/LANCommander.Server/UI/Pages/Dashboard/Charts/TopGamesAverageSessionPlaytime.razor b/LANCommander.Server/UI/Pages/Dashboard/Charts/TopGamesAverageSessionPlaytime.razor
index 8cb0d437..2dd80091 100644
--- a/LANCommander.Server/UI/Pages/Dashboard/Charts/TopGamesAverageSessionPlaytime.razor
+++ b/LANCommander.Server/UI/Pages/Dashboard/Charts/TopGamesAverageSessionPlaytime.razor
@@ -10,8 +10,6 @@
 @code {
     ICollection<PlaySession> PlaySessions;
 
-    Settings Settings = SettingService.GetSettings();
-
     object[] Data;
 
     bool Loading = true;
@@ -44,7 +42,7 @@
 
     protected override async Task OnInitializedAsync()
     {
-        Config.Theme = Settings.Theme == LANCommanderTheme.Dark ? "dark" : "light";
+        Config.Theme = "dark";
 
         Dictionary<string, TimeSpan> playtimes = new Dictionary<string, TimeSpan>();
         
diff --git a/LANCommander.Server/UI/Pages/Dashboard/Charts/TopGamesPlaytime.razor b/LANCommander.Server/UI/Pages/Dashboard/Charts/TopGamesPlaytime.razor
index ee13b986..37fbe4c7 100644
--- a/LANCommander.Server/UI/Pages/Dashboard/Charts/TopGamesPlaytime.razor
+++ b/LANCommander.Server/UI/Pages/Dashboard/Charts/TopGamesPlaytime.razor
@@ -8,8 +8,6 @@
 </Spin>
 
 @code {
-    Settings Settings = SettingService.GetSettings();
-
     object[] Data;
 
     bool Loading = true;
@@ -48,7 +46,7 @@
             .Include(ps => ps.User)
             .GetAsync(ps => ps.GameId.HasValue && ps.GameId.Value != Guid.Empty);
 
-        Config.Theme = Settings.Theme == LANCommanderTheme.Dark ? "dark" : "light";
+        Config.Theme = "dark";
 
         Dictionary<string, TimeSpan> playtimes = new Dictionary<string, TimeSpan>();
 
diff --git a/LANCommander.Server/UI/Pages/Dashboard/Charts/TopPlayersPlaytime.razor b/LANCommander.Server/UI/Pages/Dashboard/Charts/TopPlayersPlaytime.razor
index cb857af1..e72ccce9 100644
--- a/LANCommander.Server/UI/Pages/Dashboard/Charts/TopPlayersPlaytime.razor
+++ b/LANCommander.Server/UI/Pages/Dashboard/Charts/TopPlayersPlaytime.razor
@@ -8,8 +8,6 @@
 </Spin>
 
 @code {
-    Settings Settings = SettingService.GetSettings();
-
     object[] Data;
 
     bool Loading = true;
@@ -44,7 +42,7 @@
 
     protected override async Task OnInitializedAsync()
     {
-        Config.Theme = Settings.Theme == LANCommanderTheme.Dark ? "dark" : "light";
+        Config.Theme = "dark";
 
         Dictionary<string, TimeSpan> playtimes = new Dictionary<string, TimeSpan>();
         
diff --git a/LANCommander.Server/UI/Pages/FirstTimeSetup/Database.razor b/LANCommander.Server/UI/Pages/FirstTimeSetup/Database.razor
index 3293aeaf..8df1a2b4 100644
--- a/LANCommander.Server/UI/Pages/FirstTimeSetup/Database.razor
+++ b/LANCommander.Server/UI/Pages/FirstTimeSetup/Database.razor
@@ -1,24 +1,29 @@
 @page "/FirstTimeSetup"
 @page "/FirstTimeSetup/Database"
 @layout FirstTimeSetupLayout
-@using LANCommander.Server.Data.Enums
+@using LANCommander.SDK
+@using LANCommander.Server.Settings
+@using LANCommander.Server.Settings.Enums
 @using Microsoft.Data.Sqlite
+@using Microsoft.Extensions.Options
 @using MySqlConnector
 @using Npgsql
 @inject SetupService SetupService
+@inject SettingsProvider<Settings> SettingsProvider
+@inject IOptions<Settings> Settings 
 @inject NavigationManager NavigationManager
 @inject IMessageService MessageService
 @inject ILogger<Index> Logger
 
 <PageTitle>Database Config - First Time Setup</PageTitle>
 
-<Form Model="@Settings" Loading="Loading" OnFinish="ValidateDatabaseConnection" Layout="FormLayout.Vertical">
+<Form Model="@Settings.Value" Loading="Loading" OnFinish="ValidateDatabaseConnection" Layout="FormLayout.Vertical">
     <FormItem>
         LANCommander requires a database to run. If you require something other than SQLite, configure that here.
     </FormItem>
     <FormItem Label="Database Provider">
         <Select
-            @bind-Value="context.DatabaseProvider"
+            @bind-Value="context.Server.Database.Provider"
             TItem="DatabaseProvider"
             TItemValue="DatabaseProvider"
             DataSource="Enum.GetValues<DatabaseProvider>()"
@@ -28,7 +33,7 @@
         </Select>
     </FormItem>
     <FormItem Label="Connection String">
-        <Input @bind-Value="context.DatabaseConnectionString" />
+        <Input @bind-Value="context.Server.Database.ConnectionString" />
     </FormItem>
     <FormItem WrapperColOffset="8" WrapperColSpan="16">
         <GridRow Justify="RowJustify.End" Style="margin-top: 16px;">
@@ -43,16 +48,14 @@
 
 @code {
     [CascadingParameter] FirstTimeSetupLayout Layout { get; set; }
-
-    Settings Settings = SettingService.GetSettings();
-
+    
     bool Loading = false;
 
     protected override async Task OnInitializedAsync()
     {
         await Layout.ChangeCurrentStep(FirstTimeSetupStep.Database);
 
-        if (Settings.DatabaseProvider != Data.Enums.DatabaseProvider.Unknown)
+        if (SettingsProvider.CurrentValue.Server.Database.Provider != DatabaseProvider.Unknown)
         {
             var isSetupInitialized = await SetupService.IsSetupInitialized();
             if (isSetupInitialized)
@@ -62,19 +65,28 @@
 
     void OnDatabaseProviderChanged()
     {
-        switch (Settings.DatabaseProvider)
+        switch (SettingsProvider.CurrentValue.Server.Database.Provider)
         {
             case DatabaseProvider.SQLite:
-                var dbPath = Path.Combine(SettingService.WorkingDirectory, "LANCommander.db");
-                Settings.DatabaseConnectionString = $"Data Source={dbPath};Cache=Shared";
+                var dbPath = Path.Join(AppPaths.GetConfigDirectory(), "LANCommander.db");
+                SettingsProvider.Update(s =>
+                {
+                    s.Server.Database.ConnectionString = $"Data Source={dbPath};Cache=Shared";
+                });
                 break;
 
             case DatabaseProvider.MySQL:
-                Settings.DatabaseConnectionString = "Server=localhost;Uid=root;Pwd=password;Database=LANCommander";
+                SettingsProvider.Update(s =>
+                {
+                    s.Server.Database.ConnectionString = "Server=localhost;Uid=root;Pwd=password;Database=LANCommander";
+                });
                 break;
 
             case DatabaseProvider.PostgreSQL:
-                Settings.DatabaseConnectionString = "Host=localhost;Port=5432;Database=LANCommander;User Id=postgres;Password=password";
+                SettingsProvider.Update(s =>
+                {
+                    s.Server.Database.ConnectionString = "Host=localhost;Port=5432;Database=LANCommander;User Id=postgres;Password=password"; 
+                });
                 break;
         }
     }
@@ -89,7 +101,7 @@
 
         try
         {
-            SetupService.ValidateConnectionString(Settings.DatabaseProvider, Settings.DatabaseConnectionString);
+            SetupService.ValidateConnectionString(SettingsProvider.CurrentValue.Server.Database.Provider, SettingsProvider.CurrentValue.Server.Database.ConnectionString);
 
             valid = true;
         }
@@ -120,9 +132,13 @@
             {
                 await InvokeAsync(async () =>
                 {
-                    await SetupService.ChangeProviderAsync(Settings.DatabaseProvider, Settings.DatabaseConnectionString);
+                    await SetupService.ChangeProviderAsync(SettingsProvider.CurrentValue.Server.Database.Provider, SettingsProvider.CurrentValue.Server.Database.ConnectionString);
                     
-                    SettingService.SaveSettings(Settings);
+                    SettingsProvider.Update(s =>
+                    {
+                        s.Server.Database.Provider = Settings.Value.Server.Database.Provider;
+                        s.Server.Database.ConnectionString = Settings.Value.Server.Database.ConnectionString;
+                    });
 
                     NavigationManager.NavigateTo("/FirstTimeSetup/Paths", true);
                 });
diff --git a/LANCommander.Server/UI/Pages/FirstTimeSetup/Metadata.razor b/LANCommander.Server/UI/Pages/FirstTimeSetup/Metadata.razor
index 88325074..5641fe06 100644
--- a/LANCommander.Server/UI/Pages/FirstTimeSetup/Metadata.razor
+++ b/LANCommander.Server/UI/Pages/FirstTimeSetup/Metadata.razor
@@ -1,13 +1,16 @@
 @page "/FirstTimeSetup/Metadata"
+@using LANCommander.Server.Settings
+@using Microsoft.Extensions.Options
 @layout FirstTimeSetupLayout
 @inject SetupService SetupService
+@inject SettingsProvider<Settings> SettingsProvider
+@inject IOptions<Settings> Settings
 @inject NavigationManager NavigationManager
-@inject IMessageService MessageService
 @inject ILogger<Index> Logger
 
 <PageTitle>Metadata Connections - First Time Setup</PageTitle>
 
-<Form Model="@Settings" Loading="Loading" OnFinish="ValidateMetadataConnections" Layout="FormLayout.Vertical">
+<Form Model="@Settings.Value" Loading="Loading" OnFinish="ValidateMetadataConnections" Layout="FormLayout.Vertical">
     <FormItem>
         LANCommander has the ability to pull metadata and media from external sources. Required credentials can be added here, or can be set later in Settings.
     </FormItem>
@@ -19,10 +22,10 @@
     </p>
 
     <FormItem Label="Client ID">
-        <Input @bind-Value="context.IGDBClientId" />
+        <Input @bind-Value="context.Server.IGDB.ClientId" />
     </FormItem>
     <FormItem Label="Client Secret">
-        <InputPassword @bind-Value="context.IGDBClientSecret" AutoComplete="false" />
+        <InputPassword @bind-Value="context.Server.IGDB.ClientSecret" AutoComplete="false" />
     </FormItem>
 
     <Divider Text="SteamGridDB Credentials" />
@@ -32,7 +35,7 @@
     </p>
 
     <FormItem Label="API Key">
-        <InputPassword @bind-Value="context.Media.SteamGridDbApiKey" AutoComplete="false" />
+        <InputPassword @bind-Value="context.Server.Media.SteamGridDbApiKey" AutoComplete="false" />
     </FormItem>
 
     <FormItem>
@@ -50,8 +53,6 @@
     [CascadingParameter]
     FirstTimeSetupLayout Layout { get; set; }
 
-    Settings Settings;
-
     bool Loading = false;
 
     protected override async Task OnInitializedAsync()
@@ -65,12 +66,22 @@
 
         await Layout.ChangeCurrentStep(FirstTimeSetupStep.Metadata);
 
-        Settings = SettingService.GetSettings();
+        SettingsProvider.Update(s =>
+        {
+            s.Server.IGDB.ClientId = Settings.Value.Server.IGDB.ClientId;
+            s.Server.IGDB.ClientSecret = Settings.Value.Server.IGDB.ClientSecret;
+            s.Server.Media.SteamGridDbApiKey = Settings.Value.Server.Media.SteamGridDbApiKey;
+        });
     }
 
     async Task ValidateMetadataConnections()
     {
-        SettingService.SaveSettings(Settings);
+        SettingsProvider.Update(s =>
+        {
+            s.Server.IGDB.ClientId = Settings.Value.Server.IGDB.ClientId;
+            s.Server.IGDB.ClientSecret = Settings.Value.Server.IGDB.ClientSecret;
+            s.Server.Media.SteamGridDbApiKey = Settings.Value.Server.Media.SteamGridDbApiKey;
+        });
 
         NavigationManager.NavigateTo("/FirstTimeSetup/Administrator");
     }
diff --git a/LANCommander.Server/UI/Pages/FirstTimeSetup/Paths.razor b/LANCommander.Server/UI/Pages/FirstTimeSetup/Paths.razor
index 9576b2c5..efee3015 100644
--- a/LANCommander.Server/UI/Pages/FirstTimeSetup/Paths.razor
+++ b/LANCommander.Server/UI/Pages/FirstTimeSetup/Paths.razor
@@ -1,8 +1,13 @@
 @page "/FirstTimeSetup/Paths"
+@using LANCommander.SDK
 @using LANCommander.SDK.Enums
+@using LANCommander.Server.Settings
+@using Microsoft.Extensions.Options
 @layout FirstTimeSetupLayout
 @inject SetupService SetupService
 @inject StorageLocationService StorageLocationService
+@inject SettingsProvider<Settings> SettingsProvider
+@inject IOptions<Settings> Settings
 @inject NavigationManager NavigationManager
 @inject IMessageService MessageService
 @inject ILogger<Index> Logger
@@ -61,19 +66,19 @@
     <Divider Text="Backups" />
 
     <FormItem>
-        <FilePicker Root="@RootPath" EntrySelectable="x => x is FileManagerDirectory" @bind-Value="@Settings.Backups.StoragePath" OkText="Select Path" Title="Choose Path" OnSelected="(path) => Settings.Backups.StoragePath = OnPathSelected(path)" />
+        <FilePicker Root="@RootPath" EntrySelectable="x => x is FileManagerDirectory" @bind-Value="@Settings.Value.Server.Backups.StoragePath" OkText="Select Path" Title="Choose Path" OnSelected="(path) => Settings.Value.Server.Backups.StoragePath = OnPathSelected(path)" />
     </FormItem>
 
     <Divider Text="Launchers" />
 
     <FormItem>
-        <FilePicker Root="@RootPath" EntrySelectable="x => x is FileManagerDirectory" @bind-Value="@Settings.Launcher.StoragePath" OkText="Select Path" Title="Choose Path" OnSelected="(path) => Settings.Launcher.StoragePath = OnPathSelected(path)" />
+        <FilePicker Root="@RootPath" EntrySelectable="x => x is FileManagerDirectory" @bind-Value="@Settings.Value.Server.Launcher.StoragePath" OkText="Select Path" Title="Choose Path" OnSelected="(path) => Settings.Value.Server.Launcher.StoragePath = OnPathSelected(path)" />
     </FormItem>
 
     <Divider Text="Servers" />
 
     <FormItem>
-        <FilePicker Root="@RootPath" EntrySelectable="x => x is FileManagerDirectory" @bind-Value="@Settings.Servers.StoragePath" OkText="Select Path" Title="Choose Path" OnSelected="(path) => Settings.Servers.StoragePath = OnPathSelected(path)" />
+        <FilePicker Root="@RootPath" EntrySelectable="x => x is FileManagerDirectory" @bind-Value="@Settings.Value.Server.GameServers.StoragePath" OkText="Select Path" Title="Choose Path" OnSelected="(path) => Settings.Value.Server.GameServers.StoragePath = OnPathSelected(path)" />
     </FormItem>
 
     <FormItem>
@@ -92,20 +97,18 @@
 
     StorageLocation MediaStorageLocation = new()
     {
-        Path = Path.Combine(SettingService.WorkingDirectory, "Media"),
+        Path = Path.Join(AppPaths.GetConfigDirectory(), "Media"),
         Type = StorageLocationType.Media,
         Default = true,
     };
 
     StorageLocation SavesStorageLocation = new()
     {
-        Path = Path.Combine(SettingService.WorkingDirectory, "Saves"),
+        Path = Path.Join(AppPaths.GetConfigDirectory(), "Saves"),
         Type = StorageLocationType.Save,
         Default = true,
     };
 
-    Settings Settings = SettingService.GetSettings();
-
     bool Loading = false;
     string RootPath = Path.GetPathRoot(Directory.GetCurrentDirectory());
 
@@ -135,7 +138,7 @@
             if (!ArchiveStorageLocations.Any())
                 ArchiveStorageLocations.Add(new StorageLocation
                 {
-                    Path = Path.Combine(SettingService.WorkingDirectory, "Uploads"),
+                    Path = Path.Join(AppPaths.GetConfigDirectory(), "Uploads"),
                     Type = StorageLocationType.Archive,
                     Default = true,
                 });
@@ -153,7 +156,7 @@
 
             SavesStorageLocation = new StorageLocation
             {
-                Path = Path.Combine(SettingService.WorkingDirectory, "Saves"),
+                Path = Path.Join(AppPaths.GetConfigDirectory(), "Saves"),
                 Type = StorageLocationType.Save,
                 Default = true,
             };
@@ -171,7 +174,7 @@
 
             MediaStorageLocation = new StorageLocation
             {
-                Path = Path.Combine(SettingService.WorkingDirectory, "Media"),
+                Path = Path.Join(AppPaths.GetConfigDirectory(), "Media"),
                 Type = StorageLocationType.Media,
                 Default = true,
             };
@@ -189,8 +192,6 @@
 
             await SetupService.UpdatePaths(locations);
             
-            SettingService.SaveSettings(Settings);
-            
             NavigationManager.NavigateTo("/FirstTimeSetup/Metadata");
         }
         catch (Exception ex)
diff --git a/LANCommander.Server/UI/Pages/Games/Components/MediaEditor.razor b/LANCommander.Server/UI/Pages/Games/Components/MediaEditor.razor
index 513d8c39..732aabad 100644
--- a/LANCommander.Server/UI/Pages/Games/Components/MediaEditor.razor
+++ b/LANCommander.Server/UI/Pages/Games/Components/MediaEditor.razor
@@ -1,8 +1,11 @@
-@using System.Net.Mime
+@using Microsoft.Extensions.Options
+@using LANCommander.Server.Settings
+@using System.Net.Mime
 @inject MediaService MediaService
 @inject ModalService ModalService
 @inject IMessageService MessageService
 @inject NavigationManager NavigationManager
+@inject IOptions<Settings> Settings
 @inject ILogger<MediaEditor> Logger
 
 <Flex Direction="FlexDirection.Vertical" Gap="FlexGap.Large" Style="width: 100%" Class="media-editor">
@@ -57,7 +60,7 @@
                         <Icon Type="@IconType.Outline.Upload"/>
                     </label>
 
-                    @if (String.IsNullOrWhiteSpace(Settings.Media.SteamGridDbApiKey))
+                    @if (String.IsNullOrWhiteSpace(Settings.Value.Server.Media.SteamGridDbApiKey))
                     {
                         <Popconfirm OnConfirm="() => NavigateToSettings()" Title="Invalid SteamGridDB credentials. Setup now?">
                             <Button Type="ButtonType.Text" Icon="@IconType.Outline.Search"/>
@@ -93,8 +96,6 @@
     IEnumerable<Media> Selected = new List<Media>();
     ITable? ResultsTable;
 
-    Settings Settings = SettingService.GetSettings();
-
     MediaType[] AllowedMediaTypes = new MediaType[]
     {
         MediaType.Icon,
@@ -226,7 +227,7 @@
             return;
         }
 
-        var config = Settings.Media.GetMediaTypeConfig(media.Type);
+        var config = Settings.Value.Server.Media.GetMediaTypeConfig(media.Type);
 
         if (e.File.Size > config.MaxFileSize)
         {
diff --git a/LANCommander.Server/UI/Pages/Profile/ConnectedAccounts.razor b/LANCommander.Server/UI/Pages/Profile/ConnectedAccounts.razor
index febd3363..baa5478b 100644
--- a/LANCommander.Server/UI/Pages/Profile/ConnectedAccounts.razor
+++ b/LANCommander.Server/UI/Pages/Profile/ConnectedAccounts.razor
@@ -1,7 +1,10 @@
 @page "/Profile/ConnectedAccounts"
+@using LANCommander.Server.Settings
 @using Microsoft.AspNetCore.Components.Authorization
+@using Microsoft.Extensions.Options
 @inject UserService UserService
 @inject UserCustomFieldService UserCustomFieldService
+@inject IOptions<Settings> Settings
 @inject AuthenticationStateProvider AuthenticationStateProvider
 @inject NavigationManager NavigationManager
 @attribute [Authorize]
@@ -9,7 +12,7 @@
 <PageHeader Title="Connected Accounts" />
 
 <div style="padding: 0 24px">
-    <AntList DataSource="Settings.Authentication.AuthenticationProviders" Bordered Size="ListSize.Large">
+    <AntList DataSource="Settings.Value.Server.Authentication.AuthenticationProviders" Bordered Size="ListSize.Large">
         <ListItem>
             <Flex Align="FlexAlign.Center" Justify="FlexJustify.SpaceBetween" Style="width: 100%">
                 <Flex Align="FlexAlign.Center" Gap="FlexGap.Large">
@@ -41,8 +44,6 @@
 </div>
 
 @code {
-    Settings Settings = SettingService.GetSettings();
-
     User User = new();
     List<UserCustomField> CustomFields = new();
 
@@ -60,7 +61,7 @@
 
     async Task LoadData()
     {
-        foreach (var authenticationProvider in Settings.Authentication.AuthenticationProviders)
+        foreach (var authenticationProvider in Settings.Value.Server.Authentication.AuthenticationProviders)
         {
             var customField = await UserCustomFieldService.FirstOrDefaultAsync(cf => cf.Name == authenticationProvider.GetCustomFieldName() && cf.UserId == User.Id);
             
diff --git a/LANCommander.Server/UI/Pages/Servers/Edit/General.razor b/LANCommander.Server/UI/Pages/Servers/Edit/General.razor
index cdf80fb4..5dbb32be 100644
--- a/LANCommander.Server/UI/Pages/Servers/Edit/General.razor
+++ b/LANCommander.Server/UI/Pages/Servers/Edit/General.razor
@@ -8,10 +8,15 @@
 @using LANCommander.Server.Data.Enums
 @using LANCommander.Server.Services.Abstractions
 @using LANCommander.Server.Services.ServerEngines
+@using LANCommander.Server.Settings
+@using LANCommander.Server.Settings.Enums
+@using LANCommander.Server.Settings.Models
 @using LANCommander.Server.UI.Pages.Servers.Components
+@using Microsoft.Extensions.Options
 @inject ServerService ServerService
 @inject GameService GameService
 @inject DockerServerEngine DockerServerEngine
+@inject IOptions<Settings> Settings
 @inject NavigationManager NavigationManager
 @inject IMessageService MessageService
 @inject ILogger<General> Logger
@@ -80,7 +85,7 @@
                     <Select
                         TItem="ServerEngineConfiguration"
                         TItemValue="Guid?"
-                        DataSource="Settings.Servers.ServerEngines"
+                        DataSource="Settings.Value.Server.GameServers.ServerEngines"
                         LabelName="Name"
                         ValueName="Id"
                         @bind-Value="context.DockerHostId"
@@ -140,8 +145,6 @@
     
     IEnumerable<Game> Games = new List<Game>();
     IEnumerable<DockerContainer> Containers = new List<DockerContainer>();
-    
-    Settings Settings = SettingService.GetSettings();
 
     Guid GameId;
     
diff --git a/LANCommander.Server/UI/Pages/Settings/Archives.razor b/LANCommander.Server/UI/Pages/Settings/Archives.razor
index a83d3868..ee46e239 100644
--- a/LANCommander.Server/UI/Pages/Settings/Archives.razor
+++ b/LANCommander.Server/UI/Pages/Settings/Archives.razor
@@ -1,5 +1,9 @@
 @page "/Settings/Archives"
+@using LANCommander.Server.Settings
+@using Microsoft.Extensions.Options
 @inject StorageLocationService StorageLocationService
+@inject IOptions<Settings> Settings
+@inject SettingsProvider<Settings> SettingsProvider
 @inject IMessageService MessageService
 @inject ILogger<Archives> Logger
 @attribute [Authorize(Roles = RoleService.AdministratorRoleName)]
@@ -7,17 +11,17 @@
 <PageHeader Title="Archives" />
 
 <PageContent>
-    <Form Model="Settings" Layout="@FormLayout.Vertical">
+    <Form Model="Settings.Value" Layout="@FormLayout.Vertical">
         <FormItem Label="Enable Patching">
-            <Switch @bind-Checked="context.Archives.EnablePatching" />
+            <Switch @bind-Checked="context.Server.Archives.EnablePatching" />
         </FormItem>
 
         <FormItem Label="Allow Insecure Downloads">
-            <Switch @bind-Checked="context.Archives.AllowInsecureDownloads" />
+            <Switch @bind-Checked="context.Server.Archives.AllowInsecureDownloads" />
         </FormItem>
 
         <FormItem Label="Max Upload Chunk Size (MB)">
-            <AntDesign.InputNumber @bind-Value="context.Archives.MaxChunkSize" Min="1" DefaultValue="50" />
+            <AntDesign.InputNumber @bind-Value="context.Server.Archives.MaxChunkSize" Min="1" DefaultValue="50" />
         </FormItem>
 
         <FormItem Label="Storage Paths">
@@ -53,15 +57,12 @@
 </PageContent>
 
 @code {
-    Settings Settings = SettingService.GetSettings();
     ICollection<StorageLocation> StorageLocations;
 
     string RootPath = Path.GetPathRoot(Directory.GetCurrentDirectory());
 
     protected override async Task OnInitializedAsync()
     {
-        Settings = SettingService.GetSettings();
-        
         StorageLocations = await StorageLocationService.GetAsync(l => l.Type == SDK.Enums.StorageLocationType.Archive);
     }
 
@@ -69,7 +70,10 @@
     {
         try
         {
-            SettingService.SaveSettings(Settings);
+            SettingsProvider.Update(s =>
+            {
+                s.Server.Archives = Settings.Value.Server.Archives;
+            });
 
             foreach (var storageLocation in StorageLocations)
             {
diff --git a/LANCommander.Server/UI/Pages/Settings/Authentication/Components/ClaimMappingsEditor.razor b/LANCommander.Server/UI/Pages/Settings/Authentication/Components/ClaimMappingsEditor.razor
index 973e9041..eeb4497b 100644
--- a/LANCommander.Server/UI/Pages/Settings/Authentication/Components/ClaimMappingsEditor.razor
+++ b/LANCommander.Server/UI/Pages/Settings/Authentication/Components/ClaimMappingsEditor.razor
@@ -1,4 +1,5 @@
-<Flex Vertical Gap="@("16")">
+@using LANCommander.Server.Settings.Models
+<Flex Vertical Gap="@("16")">
     <Table DataSource="ClaimMappings" Size="TableSize.Small" HidePagination>
         <PropertyColumn Property="cm => cm.Name">
             <Input @bind-Value="context.Name" OnBlur="Update" />
diff --git a/LANCommander.Server/UI/Pages/Settings/Authentication/Components/ExternalProviderEditor.razor b/LANCommander.Server/UI/Pages/Settings/Authentication/Components/ExternalProviderEditor.razor
index 7de6819b..ee89ecfd 100644
--- a/LANCommander.Server/UI/Pages/Settings/Authentication/Components/ExternalProviderEditor.razor
+++ b/LANCommander.Server/UI/Pages/Settings/Authentication/Components/ExternalProviderEditor.razor
@@ -1,4 +1,6 @@
-@inject IJSRuntime JSRuntime
+@using LANCommander.Server.Settings.Enums
+@using LANCommander.Server.Settings.Models
+@inject IJSRuntime JSRuntime
 
 <Flex Vertical Gap="FlexGap.Large">
     @if (!Providers.Any())
diff --git a/LANCommander.Server/UI/Pages/Settings/Authentication/Index.razor b/LANCommander.Server/UI/Pages/Settings/Authentication/Index.razor
index 5b0c471a..f68ec9fa 100644
--- a/LANCommander.Server/UI/Pages/Settings/Authentication/Index.razor
+++ b/LANCommander.Server/UI/Pages/Settings/Authentication/Index.razor
@@ -1,9 +1,14 @@
 @page "/Settings/Authentication"
 @using CaseConverter
+@using LANCommander.SDK.Extensions
+@using LANCommander.Server.Settings
 @using LANCommander.Server.UI.Pages.Settings.Authentication.Components
+@using Microsoft.Extensions.Options
 @inject IMessageService MessageService
 @inject ILogger<Index> Logger
 @inject IServiceProvider ServiceProvider
+@inject IOptions<Settings> Settings
+@inject SettingsProvider<Settings> SettingsProvider
 @attribute [Authorize(Roles = RoleService.AdministratorRoleName)]
 
 <PageHeader Title="Authentication">
@@ -13,34 +18,34 @@
 </PageHeader>
 
 <PageContent>
-    <Form Model="Settings" Layout="@FormLayout.Vertical">
+    <Form Model="Settings.Value" Layout="@FormLayout.Vertical">
         <FormItem Label="Require Account Approval">
-            <Switch @bind-Checked="context.Authentication.RequireApproval" />
+            <Switch @bind-Checked="context.Server.Authentication.RequireApproval" />
         </FormItem>
 
         <FormItem Label="Token Secret">
-            <InputPassword @bind-Value="context.Authentication.TokenSecret" />
+            <InputPassword @bind-Value="context.Server.Authentication.TokenSecret" />
         </FormItem>
         <FormItem Label="Token Lifetime">
-            <AntDesign.InputNumber @bind-Value="context.Authentication.TokenLifetime" Formatter="FormatTokenLifetime" Min="1" />
+            <AntDesign.InputNumber @bind-Value="context.Server.Authentication.TokenLifetime" Formatter="FormatTokenLifetime" Min="1" />
         </FormItem>
 
         <Divider Text="Password Requirements" />
 
         <FormItem Label="Require non-alphanumeric characters">
-            <Switch @bind-Checked="@context.Authentication.PasswordRequireNonAlphanumeric" />
+            <Switch @bind-Checked="@context.Server.Authentication.PasswordRequireNonAlphanumeric" />
         </FormItem>
         <FormItem Label="Require Lowercase characters">
-            <Switch @bind-Checked="context.Authentication.PasswordRequireLowercase" />
+            <Switch @bind-Checked="context.Server.Authentication.PasswordRequireLowercase" />
         </FormItem>
         <FormItem Label="Require Uppercase characters">
-            <Switch @bind-Checked="context.Authentication.PasswordRequireUppercase" />
+            <Switch @bind-Checked="context.Server.Authentication.PasswordRequireUppercase" />
         </FormItem>
         <FormItem Label="Require digits">
-            <Switch @bind-Checked="context.Authentication.PasswordRequireDigit" />
+            <Switch @bind-Checked="context.Server.Authentication.PasswordRequireDigit" />
         </FormItem>
         <FormItem Label="Minimum Length">
-            <AntDesign.InputNumber @bind-Value="context.Authentication.PasswordRequiredLength" Min="1" />
+            <AntDesign.InputNumber @bind-Value="context.Server.Authentication.PasswordRequiredLength" Min="1" />
         </FormItem>
 
         <Divider Text="Security" />
@@ -48,19 +53,19 @@
         <Collapse>
             <Panel Header="HTTP">
                 <FormItem Label="Minimum Same Site Cookie Policy">
-                    <EnumSelect TEnum="SameSiteMode" @bind-Value="context.Authentication.HttpCookiePolicy.SameSite" />
+                    <EnumSelect TEnum="SameSiteMode" @bind-Value="context.Server.Authentication.HttpCookiePolicy.SameSite" />
                 </FormItem>
                 <FormItem Label="Cookie Secure Policy">
-                    <EnumSelect TEnum="CookieSecurePolicy" @bind-Value="context.Authentication.HttpCookiePolicy.Secure" />
+                    <EnumSelect TEnum="CookieSecurePolicy" @bind-Value="context.Server.Authentication.HttpCookiePolicy.Secure" />
                 </FormItem>
             </Panel>
             
             <Panel Header="HTTPS">
                 <FormItem Label="Minimum Same Site Cookie Policy">
-                    <EnumSelect TEnum="SameSiteMode" @bind-Value="context.Authentication.HttpsCookiePolicy.SameSite" />
+                    <EnumSelect TEnum="SameSiteMode" @bind-Value="context.Server.Authentication.HttpsCookiePolicy.SameSite" />
                 </FormItem>
                 <FormItem Label="Cookie Secure Policy">
-                    <EnumSelect TEnum="CookieSecurePolicy" @bind-Value="context.Authentication.HttpsCookiePolicy.Secure" />
+                    <EnumSelect TEnum="CookieSecurePolicy" @bind-Value="context.Server.Authentication.HttpsCookiePolicy.Secure" />
                 </FormItem>
             </Panel>
         </Collapse>
@@ -68,13 +73,10 @@
 
     <Divider Text="External Providers" />
 
-    <ExternalProviderEditor @bind-Values="Settings.Authentication.AuthenticationProviders" />
+    <ExternalProviderEditor @bind-Values="Settings.Value.Server.Authentication.AuthenticationProviders" />
 </PageContent>
 
 @code {
-
-    Settings Settings = SettingService.GetSettings();
-
     string FormatTokenLifetime(int value)
     {
         return value.ToString() + " days";
@@ -84,13 +86,16 @@
     {
         try
         {
-            foreach (var authenticationProvider in Settings.Authentication.AuthenticationProviders)
+            SettingsProvider.Update(s =>
             {
-                if (String.IsNullOrWhiteSpace(authenticationProvider.Slug))
-                    authenticationProvider.Slug = authenticationProvider.Name.ToPascalCase();
-            }
-
-            SettingService.SaveSettings(Settings, ServiceProvider);
+                foreach (var authenticationProvider in Settings.Value.Server.Authentication.AuthenticationProviders)
+                {
+                    if (String.IsNullOrWhiteSpace(authenticationProvider.Slug))
+                        authenticationProvider.Slug = authenticationProvider.Name.ToPascalCase();
+                }
+                
+                s.Server.Authentication.AuthenticationProviders = Settings.Value.Server.Authentication.AuthenticationProviders;
+            });
 
             MessageService.Success("Settings saved!");
         }
diff --git a/LANCommander.Server/UI/Pages/Settings/Beacon.razor b/LANCommander.Server/UI/Pages/Settings/Beacon.razor
index 5ad01312..35d5a68c 100644
--- a/LANCommander.Server/UI/Pages/Settings/Beacon.razor
+++ b/LANCommander.Server/UI/Pages/Settings/Beacon.razor
@@ -1,8 +1,10 @@
 @page "/Settings/Beacon"
 @using LANCommander.SDK.Services
-@@using LANCommander.SDK.Services
-using LANCommander.SDK
+@using LANCommander.Server.Settings
+@using Microsoft.Extensions.Options
 @inject BeaconClient BeaconClient
+@inject IOptions<Settings> Settings
+@inject SettingsProvider<Settings> SettingsProvider
 @inject IMessageService MessageService
 @inject ILogger<Beacon> Logger
 @attribute [Authorize(Roles = RoleService.AdministratorRoleName)]
@@ -10,20 +12,20 @@ using LANCommander.SDK
 <PageHeader Title="Beacon" />
 
 <PageContent>
-    <Form Model="Settings" Layout="@FormLayout.Vertical">
+    <Form Model="Settings.Value" Layout="@FormLayout.Vertical">
         <FormItem Label="Enable">
             <Text Type="@TextElementType.Secondary">Enabling the beacon will allow clients on the same network to auto-discover the LANCommander address.</Text>
-            <Switch @bind-Checked="context.Beacon.Enabled" />
+            <Switch @bind-Checked="context.Server.Beacon.Enabled" />
         </FormItem>
 
         <FormItem Label="Name">
             <Text Type="@TextElementType.Secondary">Use this to customize the name that is broadcasted to clients.</Text>
-            <Input @bind-Value="Settings.Beacon.Name" />
+            <Input @bind-Value="context.Server.Beacon.Name" />
         </FormItem>
 
         <FormItem Label="Address">
-            <Text Type="@TextElementType.Secondary">Use this to customize the address that is broadcasted to clients. Default: http://&lt;Server IP&gt;:@context.Port</Text>
-            <Input @bind-Value="Settings.Beacon.Address" />
+            <Text Type="@TextElementType.Secondary">Use this to customize the address that is broadcasted to clients. Default: http://&lt;Server IP&gt;:@context.Server.Beacon.Port</Text>
+            <Input @bind-Value="context.Server.Beacon.Address" />
         </FormItem>
 
         <FormItem>
@@ -33,17 +35,18 @@ using LANCommander.SDK
 </PageContent>
 
 @code {
-    Settings Settings = SettingService.GetSettings();
-
     async Task Save()
     {
         try
         {
-            SettingService.SaveSettings(Settings);
+            SettingsProvider.Update(s =>
+            {
+                s.Server.Beacon = Settings.Value.Server.Beacon;
+            });
             MessageService.Success("Settings saved!");
 
-            if (Settings.Beacon.Enabled)
-                await BeaconClient.StartBeaconAsync(Settings.Beacon.Port, Settings.Beacon.Address, Settings.Beacon.Name);
+            if (Settings.Value.Server.Beacon.Enabled)
+                await BeaconClient.StartBeaconAsync(Settings.Value.Server.Beacon.Port, Settings.Value.Server.Beacon.Address, Settings.Value.Server.Beacon.Name);
             else
                 await BeaconClient.StopBeaconAsync();
         }
diff --git a/LANCommander.Server/UI/Pages/Settings/Components/ServerEngineEditor.razor b/LANCommander.Server/UI/Pages/Settings/Components/ServerEngineEditor.razor
index 1e5aa120..77ac0215 100644
--- a/LANCommander.Server/UI/Pages/Settings/Components/ServerEngineEditor.razor
+++ b/LANCommander.Server/UI/Pages/Settings/Components/ServerEngineEditor.razor
@@ -1,12 +1,17 @@
-@using LANCommander.Server.Data.Enums
+@using LANCommander.Server.Settings
+@using LANCommander.Server.Settings.Enums
+@using LANCommander.Server.Settings.Models
+@using Microsoft.Extensions.Options
+@inject IOptions<Settings> Settings
+
 <Flex Direction="FlexDirection.Vertical" Gap="FlexGap.Large">
-    @if (!Settings.Servers.ServerEngines.Any())
+    @if (!Settings.Value.Server.GameServers.ServerEngines.Any())
     {
         <Empty Description="@("No Docker hosts have been configured")" />
     }
     
     <Collapse>
-        @foreach (var serverEngine in Settings.Servers.ServerEngines)
+        @foreach (var serverEngine in Settings.Value.Server.GameServers.ServerEngines)
         {
             @if (serverEngine.Type == ServerEngine.Local)
             {
@@ -54,8 +59,6 @@
 @code {
     [Parameter] public IEnumerable<ServerEngineConfiguration> Values { get; set; }
     [Parameter] public EventCallback<IEnumerable<ServerEngineConfiguration>> ValuesChanged { get; set; }
-        
-    Settings Settings = SettingService.GetSettings();
 
     List<ServerEngineConfiguration> ServerEngines = new();
 
diff --git a/LANCommander.Server/UI/Pages/Settings/General.razor b/LANCommander.Server/UI/Pages/Settings/General.razor
index 9f4a1dfa..6a0179d7 100644
--- a/LANCommander.Server/UI/Pages/Settings/General.razor
+++ b/LANCommander.Server/UI/Pages/Settings/General.razor
@@ -1,9 +1,11 @@
 @page "/Settings"
 @page "/Settings/General"
-@using LANCommander.Server.Data.Enums
-@using LANCommander.Server.Models;
-@using LANCommander.Server.Extensions;
+@using LANCommander.Server.Settings
+@using LANCommander.Server.Settings.Enums
+@using Microsoft.Extensions.Options
 @inject IGDBService IGDBService
+@inject IOptions<Settings> Settings
+@inject SettingsProvider<Settings> SettingsProvider
 @inject IMessageService MessageService
 @inject ILogger<General> Logger
 @attribute [Authorize(Roles = RoleService.AdministratorRoleName)]
@@ -11,27 +13,20 @@
 <PageHeader Title="General" />
 
 <PageContent>
-    <Form Model="Settings" Layout="@FormLayout.Vertical">
+    <Form Model="Settings.Value" Layout="@FormLayout.Vertical">
         <FormItem Label="Database Provider">
-            <Select @bind-Value="context.DatabaseProvider" TItem="DatabaseProvider" TItemValue="DatabaseProvider" DataSource="Enum.GetValues<DatabaseProvider>()">
+            <Select @bind-Value="context.Server.Database.Provider" TItem="DatabaseProvider" TItemValue="DatabaseProvider" DataSource="Enum.GetValues<DatabaseProvider>()">
                 <LabelTemplate Context="Value">@Value.GetDisplayName()</LabelTemplate>
                 <ItemTemplate Context="Value">@Value.GetDisplayName()</ItemTemplate>
             </Select>
         </FormItem>
 
         <FormItem Label="Database Connection String">
-            <InputPassword @bind-Value="context.DatabaseConnectionString" />
+            <InputPassword @bind-Value="context.Server.Database.ConnectionString" />
         </FormItem>
 
         <FormItem Label="Port">
-            <AntDesign.InputNumber @bind-Value="context.Port" />
-        </FormItem>
-
-        <FormItem Label="Theme">
-            <Select @bind-Value="context.Theme" TItem="LANCommanderTheme" TItemValue="LANCommanderTheme" DataSource="Enum.GetValues<LANCommanderTheme>()">
-                <LabelTemplate Context="Value">@Value.GetDisplayName()</LabelTemplate>
-                <ItemTemplate Context="Value">@Value.GetDisplayName()</ItemTemplate>
-            </Select>
+            <AntDesign.InputNumber @bind-Value="context.Server.Http.Port" />
         </FormItem>
 
         <Divider Text="IGDB Credentials" />
@@ -39,28 +34,28 @@
         <Text Type="@TextElementType.Secondary">In order to use IGDB metadata, you need a Twitch developer account. <a href="https://api-docs.igdb.com/#account-creation" target="_blank">Click here</a> for more details.</Text>
 
         <FormItem Label="Client ID">
-            <Input @bind-Value="context.IGDBClientId" />
+            <Input @bind-Value="context.Server.IGDB.ClientId" />
         </FormItem>
         <FormItem Label="Client Secret">
-            <InputPassword @bind-Value="context.IGDBClientSecret" />
+            <InputPassword @bind-Value="context.Server.IGDB.ClientSecret" />
         </FormItem>
 
         <Divider Text="SSL" />
 
         <FormItem Label="Use SSL">
-            <Switch @bind-Checked="context.UseSSL" />
+            <Switch @bind-Checked="context.Server.Http.UseSSL" />
         </FormItem>
 
         <FormItem Label="SSL Port">
-            <AntDesign.InputNumber @bind-Value="context.SSLPort" Disabled="!context.UseSSL" />
+            <AntDesign.InputNumber @bind-Value="context.Server.Http.SSLPort" Disabled="!context.Server.Http.UseSSL" />
         </FormItem>
 
         <FormItem Label="Certificate Path">
-            <FilePicker Root="@RootPath" @bind-Value="context.CertificatePath" Disabled="!context.UseSSL" />
+            <FilePicker Root="@RootPath" @bind-Value="context.Server.Http.CertificatePath" Disabled="!context.Server.Http.UseSSL" />
         </FormItem>
 
         <FormItem Label="Certificate Password">
-            <InputPassword @bind-Value="context.CertificatePassword" Disabled="!context.UseSSL" />
+            <InputPassword @bind-Value="context.Server.Http.CertificatePassword" Disabled="!context.Server.Http.UseSSL" />
         </FormItem>
 
         <FormItem>
@@ -70,15 +65,18 @@
 </PageContent>
 
 @code {
-    Settings Settings = SettingService.GetSettings();
-    
     string RootPath = Path.GetPathRoot(Directory.GetCurrentDirectory());
 
     void Save()
     {
         try
         {
-            SettingService.SaveSettings(Settings);
+            SettingsProvider.Update(s =>
+            {
+                s.Server.Database = Settings.Value.Server.Database;
+                s.Server.Http = Settings.Value.Server.Http;
+                s.Server.IGDB = Settings.Value.Server.IGDB;
+            });
 
             IGDBService.Authenticate();
 
diff --git a/LANCommander.Server/UI/Pages/Settings/IPXRelay.razor b/LANCommander.Server/UI/Pages/Settings/IPXRelay.razor
index 10b37dab..764447b1 100644
--- a/LANCommander.Server/UI/Pages/Settings/IPXRelay.razor
+++ b/LANCommander.Server/UI/Pages/Settings/IPXRelay.razor
@@ -1,28 +1,32 @@
 @page "/Settings/IPXRelay"
+@using LANCommander.Server.Settings
+@using Microsoft.Extensions.Options
 @inject IPXRelayService IPXRelayService
 @inject IMessageService MessageService
 @inject ILogger<IPXRelay> Logger
+@inject IOptions<Settings> Settings
+@inject SettingsProvider<Settings> SettingsProvider
 @attribute [Authorize(Roles = RoleService.AdministratorRoleName)]
 
 <PageHeader Title="IPX Relay" />
 
 <PageContent>
-    <Form Model="Settings" Layout="@FormLayout.Vertical">
+    <Form Model="Settings.Value" Layout="@FormLayout.Vertical">
         <FormItem Label="Enable">
-            <Switch @bind-Checked="context.IPXRelay.Enabled" />
+            <Switch @bind-Checked="context.Server.IPXRelay.Enabled" />
         </FormItem>
 
         <FormItem Label="Host">
             <Text Type="@TextElementType.Secondary">Use this to customize the host that is broadcasted to clients.</Text>
-            <Input @bind-Value="context.IPXRelay.Host" />
+            <Input @bind-Value="context.Server.IPXRelay.Host" />
         </FormItem>
 
         <FormItem Label="Port">
-            <AntDesign.InputNumber @bind-Value="context.IPXRelay.Port" Max="65535" />
+            <AntDesign.InputNumber @bind-Value="context.Server.IPXRelay.Port" Max="65535" />
         </FormItem>
 
         <FormItem Label="Logging">
-            <Switch @bind-Checked="context.IPXRelay.Logging" />
+            <Switch @bind-Checked="context.Server.IPXRelay.Logging" />
         </FormItem>
 
         <FormItem>
@@ -32,13 +36,16 @@
 </PageContent>
 
 @code {
-    Settings Settings = SettingService.GetSettings();
 
     async Task Save()
     {
         try
         {
-            SettingService.SaveSettings(Settings);
+            SettingsProvider.Update(s =>
+            {
+                s.Server.IPXRelay = Settings.Value.Server.IPXRelay;
+            });
+            
             MessageService.Success("Settings saved!");
 
             await IPXRelayService.StopAsync();
diff --git a/LANCommander.Server/UI/Pages/Settings/Integrations/Steam.razor b/LANCommander.Server/UI/Pages/Settings/Integrations/Steam.razor
index 557e5bc1..fbf84cd7 100644
--- a/LANCommander.Server/UI/Pages/Settings/Integrations/Steam.razor
+++ b/LANCommander.Server/UI/Pages/Settings/Integrations/Steam.razor
@@ -1,7 +1,12 @@
 @page "/Settings/Integrations/Steam"
 @using LANCommander.Server.Services.Enums
+@using LANCommander.Server.Settings
+@using LANCommander.Server.Settings.Models
 @using LANCommander.Server.UI.Pages.Settings.Components
+@using Microsoft.Extensions.Options
 @inject SteamCMDService SteamCmdService
+@inject IOptions<Settings> Settings
+@inject SettingsProvider<Settings> SettingsProvider
 @inject IMessageService MessageService
 @inject ILogger<Beacon> Logger
 @attribute [Authorize(Roles = RoleService.AdministratorRoleName)]
@@ -13,9 +18,9 @@
 </PageHeader>
 
 <PageContent>
-    <Form Model="_settings" Layout="@FormLayout.Vertical">
+    <Form Model="Settings.Value" Layout="@FormLayout.Vertical">
         <FormItem Label="SteamCMD Path">
-            <FilePicker @bind-Value="_settings.SteamCMD.Path" Title="Choose SteamCMD Executable Path" Root="@_rootPath" />
+            <FilePicker @bind-Value="context.Server.SteamCMD.Path" Title="Choose SteamCMD Executable Path" Root="@_rootPath" />
         </FormItem>
     </Form>
     
@@ -23,7 +28,7 @@
     
     <Flex Direction="FlexDirection.Vertical" Gap="FlexGap.Large">
         <Collapse>
-            @foreach (var profile in _settings.SteamCMD.Profiles)
+            @foreach (var profile in Settings.Value.Server.SteamCMD.Profiles)
             {
                 <Panel Header="@(String.IsNullOrWhiteSpace(profile.Username) ? "New Profile" : profile.Username)">
                     <ExtraTemplate>
@@ -48,8 +53,6 @@
 </PageContent>
 
 @code {
-    Settings _settings = SettingService.GetSettings();
-    
     string _rootPath = Path.GetPathRoot(Directory.GetCurrentDirectory());
 
     SteamCmdConnectionStatus _connectionStatus;
@@ -61,18 +64,18 @@
 
     protected override async Task OnInitializedAsync()
     {
-        if (!_settings.SteamCMD.Profiles.Any())
+        if (!Settings.Value.Server.SteamCMD.Profiles.Any())
             AddProfile();
     }
 
     void AddProfile()
     {
-        _settings.SteamCMD.Profiles.Add(new SteamCmdProfile());
+        Settings.Value.Server.SteamCMD.Profiles.Add(new SteamCmdProfile());
     }
 
     async Task RemoveProfile(SteamCmdProfile profile)
     {
-        _settings.SteamCMD.Profiles.Remove(profile);
+        Settings.Value.Server.SteamCMD.Profiles.Remove(profile);
 
         if (!String.IsNullOrWhiteSpace(profile.Username))
         {
@@ -93,7 +96,7 @@
             MessageService.Success(logoutMessage);
         }
 
-        if (!_settings.SteamCMD.Profiles.Any())
+        if (!Settings.Value.Server.SteamCMD.Profiles.Any())
             AddProfile();
     }
 
@@ -101,8 +104,13 @@
     {
         try
         {
-            _settings.SteamCMD.Profiles = _settings.SteamCMD.Profiles.Where(p => !String.IsNullOrWhiteSpace(p.Username)).ToList();
-            SettingService.SaveSettings(_settings);
+            Settings.Value.Server.SteamCMD.Profiles = Settings.Value.Server.SteamCMD.Profiles.Where(p => !String.IsNullOrWhiteSpace(p.Username)).ToList();
+
+            SettingsProvider.Update(s =>
+            {
+                s.Server.SteamCMD = Settings.Value.Server.SteamCMD;
+            });
+            
             MessageService.Success("Settings saved!");
         }
         catch (Exception ex)
diff --git a/LANCommander.Server/UI/Pages/Settings/Launcher.razor b/LANCommander.Server/UI/Pages/Settings/Launcher.razor
index 254debd3..8385d56e 100644
--- a/LANCommander.Server/UI/Pages/Settings/Launcher.razor
+++ b/LANCommander.Server/UI/Pages/Settings/Launcher.razor
@@ -1,43 +1,48 @@
 @page "/Settings/Launcher"
 @using LANCommander.Server.Jobs.Background
+@using LANCommander.Server.Settings
+@using LANCommander.Server.Settings.Enums
+@using Microsoft.Extensions.Options
 @inject IMessageService MessageService
 @inject ILogger<Updates> Logger
+@inject IOptions<Settings> Settings
+@inject SettingsProvider<Settings> SettingsProvider
 @attribute [Authorize(Roles = RoleService.AdministratorRoleName)]
 
 <PageHeader Title="Launcher">
     <PageHeaderExtra>
-        <Button OnClick="DownloadLaunchers" Disabled="!Settings.Launcher.HostUpdates">Download Launchers</Button>
+        <Button OnClick="DownloadLaunchers" Disabled="!Settings.Value.Server.Launcher.HostUpdates">Download Launchers</Button>
     </PageHeaderExtra>
 </PageHeader>
 
 <PageContent>
-    <Form Model="Settings" Layout="@FormLayout.Vertical">
+    <Form Model="Settings.Value" Layout="@FormLayout.Vertical">
         <FormItem Label="Storage Path">
-            <FilePicker Root="@RootPath" EntrySelectable="x => x is FileManagerDirectory" @bind-Value="@context.Launcher.StoragePath" OkText="Select Path" Title="Choose Path" OnSelected="OnPathSelected" />
+            <FilePicker Root="@RootPath" EntrySelectable="x => x is FileManagerDirectory" @bind-Value="@context.Server.Launcher.StoragePath" OkText="Select Path" Title="Choose Path" OnSelected="OnPathSelected" />
         </FormItem>
 
         <FormItem Label="Host Client Updates">
-            <Switch @bind-Checked="context.Launcher.HostUpdates" />
+            <Switch @bind-Checked="context.Server.Launcher.HostUpdates" />
         </FormItem>
 
         <FormItem Label="Always include Online Updates">
-            <Switch @bind-Checked="context.Launcher.IncludeOnlineUpdates" />
+            <Switch @bind-Checked="context.Server.Launcher.IncludeOnlineUpdates" />
         </FormItem>
 
         <FormItem Label="Architectures">
             <EnumSelect
                 TEnum="LauncherArchitecture"
                 Mode="SelectMode.Multiple"
-                Disabled="!context.Launcher.HostUpdates"
-                @bind-Values="context.Launcher.Architectures" />
+                Disabled="!context.Server.Launcher.HostUpdates"
+                @bind-Values="context.Server.Launcher.Architectures" />
         </FormItem>
 
         <FormItem Label="Platforms">
             <EnumSelect
                 TEnum="LauncherPlatform"
                 Mode="SelectMode.Multiple"
-                Disabled="!context.Launcher.HostUpdates"
-                @bind-Values="context.Launcher.Platforms" />
+                Disabled="!context.Server.Launcher.HostUpdates"
+                @bind-Values="context.Server.Launcher.Platforms" />
         </FormItem>
 
         <FormItem>
@@ -47,15 +52,17 @@
 </PageContent>
 
 @code {
-    Settings Settings = SettingService.GetSettings();
-
     string RootPath = Path.GetPathRoot(Directory.GetCurrentDirectory());
 
     void Save()
     {
         try
         {
-            SettingService.SaveSettings(Settings);
+            SettingsProvider.Update(s =>
+            {
+                s.Server.Launcher = Settings.Value.Server.Launcher;
+            });
+            
             MessageService.Success("Settings saved!");
         }
         catch (Exception ex)
@@ -72,7 +79,7 @@
         if (path != null && path.StartsWith(appPath))
             path = path.Substring(appPath.Length).TrimStart(Path.DirectorySeparatorChar).TrimEnd(Path.DirectorySeparatorChar);
 
-        Settings.Launcher.StoragePath = path;
+        Settings.Value.Server.Launcher.StoragePath = path;
     }
 
     async Task DownloadLaunchers()
diff --git a/LANCommander.Server/UI/Pages/Settings/Library.razor b/LANCommander.Server/UI/Pages/Settings/Library.razor
index 83dd33e8..f8a7b09e 100644
--- a/LANCommander.Server/UI/Pages/Settings/Library.razor
+++ b/LANCommander.Server/UI/Pages/Settings/Library.razor
@@ -1,19 +1,23 @@
 @page "/Settings/Library"
+@using LANCommander.Server.Settings
+@using Microsoft.Extensions.Options
 @inject IMessageService MessageService
 @inject ILogger<Servers> Logger
+@inject IOptions<Settings> Settings
+@inject SettingsProvider<Settings> SettingsProvider
 @attribute [Authorize(Roles = RoleService.AdministratorRoleName)]
 
 <PageHeader Title="Library" />
 
 <PageContent>
-    <Form Model="Settings" Layout="@FormLayout.Vertical">
+    <Form Model="Settings.Value" Layout="@FormLayout.Vertical">
         <FormItem Label="Enable User Libraries">
             <HelpButton>
                 <Description>
                     Allows users to manage the games they see in their library. This also enables the Depot!
                 </Description>
                 <ChildContent>
-                    <Switch @bind-Checked="Settings.Library.EnableUserLibraries"/>
+                    <Switch @bind-Checked="context.Server.Library.EnableUserLibraries"/>
                 </ChildContent>
             </HelpButton>
         </FormItem>
@@ -24,7 +28,7 @@
                     Restricts the games that users can see in their library and the depot based on their role. Visit Settings / Roles to assign collections to roles.
                 </Description>
                 <ChildContent>
-                    <Switch @bind-Checked="Settings.Roles.RestrictGamesByCollection"/>
+                    <Switch @bind-Checked="context.Server.Roles.RestrictGamesByCollection"/>
                 </ChildContent>
             </HelpButton>
         </FormItem>
@@ -36,13 +40,16 @@
 </PageContent>
 
 @code {
-    Settings Settings = SettingService.GetSettings();
-
     void Save()
     {
         try
         {
-            SettingService.SaveSettings(Settings);
+            SettingsProvider.Update(s =>
+            {
+                s.Server.Library = Settings.Value.Server.Library;
+                s.Server.Roles.RestrictGamesByCollection = Settings.Value.Server.Roles.RestrictGamesByCollection;
+            });
+            
             MessageService.Success("Settings saved!");
         }
         catch (Exception ex)
diff --git a/LANCommander.Server/UI/Pages/Settings/Logs/Components/ProviderEditorPanel.razor b/LANCommander.Server/UI/Pages/Settings/Logs/Components/ProviderEditorPanel.razor
index 2b6d032b..51eeabb8 100644
--- a/LANCommander.Server/UI/Pages/Settings/Logs/Components/ProviderEditorPanel.razor
+++ b/LANCommander.Server/UI/Pages/Settings/Logs/Components/ProviderEditorPanel.razor
@@ -1,4 +1,6 @@
 @using LANCommander.Server.Parsers
+@using LANCommander.Server.Settings.Enums
+@using LANCommander.Server.Settings.Models
 <Form Model="Provider" Layout="FormLayout.Vertical" OnFieldChanged="OnChanged">
     <FormItem Label="Name">
         <Input @bind-Value="Provider.Name" BindOnInput/>
diff --git a/LANCommander.Server/UI/Pages/Settings/Logs/Index.razor b/LANCommander.Server/UI/Pages/Settings/Logs/Index.razor
index 544dae3c..8921148f 100644
--- a/LANCommander.Server/UI/Pages/Settings/Logs/Index.razor
+++ b/LANCommander.Server/UI/Pages/Settings/Logs/Index.razor
@@ -1,5 +1,11 @@
 @page "/Settings/Logs"
+@using LANCommander.Server.Settings
+@using LANCommander.Server.Settings.Enums
+@using LANCommander.Server.Settings.Models
 @using LANCommander.Server.UI.Pages.Settings.Logs.Components
+@using Microsoft.Extensions.Options
+@inject IOptions<Settings> Settings
+@inject SettingsProvider<Settings> SettingsProvider
 @inject IMessageService MessageService
 @inject ILogger<Index> Logger
 
@@ -45,22 +51,23 @@
 }
 
 @code {
-    Settings Settings = SettingService.GetSettings();
-
     List<LoggingProvider> Providers = new();
 
     protected override void OnInitialized()
     {
-        Providers = Settings.Logs.Providers.ToList();
+        Providers = Settings.Value.Server.Logs.Providers.ToList();
     }
 
     void Save()
     {
         try
         {
-            Settings.Logs.Providers = Providers;
+            Settings.Value.Server.Logs.Providers = Providers;
             
-            SettingService.SaveSettings(Settings);
+            SettingsProvider.Update(s =>
+            {
+                s.Server.Logs = Settings.Value.Server.Logs;
+            }); 
             
             MessageService.Success("Settings saved!");
         }
diff --git a/LANCommander.Server/UI/Pages/Settings/Media/Components/MediaTypeSettingsEditor.razor b/LANCommander.Server/UI/Pages/Settings/Media/Components/MediaTypeSettingsEditor.razor
index d131c4fd..105d6cd4 100644
--- a/LANCommander.Server/UI/Pages/Settings/Media/Components/MediaTypeSettingsEditor.razor
+++ b/LANCommander.Server/UI/Pages/Settings/Media/Components/MediaTypeSettingsEditor.razor
@@ -1,3 +1,4 @@
+@using LANCommander.Server.Settings.Models
 @if (Value != null)
 {
     <Panel Header="@Value.Type.ToString()">
diff --git a/LANCommander.Server/UI/Pages/Settings/Media/Index.razor b/LANCommander.Server/UI/Pages/Settings/Media/Index.razor
index 60d3d4aa..8906e602 100644
--- a/LANCommander.Server/UI/Pages/Settings/Media/Index.razor
+++ b/LANCommander.Server/UI/Pages/Settings/Media/Index.razor
@@ -1,7 +1,12 @@
 @page "/Settings/Media"
 @using LANCommander.SDK.Enums
+@using LANCommander.Server.Settings
+@using LANCommander.Server.Settings.Models
 @using LANCommander.Server.UI.Pages.Settings.Media.Components
+@using Microsoft.Extensions.Options
 @inject StorageLocationService StorageLocationService
+@inject IOptions<Settings> Settings
+@inject SettingsProvider<Settings> SettingsProvider
 @inject IMessageService MessageService
 @inject ILogger<Media> Logger
 @attribute [Authorize(Roles = RoleService.AdministratorRoleName)]
@@ -13,7 +18,7 @@
 </PageHeader>
 
 <PageContent>
-    <Form Model="Settings" Layout="@FormLayout.Vertical">
+    <Form Model="Settings.Value" Layout="@FormLayout.Vertical">
         <FormItem Label="Storage Path">
             <FilePicker Root="@RootPath" EntrySelectable="x => x is FileManagerDirectory" @bind-Value="@StorageLocation.Path" OkText="Select Path" Title="Choose Path" OnSelected="OnPathSelected" />
         </FormItem>
@@ -22,7 +27,7 @@
         <Text Type="@TextElementType.Secondary">In order to automatically search SteamGridDB for media, you need an API key. <a href="https://www.steamgriddb.com/profile/preferences/api" target="_blank">Click here</a> to get your key.</Text>
 
         <FormItem Label="API Key">
-            <InputPassword @bind-Value="context.Media.SteamGridDbApiKey" />
+            <InputPassword @bind-Value="context.Server.Media.SteamGridDbApiKey" />
         </FormItem>
         
         <CascadingValue Value="Settings">
@@ -40,8 +45,6 @@
 </PageContent>
 
 @code {
-    Settings Settings = SettingService.GetSettings();
-
     string RootPath = Path.GetPathRoot(Directory.GetCurrentDirectory());
 
     StorageLocation StorageLocation = new();
@@ -64,16 +67,19 @@
             StorageLocation = await StorageLocationService.AddAsync(StorageLocation);
         }
 
-        _mediaTypeSettings = Settings.Media.MediaTypes.DistinctBy(m => m.Type).ToDictionary(m => m.Type, m => m);
+        _mediaTypeSettings = Settings.Value.Server.Media.MediaTypes.DistinctBy(m => m.Type).ToDictionary(m => m.Type, m => m);
     }
 
     async Task Save()
     {
         try
         {
-            Settings.Media.MediaTypes = _mediaTypeSettings.Values;
+            Settings.Value.Server.Media.MediaTypes = _mediaTypeSettings.Values;
             
-            SettingService.SaveSettings(Settings);
+            SettingsProvider.Update(s =>
+            {
+                s.Server.Media = Settings.Value.Server.Media;
+            });
 
             await StorageLocationService.UpdateAsync(StorageLocation);
             
diff --git a/LANCommander.Server/UI/Pages/Settings/Roles/Index.razor b/LANCommander.Server/UI/Pages/Settings/Roles/Index.razor
index 5dfae2be..1a264d43 100644
--- a/LANCommander.Server/UI/Pages/Settings/Roles/Index.razor
+++ b/LANCommander.Server/UI/Pages/Settings/Roles/Index.razor
@@ -1,5 +1,9 @@
 @page "/Settings/Roles"
+@using LANCommander.Server.Settings
+@using Microsoft.Extensions.Options
 @inject RoleService RoleService
+@inject IOptions<Settings> Settings
+@inject SettingsProvider<Settings> SettingsProvider
 @inject IMessageService MessageService
 @inject ILogger<Index> Logger
 @attribute [Authorize(Roles = RoleService.AdministratorRoleName)]
@@ -46,7 +50,7 @@
                 LabelName="Name"
                 ValueName="Id"
                 DefaultActiveFirstOption="false"
-                Value="Settings.Roles.DefaultRoleId"
+                Value="Settings.Value.Server.Roles.DefaultRoleId"
                 Disabled="Loading"
                 Style="min-width: 100px;"></Select>
             <Button OnClick="() => ShowNewRoleDialog()" Type="@ButtonType.Primary">Add Role</Button>
@@ -63,7 +67,6 @@
 </Modal>
 
 @code {
-    Settings Settings = SettingService.GetSettings();
     bool Loading = true;
     bool AddRoleDialogVisible = false;
 
@@ -134,13 +137,12 @@
 
     async Task DefaultRoleChanged(Role defaultRole)
     {
-        if (!Loading && defaultRole.Id != Settings.Roles.DefaultRoleId)
+        if (!Loading && defaultRole.Id != Settings.Value.Server.Roles.DefaultRoleId)
         {
-            Settings = SettingService.GetSettings();
-
-            Settings.Roles.DefaultRoleId = defaultRole.Id;
-        
-            SettingService.SaveSettings(Settings);
+            SettingsProvider.Update(s =>
+            {
+                s.Server.Roles.DefaultRoleId = defaultRole.Id;
+            });
 
             MessageService.Success($"Default role updated!");
         }
diff --git a/LANCommander.Server/UI/Pages/Settings/Scripts.razor b/LANCommander.Server/UI/Pages/Settings/Scripts.razor
index 2ad3efe9..2fd6c87f 100644
--- a/LANCommander.Server/UI/Pages/Settings/Scripts.razor
+++ b/LANCommander.Server/UI/Pages/Settings/Scripts.razor
@@ -1,19 +1,23 @@
 @page "/Settings/Scripts"
 @using LANCommander.SDK.Enums
+@using LANCommander.Server.Settings
+@using Microsoft.Extensions.Options
 @inject MessageService MessageService
 @inject ILogger<Scripts> Logger
+@inject IOptions<Settings> Settings
+@inject SettingsProvider<Settings> SettingsProvider
 @attribute [Authorize(Roles = RoleService.AdministratorRoleName)]
 
 <PageHeader Title="Scripts" />
 
 <PageContent>
-    <Form Model="Settings" Layout="@FormLayout.Vertical">
+    <Form Model="Settings.Value" Layout="@FormLayout.Vertical">
         <FormItem Label="Automatically Repackage">
-            <Switch @bind-Checked="context.Scripts.EnableAutomaticRepackaging" />
+            <Switch @bind-Checked="context.Server.Scripts.EnableAutomaticRepackaging" />
         </FormItem>
         <FormItem Label="Repackage Every">
             <Flex Direction="FlexDirection.Horizontal">
-                <AntDesign.InputNumber @bind-Value="context.Scripts.RepackageEvery" Min="1" DefaultValue="25" />
+                <AntDesign.InputNumber @bind-Value="context.Server.Scripts.RepackageEvery" Min="1" DefaultValue="25" />
                 <Text>Hours</Text>
             </Flex>
         </FormItem>
@@ -27,13 +31,15 @@
 </PageContent>
 
 @code {
-    Settings Settings = SettingService.GetSettings();
-
     void Save()
     {
         try
         {
-            SettingService.SaveSettings(Settings);
+            SettingsProvider.Update(s =>
+            {
+                s.Server.Scripts = Settings.Value.Server.Scripts;
+            });
+            
             MessageService.Success("Settings saved!");
         }
         catch (Exception ex)
diff --git a/LANCommander.Server/UI/Pages/Settings/Servers.razor b/LANCommander.Server/UI/Pages/Settings/Servers.razor
index 2924f2d9..9517dd06 100644
--- a/LANCommander.Server/UI/Pages/Settings/Servers.razor
+++ b/LANCommander.Server/UI/Pages/Settings/Servers.razor
@@ -1,7 +1,11 @@
 @page "/Settings/Servers"
+@using LANCommander.Server.Settings
 @using LANCommander.Server.UI.Pages.Settings.Components
+@using Microsoft.Extensions.Options
 @inject IMessageService MessageService
 @inject ILogger<Servers> Logger
+@inject IOptions<Settings> Settings
+@inject SettingsProvider<Settings> SettingsProvider
 @attribute [Authorize(Roles = RoleService.AdministratorRoleName)]
 
 <PageHeader Title="Servers">
@@ -11,31 +15,28 @@
 </PageHeader>
 
 <PageContent>
-    <Form Model="Settings" Layout="@FormLayout.Vertical">
+    <Form Model="Settings.Value" Layout="@FormLayout.Vertical">
         <FormItem Label="Storage Path">
-            <FilePicker Root="@RootPath" EntrySelectable="x => x is FileManagerDirectory" @bind-Value="@context.Servers.StoragePath" OkText="Select Path" Title="Choose Path" OnSelected="OnPathSelected" />
+            <FilePicker Root="@RootPath" EntrySelectable="x => x is FileManagerDirectory" @bind-Value="@context.Server.GameServers.StoragePath" OkText="Select Path" Title="Choose Path" OnSelected="OnPathSelected" />
         </FormItem>
     </Form>
     
     <Divider Text="Docker Hosts" />
     
-    <ServerEngineEditor @bind-Values="Settings.Servers.ServerEngines" />
+    <ServerEngineEditor @bind-Values="Settings.Value.Server.GameServers.ServerEngines" />
 </PageContent>
 
 @code {
-    Settings Settings = SettingService.GetSettings();
-
     string RootPath = Path.GetPathRoot(Directory.GetCurrentDirectory());
 
     void Save()
     {
         try
         {
-            var settings = SettingService.GetSettings();
-
-            settings.Servers = Settings.Servers;
-            
-            SettingService.SaveSettings(settings);
+            SettingsProvider.Update(s =>
+            {
+                s.Server.GameServers = Settings.Value.Server.GameServers;
+            });
             
             MessageService.Success("Settings saved!");
         }
@@ -53,6 +54,6 @@
         if (path != null && path.StartsWith(appPath))
             path = path.Substring(appPath.Length).TrimStart(Path.DirectorySeparatorChar).TrimEnd(Path.DirectorySeparatorChar);
 
-        Settings.Servers.StoragePath = path;
+        Settings.Value.Server.GameServers.StoragePath = path;
     }
 }
diff --git a/LANCommander.Server/UI/Pages/Settings/Tools/OrphanedFiles.razor b/LANCommander.Server/UI/Pages/Settings/Tools/OrphanedFiles.razor
index 4f907794..e4b2a09b 100644
--- a/LANCommander.Server/UI/Pages/Settings/Tools/OrphanedFiles.razor
+++ b/LANCommander.Server/UI/Pages/Settings/Tools/OrphanedFiles.razor
@@ -1,5 +1,7 @@
 @page "/Settings/Tools/OrphanedFiles"
 @using LANCommander.Helpers;
+@using LANCommander.Server.Settings
+@using Microsoft.Extensions.Options
 @attribute [Authorize(Roles = RoleService.AdministratorRoleName)]
 @inject ArchiveClient ArchiveClient
 @inject StorageLocationService StorageLocationService
@@ -41,8 +43,6 @@
     ICollection<OrphanedFile> Orphans = new List<OrphanedFile>();
     bool Loading = true;
 
-    readonly Settings Settings = SettingService.GetSettings();
-
     protected override async Task OnInitializedAsync()
     {
         await LoadData();
diff --git a/LANCommander.Server/UI/Pages/Settings/Updates.razor b/LANCommander.Server/UI/Pages/Settings/Updates.razor
index 14822e98..df72dbbe 100644
--- a/LANCommander.Server/UI/Pages/Settings/Updates.razor
+++ b/LANCommander.Server/UI/Pages/Settings/Updates.razor
@@ -1,6 +1,9 @@
 @page "/Settings/Updates"
 @using LANCommander.Server.Services.Abstractions
+@using LANCommander.Server.Settings
+@using LANCommander.Server.Settings.Enums
 @using Markdig
+@using Microsoft.Extensions.Options
 @using Octokit
 @using Semver
 @inject IMessageService MessageService
@@ -8,13 +11,15 @@
 @inject IGitHubService GitHubService
 @inject IVersionProvider VersionProvider
 @inject ILogger<Updates> Logger
+@inject IOptions<Settings> Settings
+@inject SettingsProvider<Settings> SettingsProvider
 @attribute [Authorize(Roles = RoleService.AdministratorRoleName)]
 
 <PageHeader Title="Updates">
     <PageHeaderExtra>
         <Flex Justify="FlexJustify.End" Align="FlexAlign.Center" Gap="FlexGap.Small">
             Release Channel:
-            <EnumSelect TEnum="ReleaseChannel" OnSelectedItemChanged="ReleaseChannelChanged" @bind-Value="Settings.Update.ReleaseChannel" Disabled="Loading" />
+            <EnumSelect TEnum="ReleaseChannel" OnSelectedItemChanged="ReleaseChannelChanged" @bind-Value="Settings.Value.Server.Update.ReleaseChannel" Disabled="Loading" />
             <Button Type="@ButtonType.Primary" OnClick="Update" Disabled="@(!UpdateAvailable || Updating)" Loading="Updating">Update</Button>
         </Flex>
     </PageHeaderExtra>
@@ -73,8 +78,6 @@
 </PageContent>
 
 @code {
-    Settings Settings = SettingService.GetSettings();
-
     string RootPath = Path.GetPathRoot(Directory.GetCurrentDirectory());
 
     bool Loading { get; set; } = true;
@@ -98,7 +101,7 @@
         
         CurrentVersion = VersionProvider.GetCurrentVersion();
         UpdateAvailable = await UpdateService.UpdateAvailableAsync();
-        LatestVersion = await GitHubService.GetLatestVersionAsync(Settings.Update.ReleaseChannel);
+        LatestVersion = await GitHubService.GetLatestVersionAsync(Settings.Value.Server.Update.ReleaseChannel);
         Releases = await GitHubService.GetReleasesAsync(5);
 
         Loading = false;
@@ -111,11 +114,10 @@
     {
         if (!Loading)
         {
-            Settings = SettingService.GetSettings();
-
-            Settings.Update.ReleaseChannel = releaseChannel;
-        
-            SettingService.SaveSettings(Settings);
+            SettingsProvider.Update(s =>
+            {
+                s.Server.Update.ReleaseChannel = releaseChannel;
+            });
 
             MessageService.Success($"Changed release channel to {releaseChannel}!");
         }
@@ -126,7 +128,7 @@
         try {
             Updating = true;
 
-            if (Settings.Launcher.HostUpdates)
+            if (Settings.Value.Server.Launcher.HostUpdates)
                 await UpdateService.DownloadLauncherReleaseAsync(Releases.First());
 
             await UpdateService.DownloadServerReleaseAsync(Releases.First());
diff --git a/LANCommander.Server/UI/Pages/Settings/UserSaves.razor b/LANCommander.Server/UI/Pages/Settings/UserSaves.razor
index 348c2ab0..cbef1615 100644
--- a/LANCommander.Server/UI/Pages/Settings/UserSaves.razor
+++ b/LANCommander.Server/UI/Pages/Settings/UserSaves.razor
@@ -1,24 +1,28 @@
 @page "/Settings/UserSaves"
 @using LANCommander.SDK.Enums
+@using LANCommander.Server.Settings
+@using Microsoft.Extensions.Options
 @inject StorageLocationService StorageLocationService
 @inject IMessageService MessageService
 @inject ILogger<UserSaves> Logger
+@inject IOptions<Settings> Settings
+@inject SettingsProvider<Settings> SettingsProvider
 @attribute [Authorize(Roles = RoleService.AdministratorRoleName)]
 
 <PageHeader Title="User Saves" />
 
 <PageContent>
-    <Form Model="Settings" Layout="@FormLayout.Vertical">
+    <Form Model="Settings.Value" Layout="@FormLayout.Vertical">
         <FormItem Label="Storage Path">
             <FilePicker Root="@RootPath" EntrySelectable="x => x is FileManagerDirectory" @bind-Value="@SaveStorageLocation.Path" OkText="Select Path" Title="Choose Path" OnSelected="OnPathSelected" />
         </FormItem>
 
         <FormItem Label="Max Size (MB)">
-            <AntDesign.InputNumber @bind-Value="context.UserSaves.MaxSize" Min="1" DefaultValue="25" />
+            <AntDesign.InputNumber @bind-Value="context.Server.UserSaves.MaxSize" Min="1" DefaultValue="25" />
         </FormItem>
 
         <FormItem Label="Maximum Number of Saves">
-            <AntDesign.InputNumber @bind-Value="context.UserSaves.MaxSaves" Min="0" DefaultValue="0" />
+            <AntDesign.InputNumber @bind-Value="context.Server.UserSaves.MaxSaves" Min="0" DefaultValue="0" />
         </FormItem>
 
         <FormItem>
@@ -28,8 +32,6 @@
 </PageContent>
 
 @code {
-    Settings Settings = SettingService.GetSettings();
-
     string RootPath = Path.GetPathRoot(Directory.GetCurrentDirectory());
 
     StorageLocation SaveStorageLocation = new();
@@ -43,8 +45,13 @@
     {
         try
         {
-            SettingService.SaveSettings(Settings);
+            SettingsProvider.Update(s =>
+            {
+                s.Server.UserSaves = Settings.Value.Server.UserSaves;
+            });
+            
             await StorageLocationService.UpdateAsync(SaveStorageLocation);
+            
             MessageService.Success("Settings saved!");
         }
         catch (Exception ex)
diff --git a/LANCommander.Server/UI/Pages/Settings/Users/Index.razor b/LANCommander.Server/UI/Pages/Settings/Users/Index.razor
index 95944794..16c3d773 100644
--- a/LANCommander.Server/UI/Pages/Settings/Users/Index.razor
+++ b/LANCommander.Server/UI/Pages/Settings/Users/Index.razor
@@ -1,6 +1,10 @@
 @page "/Settings/Users"
+@using LANCommander.Server.Settings
 @using LANCommander.Server.UI.Pages.Settings.Users.Components
+@using Microsoft.Extensions.Options
 @inject UserService UserService
+@inject IOptions<Settings> Settings
+@inject SettingsProvider<Settings> SettingsProvider
 @inject ModalService ModalService
 @inject IMessageService MessageService
 @inject NavigationManager NavigationManager
@@ -35,7 +39,7 @@
             <LocalTime Value="context.CreatedOn" />
         </BoundDataColumn>
         
-        @if (Settings.Authentication.RequireApproval)
+        @if (Settings.Value.Server.Authentication.RequireApproval)
         {
             <DataColumn TData="bool" Title="Approved">
                 <Checkbox Checked="context.Approved" />
@@ -50,7 +54,7 @@
             <DropdownButton Type="ButtonType.Primary" OnClick="@(() => NavigationManager.NavigateTo($"/Settings/Users/{context.UserName}"))">
                 <Overlay>
                     <Menu>
-                        @if (Settings.Authentication.RequireApproval && !context.Approved)
+                        @if (Settings.Value.Server.Authentication.RequireApproval && !context.Approved)
                         {
                             <MenuItem OnClick="() => ApproveUser(context)" Type="@ButtonType.Primary">Approve</MenuItem>
                         }
@@ -93,8 +97,7 @@
 
 @code {
     ICollection<UserViewModel> UserList { get; set; } = new List<UserViewModel>();
-
-    Settings Settings = SettingService.GetSettings();
+    
     bool Loading = true;
 
     DataTable<User> Table;
diff --git a/LANCommander.Server/UI/Pages/_Layout.cshtml b/LANCommander.Server/UI/Pages/_Layout.cshtml
index 8f226a3c..2ec2fbaf 100644
--- a/LANCommander.Server/UI/Pages/_Layout.cshtml
+++ b/LANCommander.Server/UI/Pages/_Layout.cshtml
@@ -1,13 +1,8 @@
-@using LANCommander.Server.Services
-@using LANCommander.Server.Services.Models
-@using Microsoft.AspNetCore.Components.Web
+@using LANCommander.Server.Settings
+@using Microsoft.Extensions.Options
 @namespace LANCommander.Server.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
-@inject SettingService SettingService
-
-@{
-    var settings = SettingService.GetSettings();
-}
+@inject IOptions<Settings> Settings
 
 <!DOCTYPE html>
 <html lang="en">
@@ -15,18 +10,8 @@
         <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <base href="~/" />
-
-        @switch (SettingService.GetSettings().Theme)
-        {
-            case LANCommanderTheme.Light:
-                <link href="_content/AntDesign/css/ant-design-blazor.css" rel="stylesheet" />
-                break;
-
-            case LANCommanderTheme.Dark:
-                <link href="_content/AntDesign/css/ant-design-blazor.dark.css" rel="stylesheet" />
-                break;
-        }
-
+        
+        <link href="_content/AntDesign/css/ant-design-blazor.dark.css" rel="stylesheet" />
         <link rel="stylesheet" href="_content/XtermBlazor/XtermBlazor.min.css"  />
         <link rel="stylesheet" href="_content/PSC.Blazor.Components.MarkdownEditor/css/markdowneditor.css" />
         <link rel="stylesheet" href="_content/PSC.Blazor.Components.MarkdownEditor/css/easymde.min.css" />
@@ -34,7 +19,7 @@
         <link rel="stylesheet" href="~/css/site.css" />
         <link rel="stylesheet" href="~/css/custom.css" />
     </head>
-    <body data-theme="@settings.Theme">
+    <body data-theme="dark">
         
 
         <div class="page-wrapper">
@@ -64,7 +49,7 @@
         <script src="~/_content/BlazorMonaco/lib/monaco-editor/min/vs/editor/editor.main.js"></script>
 
         <script>
-            Uploader.MaxChunkSize = @(settings.Archives.MaxChunkSize * 1024 * 1024)
+            Uploader.MaxChunkSize = @(Settings.Value.Server.Archives.MaxChunkSize * 1024 * 1024)
         </script>
     </body>
 </html>
diff --git a/LANCommander.Server/UI/Views/Shared/_LayoutBasic.cshtml b/LANCommander.Server/UI/Views/Shared/_LayoutBasic.cshtml
index 9dc20e10..f4d49a56 100644
--- a/LANCommander.Server/UI/Views/Shared/_LayoutBasic.cshtml
+++ b/LANCommander.Server/UI/Views/Shared/_LayoutBasic.cshtml
@@ -1,26 +1,12 @@
-@using LANCommander.Server.Services;
-@using LANCommander.Server.Services.Models;
-@using LANCommander.Server.Models;
-
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>@ViewData["Title"] - LANCommander</title>
     <base href="~/" />
-
-    @switch (SettingService.GetSettings().Theme)
-    {
-        case LANCommanderTheme.Light:
-            <link href="_content/AntDesign/css/ant-design-blazor.css" rel="stylesheet" />
-            break;
-
-        case LANCommanderTheme.Dark:
-            <link href="_content/AntDesign/css/ant-design-blazor.dark.css" rel="stylesheet" />
-            break;
-    }
-
+    
+    <link href="_content/AntDesign/css/ant-design-blazor.dark.css" rel="stylesheet" />
     <link rel="stylesheet" href="_content/LANCommander.UI/ui.css" />
     <link rel="stylesheet" href="css/site.css" />
     <link rel="stylesheet" href="css/app.css" />
diff --git a/LANCommander.slnx b/LANCommander.slnx
index e7f280e7..5d4c0700 100644
--- a/LANCommander.slnx
+++ b/LANCommander.slnx
@@ -12,6 +12,7 @@
   <Folder Name="/LANCommander.Server/">
     <Project Path="LANCommander.Server.ImportExport\LANCommander.Server.ImportExport.csproj" Type="Classic C#" />
     <Project Path="LANCommander.Server.Services\LANCommander.Server.Services.csproj" />
+    <Project Path="LANCommander.Server.Settings\LANCommander.Server.Settings.csproj" Type="Classic C#" />
     <Project Path="LANCommander.Server\LANCommander.Server.csproj" />
   </Folder>
   <Folder Name="/LANCommander.Server/LANCommander.Server.Data/">