From 0963264dfe099fe955e1d4eb87e2deaf64d93d0b Mon Sep 17 00:00:00 2001
From: "waffle.lord" <waffle.lord@hotmail.com>
Date: Sat, 6 Jul 2024 11:48:16 -0400
Subject: [PATCH 1/2] update to avalonia 11

---
 .../SPT.Launcher.Base.csproj                  |  2 +-
 project/SPT.Launcher/App.axaml                |  6 +-
 project/SPT.Launcher/Assets/Styles.axaml      | 89 +++++++++----------
 .../LocalizedLauncherActionSelector.axaml.cs  |  2 +-
 .../Models/GameStarterFrontend.cs             |  3 +-
 project/SPT.Launcher/SPT.Launcher.csproj      |  9 +-
 project/SPT.Launcher/ViewLocator.cs           |  2 +-
 .../ViewModels/MainWindowViewModel.cs         |  4 +-
 .../ViewModels/ProfileViewModel.cs            | 10 ++-
 .../SPT.Launcher/ViewModels/ViewModelBase.cs  |  4 +-
 .../Dialogs/ChangeEditionDialogView.axaml     |  4 +-
 .../Dialogs/ConfirmationDialogView.axaml      |  2 +-
 .../Views/Dialogs/RegisterDialogView.axaml    | 16 ++--
 .../Views/Dialogs/WarningDialogView.axaml     |  2 +-
 project/SPT.Launcher/Views/LoginView.axaml    |  6 +-
 project/SPT.Launcher/Views/MainWindow.axaml   |  2 +-
 project/SPT.Launcher/Views/ModInfoView.axaml  |  4 +-
 project/SPT.Launcher/Views/SettingsView.axaml |  4 +-
 18 files changed, 89 insertions(+), 82 deletions(-)

diff --git a/project/SPT.Launcher.Base/SPT.Launcher.Base.csproj b/project/SPT.Launcher.Base/SPT.Launcher.Base.csproj
index 5c039d0..d7cf473 100644
--- a/project/SPT.Launcher.Base/SPT.Launcher.Base.csproj
+++ b/project/SPT.Launcher.Base/SPT.Launcher.Base.csproj
@@ -13,7 +13,7 @@
 
     <ItemGroup>
       <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
-      <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+      <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/project/SPT.Launcher/App.axaml b/project/SPT.Launcher/App.axaml
index 5377cca..24e5d27 100644
--- a/project/SPT.Launcher/App.axaml
+++ b/project/SPT.Launcher/App.axaml
@@ -1,14 +1,16 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="using:SPT.Launcher"
-             x:Class="SPT.Launcher.App">
+             x:Class="SPT.Launcher.App"
+             RequestedThemeVariant="Dark"
+             >
 	<Application.DataTemplates>
 		<local:ViewLocator/>
 	</Application.DataTemplates>
 
 	<Application.Styles>
 		<StyleInclude Source="avares://DialogHost.Avalonia/Styles.xaml"/>
-		<FluentTheme Mode="Light"/>
+		<FluentTheme />
 	</Application.Styles>
 
 	<Application.Resources>
diff --git a/project/SPT.Launcher/Assets/Styles.axaml b/project/SPT.Launcher/Assets/Styles.axaml
index 8f31d4f..dc7083f 100644
--- a/project/SPT.Launcher/Assets/Styles.axaml
+++ b/project/SPT.Launcher/Assets/Styles.axaml
@@ -1,7 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:cc="using:SPT.Launcher.CustomControls"
-        xmlns:rxui="using:Avalonia.ReactiveUI"
         >
 	<Design.PreviewWith>
 		<StackPanel Spacing="5" Background="{StaticResource SPT_Background_Dark}" Margin="50">
@@ -17,8 +16,8 @@
 	<!-- Notification Manager Styles -->
 	<Style Selector="WindowNotificationManager">
 		<Setter Property="Margin" Value="0 35 0 0"/>
-		<Setter Property="VerticalAlignment" Value="Top"/>
-		<Setter Property="HorizontalAlignment" Value="Center"/>
+		<!-- <Setter Property="VerticalAlignment" Value="Bottom"/> -->
+		<!-- <Setter Property="HorizontalAlignment" Value="Center"/> -->
 		<Setter Property="MaxItems" Value="2"/>
 	</Style>
 
@@ -41,48 +40,48 @@
 			</ControlTemplate>
 		</Setter>
 
-		<Style.Animations>
-			<Animation Duration="0:0:0.45" Easing="SineEaseIn" FillMode="Forward">
-				<KeyFrame Cue="0%">
-					<Setter Property="Opacity" Value="0"/>
-					<Setter Property="ZIndex" Value="0"/>
-					<Setter Property="TranslateTransform.Y" Value="-100"/>
-					<Setter Property="ScaleTransform.ScaleX" Value="1"/>
-					<Setter Property="ScaleTransform.ScaleY" Value="1"/>
-				</KeyFrame>
-				<KeyFrame Cue="30%">
-					<Setter Property="Opacity" Value="0"/>
-				</KeyFrame>
-				<KeyFrame Cue="99%">
-					<Setter Property="ZIndex" Value="0"/>
-				</KeyFrame>
-				<KeyFrame Cue="100%">
-					<Setter Property="Opacity" Value="1"/>
-					<Setter Property="ZIndex" Value="1"/>
-					<Setter Property="TranslateTransform.Y" Value="0"/>
-					<Setter Property="ScaleTransform.ScaleX" Value="1"/>
-					<Setter Property="ScaleTransform.ScaleY" Value="1"/>
-				</KeyFrame>
-			</Animation>
-		</Style.Animations>
+		<!-- <Style.Animations> -->
+		<!-- 	<Animation Duration="0:0:0.45" Easing="SineEaseIn" FillMode="Forward"> -->
+		<!-- 		<KeyFrame Cue="0%"> -->
+		<!-- 			<Setter Property="Opacity" Value="0"/> -->
+		<!-- 			<Setter Property="ZIndex" Value="0"/> -->
+		<!-- 			<Setter Property="TranslateTransform.Y" Value="-100"/> -->
+		<!-- 			<Setter Property="ScaleTransform.ScaleX" Value="1"/> -->
+		<!-- 			<Setter Property="ScaleTransform.ScaleY" Value="1"/> -->
+		<!-- 		</KeyFrame> -->
+		<!-- 		<KeyFrame Cue="30%"> -->
+		<!-- 			<Setter Property="Opacity" Value="0"/> -->
+		<!-- 		</KeyFrame> -->
+		<!-- 		<KeyFrame Cue="99%"> -->
+		<!-- 			<Setter Property="ZIndex" Value="0"/> -->
+		<!-- 		</KeyFrame> -->
+		<!-- 		<KeyFrame Cue="100%"> -->
+		<!-- 			<Setter Property="Opacity" Value="1"/> -->
+		<!-- 			<Setter Property="ZIndex" Value="1"/> -->
+		<!-- 			<Setter Property="TranslateTransform.Y" Value="0"/> -->
+		<!-- 			<Setter Property="ScaleTransform.ScaleX" Value="1"/> -->
+		<!-- 			<Setter Property="ScaleTransform.ScaleY" Value="1"/> -->
+		<!-- 		</KeyFrame> -->
+		<!-- 	</Animation> -->
+		<!-- </Style.Animations> -->
 	</Style>
 
-	<Style Selector="NotificationCard[IsClosing=true] /template/ LayoutTransformControl#PART_LayoutTransformControl">
-		<Style.Animations>
-			<Animation Duration="0:0:0.3" Easing="SineEaseOut" FillMode="Backward">
-				<KeyFrame Cue="0%">
-					<Setter Property="Opacity" Value="1"/>
-					<Setter Property="TranslateTransform.X" Value="0"/>
-					<Setter Property="TranslateTransform.Y" Value="0"/>
-				</KeyFrame>
-				<KeyFrame Cue="100%">
-					<Setter Property="Opacity" Value="0"/>
-					<Setter Property="TranslateTransform.X" Value="0"/>
-					<Setter Property="TranslateTransform.Y" Value="-100"/>
-				</KeyFrame>
-			</Animation>
-		</Style.Animations>
-	</Style>
+	<!-- <Style Selector="NotificationCard[IsClosing=true] /template/ LayoutTransformControl#PART_LayoutTransformControl"> -->
+	<!-- 	<Style.Animations> -->
+	<!-- 		<Animation Duration="0:0:0.3" Easing="SineEaseOut" FillMode="Backward"> -->
+	<!-- 			<KeyFrame Cue="0%"> -->
+	<!-- 				<Setter Property="Opacity" Value="1"/> -->
+	<!-- 				<Setter Property="TranslateTransform.X" Value="0"/> -->
+	<!-- 				<Setter Property="TranslateTransform.Y" Value="0"/> -->
+	<!-- 			</KeyFrame> -->
+	<!-- 			<KeyFrame Cue="100%"> -->
+	<!-- 				<Setter Property="Opacity" Value="0"/> -->
+	<!-- 				<Setter Property="TranslateTransform.X" Value="0"/> -->
+	<!-- 				<Setter Property="TranslateTransform.Y" Value="-100"/> -->
+	<!-- 			</KeyFrame> -->
+	<!-- 		</Animation> -->
+	<!-- 	</Style.Animations> -->
+	<!-- </Style> -->
 
 	<!-- TitleBar Styles -->
 	<Style Selector="cc|TitleBar">
@@ -423,11 +422,9 @@
 								<ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
 											  VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
 									<ItemsPresenter Name="PART_ItemsPresenter"
-													Items="{TemplateBinding Items}"
 													Margin="{DynamicResource ComboBoxDropdownContentMargin}"
 													ItemsPanel="{TemplateBinding ItemsPanel}"
-													ItemTemplate="{TemplateBinding ItemTemplate}"
-													VirtualizationMode="{TemplateBinding VirtualizationMode}" />
+													/>
 								</ScrollViewer>
 							</Border>
 						</Popup>
diff --git a/project/SPT.Launcher/CustomControls/LocalizedLauncherActionSelector.axaml.cs b/project/SPT.Launcher/CustomControls/LocalizedLauncherActionSelector.axaml.cs
index ac1f818..0433987 100644
--- a/project/SPT.Launcher/CustomControls/LocalizedLauncherActionSelector.axaml.cs
+++ b/project/SPT.Launcher/CustomControls/LocalizedLauncherActionSelector.axaml.cs
@@ -61,7 +61,7 @@ namespace SPT.Launcher.CustomControls
                 }
             }
 
-            comboBox.Items = actionsList;
+            comboBox.ItemsSource = actionsList;
 
             foreach(var item in comboBox.Items)
             {
diff --git a/project/SPT.Launcher/Models/GameStarterFrontend.cs b/project/SPT.Launcher/Models/GameStarterFrontend.cs
index 016347e..5d01217 100644
--- a/project/SPT.Launcher/Models/GameStarterFrontend.cs
+++ b/project/SPT.Launcher/Models/GameStarterFrontend.cs
@@ -7,6 +7,7 @@ using Avalonia.Controls.Notifications;
 using Splat;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using DialogHostAvalonia;
 
 namespace SPT.Launcher.Models
 {
@@ -30,7 +31,7 @@ namespace SPT.Launcher.Models
 
                         var localeText = string.Format(LocalizationProvider.Instance.file_mismatch_dialog_message, serverVersion);
                         
-                        var result = await DialogHost.DialogHost.Show(new ConfirmationDialogViewModel(null, localeText, null, null, LauncherSettingsProvider.Instance.IsDevMode));
+                        var result = await DialogHost.Show(new ConfirmationDialogViewModel(null, localeText, null, null, LauncherSettingsProvider.Instance.IsDevMode));
 
                         if(result != null && result is bool confirmation && !confirmation)
                         {
diff --git a/project/SPT.Launcher/SPT.Launcher.csproj b/project/SPT.Launcher/SPT.Launcher.csproj
index a32dfc4..6c941f6 100644
--- a/project/SPT.Launcher/SPT.Launcher.csproj
+++ b/project/SPT.Launcher/SPT.Launcher.csproj
@@ -22,12 +22,13 @@
     <Content Include="Assets\icon.ico" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.15" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.15" />
+    <PackageReference Include="Avalonia" Version="11.1.0-rc2" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.1.0-rc2" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.12" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.15" />
-    <PackageReference Include="DialogHost.Avalonia" Version="0.5.0" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.1.0-rc2" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.0-rc2" />
+    <PackageReference Include="DialogHost.Avalonia" Version="0.8.0-avalonia11dot1-3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\SPT.ByteBanger\SPT.ByteBanger.csproj" />
diff --git a/project/SPT.Launcher/ViewLocator.cs b/project/SPT.Launcher/ViewLocator.cs
index 54efb46..7292b00 100644
--- a/project/SPT.Launcher/ViewLocator.cs
+++ b/project/SPT.Launcher/ViewLocator.cs
@@ -7,7 +7,7 @@ namespace SPT.Launcher
 {
     public class ViewLocator : IDataTemplate
     {
-        public IControl Build(object data)
+        public Control Build(object data)
         {
             var name = data.GetType().FullName!.Replace("ViewModel", "View");
             var type = Type.GetType(name);
diff --git a/project/SPT.Launcher/ViewModels/MainWindowViewModel.cs b/project/SPT.Launcher/ViewModels/MainWindowViewModel.cs
index 6091479..2623452 100644
--- a/project/SPT.Launcher/ViewModels/MainWindowViewModel.cs
+++ b/project/SPT.Launcher/ViewModels/MainWindowViewModel.cs
@@ -9,7 +9,7 @@ using SPT.Launcher.Models.SPT;
 using SPT.Launcher.Helpers;
 using SPT.Launcher.ViewModels.Dialogs;
 using Avalonia.Threading;
-using dialogHost = DialogHost.DialogHost;
+using DialogHostAvalonia;
 
 
 namespace SPT.Launcher.ViewModels
@@ -48,7 +48,7 @@ namespace SPT.Launcher.ViewModels
                         LocalizationProvider.Instance.yes,
                         LocalizationProvider.Instance.no);
 
-                    var confirmCopySettings = await dialogHost.Show(viewModel);
+                    var confirmCopySettings = await DialogHost.Show(viewModel);
 
                     if (confirmCopySettings is bool and true)
                     {
diff --git a/project/SPT.Launcher/ViewModels/ProfileViewModel.cs b/project/SPT.Launcher/ViewModels/ProfileViewModel.cs
index 2cd4c90..fa8db2f 100644
--- a/project/SPT.Launcher/ViewModels/ProfileViewModel.cs
+++ b/project/SPT.Launcher/ViewModels/ProfileViewModel.cs
@@ -10,6 +10,7 @@ using SPT.Launcher.ViewModels.Dialogs;
 using Avalonia.Threading;
 using System.Diagnostics;
 using System.IO;
+using Avalonia.Controls.ApplicationLifetimes;
 using SPT.Launcher.Models.SPT;
 
 namespace SPT.Launcher.ViewModels
@@ -221,9 +222,14 @@ namespace SPT.Launcher.ViewModels
 
         public async Task CopyCommand(object parameter)
         {
-            if (Application.Current.Clipboard != null && parameter != null && parameter is string text)
+            if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop && parameter is string text)
             {
-                await Application.Current.Clipboard.SetTextAsync(text);
+                if (desktop?.MainWindow?.Clipboard == null)
+                {
+                    return;
+                }
+                
+                await desktop.MainWindow.Clipboard.SetTextAsync(text);
                 SendNotification("", $"{text} {LocalizationProvider.Instance.copied}", Avalonia.Controls.Notifications.NotificationType.Success);
             }
         }
diff --git a/project/SPT.Launcher/ViewModels/ViewModelBase.cs b/project/SPT.Launcher/ViewModels/ViewModelBase.cs
index 2064f27..ae658fd 100644
--- a/project/SPT.Launcher/ViewModels/ViewModelBase.cs
+++ b/project/SPT.Launcher/ViewModels/ViewModelBase.cs
@@ -8,7 +8,7 @@ using ReactiveUI;
 using Splat;
 using System;
 using System.Threading.Tasks;
-using dialogHost = DialogHost.DialogHost;
+using DialogHostAvalonia;
 
 namespace SPT.Launcher.ViewModels
 {
@@ -162,7 +162,7 @@ namespace SPT.Launcher.ViewModels
         /// <returns></returns>
         public async Task<object?> ShowDialog(object ViewModel)
         {
-            return await dialogHost.Show(ViewModel);
+            return await DialogHost.Show(ViewModel);
         }
 
         public ViewModelBase(IScreen Host)
diff --git a/project/SPT.Launcher/Views/Dialogs/ChangeEditionDialogView.axaml b/project/SPT.Launcher/Views/Dialogs/ChangeEditionDialogView.axaml
index 99060c1..0da8f40 100644
--- a/project/SPT.Launcher/Views/Dialogs/ChangeEditionDialogView.axaml
+++ b/project/SPT.Launcher/Views/Dialogs/ChangeEditionDialogView.axaml
@@ -3,7 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:helpers="using:SPT.Launcher.Helpers"
-             xmlns:dialogHost="clr-namespace:DialogHost;assembly=DialogHost.Avalonia"
+             xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
              xmlns:s="clr-namespace:System;assembly=mscorlib"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SPT.Launcher.Views.Dialogs.ChangeEditionDialogView"
@@ -16,7 +16,7 @@
            Foreground="IndianRed"
            />
 	  <ComboBox Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2"
-				Items="{Binding editions.AvailableEditions}"
+				ItemsSource="{Binding editions.AvailableEditions}"
 				SelectedItem="{Binding editions.SelectedEdition}"
 				PlaceholderText="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=select_edition}"
               >
diff --git a/project/SPT.Launcher/Views/Dialogs/ConfirmationDialogView.axaml b/project/SPT.Launcher/Views/Dialogs/ConfirmationDialogView.axaml
index 893497e..98d020b 100644
--- a/project/SPT.Launcher/Views/Dialogs/ConfirmationDialogView.axaml
+++ b/project/SPT.Launcher/Views/Dialogs/ConfirmationDialogView.axaml
@@ -2,7 +2,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:dialogHost="clr-namespace:DialogHost;assembly=DialogHost.Avalonia"
+             xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
              xmlns:s="clr-namespace:System;assembly=mscorlib"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SPT.Launcher.Views.Dialogs.ConfirmationDialogView"
diff --git a/project/SPT.Launcher/Views/Dialogs/RegisterDialogView.axaml b/project/SPT.Launcher/Views/Dialogs/RegisterDialogView.axaml
index fc5e174..1176d49 100644
--- a/project/SPT.Launcher/Views/Dialogs/RegisterDialogView.axaml
+++ b/project/SPT.Launcher/Views/Dialogs/RegisterDialogView.axaml
@@ -2,7 +2,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:dialogHost="clr-namespace:DialogHost;assembly=DialogHost.Avalonia"
+             xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
 			 xmlns:helpers="using:SPT.Launcher.Helpers"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SPT.Launcher.Views.Dialogs.RegisterDialogView"
@@ -19,13 +19,13 @@
                />
 
 	    <!-- Editions Combo Selection -->
-		<ComboBox Items="{Binding Editions.AvailableEditions}"
-				  Margin="0 10"
-				  Grid.Row="1" Grid.ColumnSpan="2"
-				  HorizontalAlignment="Stretch"
-				  SelectedItem="{Binding Editions.SelectedEdition}"
-				  PlaceholderText="{Binding ComboBoxPlaceholderText}"
-              >
+		<ComboBox ItemsSource="{Binding Editions.AvailableEditions}"
+		          Margin="0 10"
+		          Grid.Row="1" Grid.ColumnSpan="2"
+		          HorizontalAlignment="Stretch"
+		          SelectedItem="{Binding Editions.SelectedEdition}"
+		          PlaceholderText="{Binding ComboBoxPlaceholderText}"
+		>
 			<ComboBox.ItemTemplate>
 				<DataTemplate>
 					<Label Background="Transparent" Content="{Binding Name}" ToolTip.Tip="{Binding Description}"/>
diff --git a/project/SPT.Launcher/Views/Dialogs/WarningDialogView.axaml b/project/SPT.Launcher/Views/Dialogs/WarningDialogView.axaml
index 95a130c..793f8ad 100644
--- a/project/SPT.Launcher/Views/Dialogs/WarningDialogView.axaml
+++ b/project/SPT.Launcher/Views/Dialogs/WarningDialogView.axaml
@@ -3,7 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 			 xmlns:helpers="using:SPT.Launcher.Helpers"
-             xmlns:dialogHost="clr-namespace:DialogHost;assembly=DialogHost.Avalonia"
+             xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SPT.Launcher.Views.Dialogs.WarningDialogView"
 			 Background="{StaticResource SPT_Background_Dark}"
diff --git a/project/SPT.Launcher/Views/LoginView.axaml b/project/SPT.Launcher/Views/LoginView.axaml
index 870f228..a5264dc 100644
--- a/project/SPT.Launcher/Views/LoginView.axaml
+++ b/project/SPT.Launcher/Views/LoginView.axaml
@@ -15,9 +15,9 @@
 	<Grid RowDefinitions="20,*,AUTO,*,20" ColumnDefinitions="20,4*,2*,20">
 
 		<ScrollViewer Grid.Row="1" Grid.RowSpan="3" Grid.Column="1">
-			<ItemsControl Items="{Binding ExistingProfiles}"
-						  VerticalAlignment="Center" HorizontalAlignment="Stretch"
-					  >
+			<ItemsControl ItemsSource="{Binding ExistingProfiles}"
+			              VerticalAlignment="Center" HorizontalAlignment="Stretch"
+			>
 				<ItemsControl.ItemTemplate>
 					<DataTemplate DataType="launcher:ProfileInfo">
 						<Button Classes="profileinfo" Margin="0 10 10 10" HorizontalAlignment="Stretch"
diff --git a/project/SPT.Launcher/Views/MainWindow.axaml b/project/SPT.Launcher/Views/MainWindow.axaml
index 329a40a..5bec9bf 100644
--- a/project/SPT.Launcher/Views/MainWindow.axaml
+++ b/project/SPT.Launcher/Views/MainWindow.axaml
@@ -7,7 +7,7 @@
         xmlns:rxui="using:Avalonia.ReactiveUI"
         xmlns:helpers="using:SPT.Launcher.Helpers"
         xmlns:cvt="using:SPT.Launcher.Converters"
-        xmlns:dialogHost="clr-namespace:DialogHost;assembly=DialogHost.Avalonia"
+        xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
         mc:Ignorable="d" d:DesignWidth="750" d:DesignHeight="450"
         x:Class="SPT.Launcher.Views.MainWindow"
         Icon="/Assets/spt-logo.ico"
diff --git a/project/SPT.Launcher/Views/ModInfoView.axaml b/project/SPT.Launcher/Views/ModInfoView.axaml
index afd961f..52e6a53 100644
--- a/project/SPT.Launcher/Views/ModInfoView.axaml
+++ b/project/SPT.Launcher/Views/ModInfoView.axaml
@@ -44,7 +44,7 @@
         
         <!-- Active Mods List -->
         <ScrollViewer Grid.Row="5" Grid.Column="1">
-            <ItemsControl Items="{Binding ModsCollection.ActiveMods}">
+            <ItemsControl ItemsSource="{Binding ModsCollection.ActiveMods}">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate DataType="{x:Type launcher:SPTMod}">
                         <cc:ModInfoCard ModName="{Binding Name}"
@@ -86,7 +86,7 @@
         </Border>
         <!-- Inactive Mods List -->
         <ScrollViewer Grid.Row="5" Grid.Column="3" >
-            <ItemsControl Items="{Binding ModsCollection.InactiveMods}">
+            <ItemsControl ItemsSource="{Binding ModsCollection.InactiveMods}">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate DataType="{x:Type launcher:SPTMod}">
                         <cc:ModInfoCard ModName="{Binding Name}"
diff --git a/project/SPT.Launcher/Views/SettingsView.axaml b/project/SPT.Launcher/Views/SettingsView.axaml
index 891c053..94ad579 100644
--- a/project/SPT.Launcher/Views/SettingsView.axaml
+++ b/project/SPT.Launcher/Views/SettingsView.axaml
@@ -50,9 +50,9 @@
       <Label Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=default_language}"
              />
       <!-- LocaleCollection reloads the locale from file when the selected loacle changes -->
-      <ComboBox Items="{Binding Locales.AvailableLocales}" MinWidth="200"
+      <ComboBox ItemsSource="{Binding Locales.AvailableLocales}" MinWidth="200"
                 SelectedItem="{Binding Locales.SelectedLocale, Mode=TwoWay}"
-                />
+      />
     </StackPanel>
 
     <!-- Game Start Action -->

From ce4de5ef9273113031220d164019f717e2fdf25f Mon Sep 17 00:00:00 2001
From: "waffle.lord" <waffle.lord@hotmail.com>
Date: Sat, 6 Jul 2024 20:06:43 -0400
Subject: [PATCH 2/2] update all styles

using dynamic resource dictionary for theme variants
---
 project/SPT.Launcher/App.axaml                |  44 ++-
 project/SPT.Launcher/Assets/Styles.axaml      | 300 ++++++++++--------
 .../CustomControls/ModInfoCard.axaml          |  10 +-
 .../CustomControls/TitleBar.axaml             |   8 +-
 .../Dialogs/ChangeEditionDialogView.axaml     |   5 +-
 .../Dialogs/ConfirmationDialogView.axaml      |   5 +-
 .../Views/Dialogs/RegisterDialogView.axaml    |  11 +-
 .../Views/Dialogs/WarningDialogView.axaml     |   4 +-
 project/SPT.Launcher/Views/LoginView.axaml    |  10 +-
 project/SPT.Launcher/Views/MainWindow.axaml   |  10 +-
 project/SPT.Launcher/Views/ModInfoView.axaml  |   8 +-
 .../Notifications/SPTNotificationView.axaml   |   2 +-
 project/SPT.Launcher/Views/ProfileView.axaml  |  16 +-
 project/SPT.Launcher/Views/SettingsView.axaml |   2 +-
 14 files changed, 232 insertions(+), 203 deletions(-)

diff --git a/project/SPT.Launcher/App.axaml b/project/SPT.Launcher/App.axaml
index 24e5d27..f87b62a 100644
--- a/project/SPT.Launcher/App.axaml
+++ b/project/SPT.Launcher/App.axaml
@@ -14,21 +14,35 @@
 	</Application.Styles>
 
 	<Application.Resources>
-		<!-- Colors -->
-		<Color x:Key="SPT_DarkGray">#121212</Color>
-		<Color x:Key="SPT_Yellow">#FFC107</Color>
-		<Color x:Key="SPT_White">#FFFFFF</Color>
-		<Color x:Key="SPT_Gray">#282828</Color>
-		<Color x:Key="SPT_DarkGrayBlue">#323947</Color>
-
-		<!-- Brushes -->
-		<SolidColorBrush x:Key="SPT_Foreground_Light" Color="{StaticResource SPT_White}"/>
-		<SolidColorBrush x:Key="SPT_Background_Light" Color="{StaticResource SPT_Gray}"/>
-		<SolidColorBrush x:Key="SPT_Background_Dark" Color="{StaticResource SPT_DarkGray}"/>
-		<SolidColorBrush x:Key="SPT_Brush_Yellow" Color="{StaticResource SPT_Yellow}"/>
-		<SolidColorBrush x:Key="SPT_Brush_DarkGrayBlue" Color="{StaticResource SPT_DarkGrayBlue}"/>
-		<SolidColorBrush x:Key="SPT_Brush_Lighter" Color="Gainsboro"/>
-
+		<ResourceDictionary>
+			<ResourceDictionary.ThemeDictionaries>
+				<ResourceDictionary x:Key="Light">
+					<SolidColorBrush x:Key="AccentBrush">#54a4ff</SolidColorBrush>
+					<SolidColorBrush x:Key="AccentBrush2">#4383cc</SolidColorBrush>
+					<SolidColorBrush x:Key="AccentBrush3">#326299</SolidColorBrush>
+					<SolidColorBrush x:Key="AltAccentBrush">#b2a58d</SolidColorBrush>
+					<SolidColorBrush x:Key="AltAccentBrush2">#7f7564</SolidColorBrush>
+					<SolidColorBrush x:Key="AltAccentBrush3">#4c463b</SolidColorBrush>
+					<SolidColorBrush x:Key="BackgroundBrush">White</SolidColorBrush>
+					<SolidColorBrush x:Key="BackgroundBrush2">#cccccc</SolidColorBrush>
+					<SolidColorBrush x:Key="AltBackgroundBrush">#cca480</SolidColorBrush>
+					<SolidColorBrush x:Key="ForegroundBrush">Black</SolidColorBrush>
+				</ResourceDictionary>
+				<ResourceDictionary x:Key="Dark">
+					<SolidColorBrush x:Key="AccentBrush">#436082</SolidColorBrush>
+					<SolidColorBrush x:Key="AccentBrush2">#567ca8</SolidColorBrush>
+					<SolidColorBrush x:Key="AccentBrush3">#6998ce</SolidColorBrush>
+					<SolidColorBrush x:Key="AltAccentBrush">#6a6357</SolidColorBrush>
+					<SolidColorBrush x:Key="AltAccentBrush2">#908676</SolidColorBrush>
+					<SolidColorBrush x:Key="AltAccentBrush3">#b6a995</SolidColorBrush>
+					<SolidColorBrush x:Key="BackgroundBrush">#181a1b</SolidColorBrush>
+					<SolidColorBrush x:Key="BackgroundBrush2">#393e41</SolidColorBrush>
+					<SolidColorBrush x:Key="AltBackgroundBrush">#37332d</SolidColorBrush>
+					<SolidColorBrush x:Key="ForegroundBrush">White</SolidColorBrush>
+				</ResourceDictionary>
+			</ResourceDictionary.ThemeDictionaries>
+		</ResourceDictionary>
+		
 		<!-- Path Geometry for re-usable icons -->
 		<PathGeometry x:Key="FolderWithPlus" Figures="M20 6h-8l-2-2H4c-1.11 0-1.99.89-1.99 2L2 18c0 1.11.89 2 2 2h16c1.11 0 2-.89 2-2V8c0-1.11-.89-2-2-2zm-1 8h-3v3h-2v-3h-3v-2h3V9h2v3h3v2z" FillRule="NonZero"
 				  />
diff --git a/project/SPT.Launcher/Assets/Styles.axaml b/project/SPT.Launcher/Assets/Styles.axaml
index dc7083f..af580f1 100644
--- a/project/SPT.Launcher/Assets/Styles.axaml
+++ b/project/SPT.Launcher/Assets/Styles.axaml
@@ -3,12 +3,31 @@
         xmlns:cc="using:SPT.Launcher.CustomControls"
         >
 	<Design.PreviewWith>
-		<StackPanel Spacing="5" Background="{StaticResource SPT_Background_Dark}" Margin="50">
-			<Button Content="Blah"/>
-			<TextBox Text="Some cool text here" Margin="5"/>
-			<TextBox Watermark="This is a watermark" Margin="5"/>
-			<CheckBox Content="This is a checkbox"/>
+		<Grid Background="{DynamicResource BackgroundBrush}">
+		<StackPanel Spacing="5" Margin="50">
+			<Label Content="Some label here"/>
+			<Label Content="Some acc label here" Classes="acc"/>
+			<Label Content="Some alt label here" Classes="alt"/>
+			<Label Classes="versionMismatch" Content="invalid version tag" />
+			<Button Content="button" />
+			<Button Content="acc button" Classes="acc"/>
+			<Button Content="alt button" Classes="alt"/>
+			<Button Content="link button" Classes="link"/>
+			<Button Classes="profileinfo" Content="profile info button"/>
+			<ComboBox SelectedIndex="0">
+				<ComboBoxItem>Item 1</ComboBoxItem>
+				<ComboBoxItem>Item 2</ComboBoxItem>
+				<ComboBoxItem>Item 3</ComboBoxItem>
+			</ComboBox>
+			<TextBox Text="Some cool text here" Margin="5" />
+			<TextBox Watermark="This is a watermark" Margin="5" />
+			<CheckBox Content="unchecked" />
+			<CheckBox Content="checked" IsChecked="True"/>
+			<ProgressBar Value="40" />
+			<ProgressBar IsIndeterminate="True" />
+			<ProgressBar Classes="error" />
 		</StackPanel>
+		</Grid>
 	</Design.PreviewWith>
 
 	<!-- Add Styles Here -->
@@ -85,201 +104,221 @@
 
 	<!-- TitleBar Styles -->
 	<Style Selector="cc|TitleBar">
-		<Setter Property="Background" Value="{StaticResource SPT_Background_Dark}"/>
-		<Setter Property="Foreground" Value="{StaticResource SPT_Foreground_Light}"/>
-		<Setter Property="ButtonForeground" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/>
+		<Setter Property="Background" Value="{DynamicResource BackgroundBrush}"/>
+		<Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
+		<Setter Property="ButtonForeground" Value="{DynamicResource AltAccentBrush}"/>
 	</Style>
 
 	<Style Selector="cc|TitleBar.versiontag">
-		<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_Yellow}"/>
+		<Setter Property="BorderBrush" Value="{DynamicResource AccentBrush}"/>
 		<Setter Property="BorderThickness" Value="0 0 0 2"/>
 	</Style>
 		   
 	<!-- TextBox Styles -->
-	<!-- SourceRef: https://github.com/AvaloniaUI/Avalonia/blob/master/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml -->
 	<Style Selector="TextBox">
-		<Setter Property="Background" Value="{StaticResource SPT_Background_Light}"/>
+		<Setter Property="Background" Value="{DynamicResource BackgroundBrush2}"/>
 		<Setter Property="FontWeight" Value="SemiBold"/>
-		<Setter Property="Foreground" Value="{StaticResource SPT_Brush_Lighter}"/>
+		<Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
 	</Style>
-
+	
 	<Style Selector="TextBox:focus">
-		<Setter Property="Foreground" Value="{StaticResource SPT_Brush_Lighter}"/>
+		<Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
 	</Style>
-
+	
 	<Style Selector="TextBox:pointerover">
-		<Setter Property="Foreground" Value="{StaticResource SPT_Brush_Lighter}"/>
+		<Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
 	</Style>
-
+	
 	<Style Selector="TextBox:pointerover /template/ Border#PART_BorderElement">
 		<Setter Property="Background" Value="Transparent"/>
-		<Setter Property="BorderBrush" Value="DimGray"/>
+		<Setter Property="BorderBrush" Value="{DynamicResource AltAccentBrush}"/>
 	</Style>
-
+	
 	<Style Selector="TextBox:pointerover /template/ TextBlock#PART_Watermark, TextBox:focus /template/ TextBlock#PART_FloatingWatermark">
-		<Setter Property="Foreground" Value="DimGray"/>
+		<Setter Property="Foreground" Value="{DynamicResource AltAccentBrush2}"/>
 	</Style>
-
+	
 	<Style Selector="TextBox:focus /template/ TextBlock#PART_Watermark, TextBox:focus /template/ TextBlock#PART_FloatingWatermark">
-		<Setter Property="Foreground" Value="DimGray"/>
+		<Setter Property="Foreground" Value="{DynamicResource AltAccentBrush3}"/>
 	</Style>
-
+	
 	<Style Selector="TextBox /template/ TextBlock#PART_Watermark, TextBox:focus /template/ TextBlock#PART_FloatingWatermark">
 		<Setter Property="Foreground" Value="White"/>
 	</Style>
-
+	
 	<Style Selector="TextBox:focus /template/ Border#PART_BorderElement">
 		<Setter Property="Background" Value="Transparent"/>
-		<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_Yellow}"/>
+		<Setter Property="BorderBrush" Value="{DynamicResource AccentBrush}"/>
 		<Setter Property="BorderThickness" Value="1"/>
 	</Style>
-
+	
 	<!-- Label Styles -->
-	<!-- SourceRef: https://github.com/AvaloniaUI/Avalonia/blob/master/src/Avalonia.Themes.Fluent/Controls/Label.xaml -->
 	<Style Selector="Label">
-		<Setter Property="Foreground" Value="{StaticResource SPT_Foreground_Light}"/>
+		<Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
 	</Style>
-
-	<Style Selector="Label.yellow">
-		<Setter Property="Foreground" Value="{StaticResource SPT_Brush_Yellow}"/>
+	
+	<Style Selector="Label.acc">
+		<Setter Property="Foreground" Value="{DynamicResource AccentBrush}"/>
 	</Style>
-
-	<Style Selector="Label.dark">
-		<Setter Property="Foreground" Value="DimGray"/>
+	
+	<Style Selector="Label.alt">
+		<Setter Property="Foreground" Value="{DynamicResource AltAccentBrush}"/>
 	</Style>
-
+	
 	<Style Selector="Label.versionMismatch">
 		<Setter Property="Foreground" Value="OrangeRed"/>
 	</Style>
-
+	
 	<!-- ProgressBar Styles -->
-	<!-- SourceRef: https://github.com/AvaloniaUI/Avalonia/blob/master/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml -->
 	<Style Selector="ProgressBar">
-		<Setter Property="Foreground" Value="{StaticResource SPT_Brush_Yellow}"/>
-		<Setter Property="Background" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/>
+		<Setter Property="Foreground" Value="{DynamicResource AccentBrush3}"/>
+		<Setter Property="Background" Value="{DynamicResource BackgroundBrush2}"/>
 	</Style>
-
+	
 	<Style Selector="ProgressBar.error">
 		<Setter Property="Foreground" Value="Red"/>
 		<Style.Animations>
 			<Animation Duration="0:0:0.5" FillMode="Forward">
 				<KeyFrame Cue="0%">
-					<Setter Property="Foreground" Value="{StaticResource SPT_Brush_Yellow}"/>
 					<Setter Property="Value" Value="0"/>
 				</KeyFrame>
 				<KeyFrame Cue="100%">
-					<Setter Property="Foreground" Value="Red"/>
 					<Setter Property="Value" Value="100"/>
 				</KeyFrame>
 			</Animation>
 		</Style.Animations>
 	</Style>
-
+	
 	<!-- Seperator Styles -->
-	<!-- SourceRef: https://github.com/AvaloniaUI/Avalonia/blob/master/src/Avalonia.Themes.Fluent/Controls/Separator.xaml -->
 	<Style Selector="Separator">
-		<Setter Property="Background" Value="{StaticResource SPT_Background_Dark}"/>
+		<Setter Property="Background" Value="{DynamicResource BackgroundBrush}"/>
 	</Style>
 
 	<!-- Button Styles -->
-	<!-- SourceRef: https://github.com/AvaloniaUI/Avalonia/blob/master/src/Avalonia.Themes.Fluent/Controls/Button.xaml -->
 	<Style Selector="Button">
-		<Setter Property="Background" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/>
-		<Setter Property="Foreground" Value="{StaticResource SPT_Background_Dark}"/>
+		<Setter Property="Background" Value="{DynamicResource BackgroundBrush2}"/>
+		<Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
 	</Style>
 
 	<Style Selector="Button:pointerover">
 		<Setter Property="FontWeight" Value="SemiBold"/>
 	</Style>
-
+	
 	<Style Selector="Button:pointerover /template/ ContentPresenter">
-		<Setter Property="Background" Value="{StaticResource SPT_Background_Light}"/>
-		<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_Yellow}"/>
+		<Setter Property="Background" Value="{DynamicResource BackgroundBrush2}"/>
+		<Setter Property="BorderBrush" Value="{DynamicResource AccentBrush2}"/>
 		<Setter Property="BorderThickness" Value="1"/>
 	</Style>
 
 	<Style Selector="Button:pressed /template/ ContentPresenter">
-		<Setter Property="Background" Value="{StaticResource SPT_Brush_Yellow}"/>
+		<Setter Property="Background" Value="{DynamicResource AccentBrush}"/>
 	</Style>
-
+	
 	<Style Selector="Button:disabled /template/ ContentPresenter">
 		<Setter Property="Background" Value="Transparent"/>
-		<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/>
+		<Setter Property="BorderBrush" Value="{DynamicResource BackgroundBrush2}"/>
 	</Style>
 
-	<!-- Button yellow -->
-	<Style Selector="Button.yellow">
-		<Setter Property="Background" Value="{StaticResource SPT_Brush_Yellow}"/>
-		<Setter Property="Foreground" Value="{StaticResource SPT_Background_Dark}"/>
+	<!-- Button acc -->
+	<Style Selector="Button.acc">
+		<Setter Property="Background" Value="{DynamicResource AccentBrush2}"/>
+		<Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
 		<Setter Property="FontWeight" Value="SemiBold"/>
 	</Style>
 
-	<Style Selector="Button.yellow:pointerover">
+	<Style Selector="Button.acc:pointerover">
 		<Setter Property="FontWeight" Value="SemiBold"/>
 	</Style>
-
-	<Style Selector="Button.yellow:pointerover /template/ ContentPresenter">
-		<Setter Property="Background" Value="Gold"/>
-		<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/>
+	
+	<Style Selector="Button.acc:pointerover /template/ ContentPresenter">
+		<Setter Property="Background" Value="{DynamicResource AccentBrush3}"/>
+		<Setter Property="BorderBrush" Value="{DynamicResource BackgroundBrush2}"/>
 		<Setter Property="BorderThickness" Value="1"/>
 	</Style>
-
-	<Style Selector="Button.yellow:pressed /template/ ContentPresenter">
-		<Setter Property="Background" Value="{StaticResource SPT_Brush_Lighter}"/>
+	
+	<Style Selector="Button.acc:pressed /template/ ContentPresenter">
+		<Setter Property="Background" Value="{DynamicResource AccentBrush}"/>
+	</Style>
+	
+	<Style Selector="Button.acc:disabled /template/ ContentPresenter">
+		<Setter Property="Background" Value="Transparent"/>
+		<Setter Property="BorderBrush" Value="{DynamicResource BackgroundBrush2}"/>
+	</Style>
+	
+	<!-- Button alt -->
+	<Style Selector="Button.alt">
+		<Setter Property="Background" Value="{DynamicResource AltAccentBrush2}"/>
+		<Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
+		<Setter Property="FontWeight" Value="SemiBold"/>
 	</Style>
 
-	<Style Selector="Button.yellow:disabled /template/ ContentPresenter">
+	<Style Selector="Button.alt:pointerover">
+		<Setter Property="FontWeight" Value="SemiBold"/>
+	</Style>
+	
+	<Style Selector="Button.alt:pointerover /template/ ContentPresenter">
+		<Setter Property="Background" Value="{DynamicResource AltAccentBrush3}"/>
+		<Setter Property="BorderBrush" Value="{DynamicResource BackgroundBrush2}"/>
+		<Setter Property="BorderThickness" Value="1"/>
+	</Style>
+	
+	<Style Selector="Button.alt:pressed /template/ ContentPresenter">
+		<Setter Property="Background" Value="{DynamicResource AltAccentBrush}"/>
+	</Style>
+	
+	<Style Selector="Button.alt:disabled /template/ ContentPresenter">
 		<Setter Property="Background" Value="Transparent"/>
-		<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/>
+		<Setter Property="BorderBrush" Value="{DynamicResource BackgroundBrush2}"/>
 	</Style>
 
 	<!-- Button Link Style -->
 	<Style Selector="Button.link">
-		<Setter Property="Foreground" Value="{StaticResource SPT_Brush_Lighter}"/>
+		<Setter Property="TextBlock.TextDecorations" Value="Underline"/>
+		<Setter Property="Foreground" Value="{DynamicResource AltAccentBrush3}"/>
 		<Setter Property="Background" Value="Transparent"/>
 		<Setter Property="BorderBrush" Value="Transparent"/>
 		<Setter Property="BorderThickness" Value="0"/>
 	</Style>
 
 	<Style Selector="Button.link:pointerover /template/ ContentPresenter">
-		<Setter Property="TextBlock.Foreground" Value="{StaticResource SPT_Brush_Yellow}"/>
+		<Setter Property="TextBlock.Foreground" Value="{DynamicResource AccentBrush3}"/>
 		<Setter Property="Background" Value="Transparent"/>
 		<Setter Property="BorderBrush" Value="Transparent"/>
 		<Setter Property="BorderThickness" Value="0"/>
 	</Style>
 
 	<Style Selector="Button.link:pressed /template/ ContentPresenter">
-		<Setter Property="TextBlock.Foreground" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/>
+		<Setter Property="TextBlock.Foreground" Value="{DynamicResource AccentBrush}"/>
 		<Setter Property="Background" Value="Transparent"/>
 		<Setter Property="BorderBrush" Value="Transparent"/>
 		<Setter Property="BorderThickness" Value="0"/>
 	</Style>
 
 	<!-- Button Bordered Link Style -->
-	<Style Selector="Button.borderedlink">
-		<Setter Property="Foreground" Value="{StaticResource SPT_Brush_Lighter}"/>
-		<Setter Property="Background" Value="Transparent"/>
-		<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_Lighter}"/>
-		<Setter Property="BorderThickness" Value="1"/>
-	</Style>
-
-	<Style Selector="Button.borderedlink:pointerover /template/ ContentPresenter">
-		<Setter Property="TextBlock.Foreground" Value="{StaticResource SPT_Brush_Yellow}"/>
-		<Setter Property="Background" Value="Transparent"/>
-		<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_Yellow}"/>
-	</Style>
-
-	<Style Selector="Button.borderedlink:pressed /template/ ContentPresenter">
-		<Setter Property="TextBlock.Foreground" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/>
-		<Setter Property="Background" Value="Transparent"/>
-		<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/>
-		<Setter Property="BorderThickness" Value="0"/>
-	</Style>
+	<!-- <Style Selector="Button.borderedlink"> -->
+	<!-- 	<Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/> -->
+	<!-- 	<Setter Property="Background" Value="Transparent"/> -->
+	<!-- 	<Setter Property="BorderBrush" Value="{DynamicResource ForegroundBrush}"/> -->
+	<!-- 	<Setter Property="BorderThickness" Value="1"/> -->
+	<!-- </Style> -->
+	<!-- -->
+	<!-- <Style Selector="Button.borderedlink:pointerover /template/ ContentPresenter"> -->
+	<!-- 	<Setter Property="TextBlock.Foreground" Value="{DynamicResource AccentBrush}"/> -->
+	<!-- 	<Setter Property="Background" Value="Transparent"/> -->
+	<!-- 	<Setter Property="BorderBrush" Value="{DynamicResource AccentBrush}"/> -->
+	<!-- </Style> -->
+	<!-- -->
+	<!-- <Style Selector="Button.borderedlink:pressed /template/ ContentPresenter"> -->
+	<!-- 	<Setter Property="TextBlock.Foreground" Value="{DynamicResource BackgroundBrush2}"/> -->
+	<!-- 	<Setter Property="Background" Value="Transparent"/> -->
+	<!-- 	<Setter Property="BorderBrush" Value="{DynamicResource BackgroundBrush2}"/> -->
+	<!-- 	<Setter Property="BorderThickness" Value="0"/> -->
+	<!-- </Style> -->
 
 	<!-- Button Profile Info Style -->
 	<Style Selector="Button.profileinfo">
-		<Setter Property="Background" Value="{StaticResource SPT_Background_Dark}"/>
-		<Setter Property="BorderBrush" Value="{StaticResource SPT_Background_Dark}"/>
+		<Setter Property="Background" Value="{DynamicResource BackgroundBrush}"/>
+		<Setter Property="BorderBrush" Value="{DynamicResource BackgroundBrush}"/>
 	</Style>
 
 	<Style Selector="Button.icon">
@@ -288,47 +327,41 @@
 	</Style>
 
 	<Style Selector="Button.icon:pointerover">
-		<Setter Property="Background" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/>
+		<Setter Property="Background" Value="{DynamicResource BackgroundBrush2}"/>
 	</Style>
 
     <!-- Checkbox styles -->
-	<!-- SourceRef: https://github.com/AvaloniaUI/Avalonia/blob/master/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml -->
 	<Style Selector="CheckBox">
-		<Setter Property="Foreground" Value="{StaticResource SPT_Foreground_Light}"/>
+		<Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
 	</Style>
 
 	<Style Selector="CheckBox /template/ Border#NormalRectangle">
-		<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/>
+		<Setter Property="BorderBrush" Value="{DynamicResource BackgroundBrush2}"/>
 	</Style>
 
 	<Style Selector="CheckBox:pointerover /template/ Border#NormalRectangle">
-		<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_Yellow}"/>
-	</Style>
-
-	<Style Selector="CheckBox:pointerover /template/ ContentPresenter#ContentPresenter">
-		<Setter Property="TextBlock.Foreground" Value="{StaticResource SPT_Foreground_Light}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource AccentBrush}"/>
 	</Style>
 
 	<Style Selector="CheckBox:checked">
 		<Setter Property="FontWeight" Value="SemiBold"/>
-		<Setter Property="Foreground" Value="{StaticResource SPT_Foreground_Light}"/>
+		<Setter Property="Foreground" Value="{DynamicResource AccentBrush3}"/>
 	</Style>
 
 	<Style Selector="CheckBox:checked /template/ Border#NormalRectangle">
-		<Setter Property="Background" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/>
-		<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_Yellow}"/>
+		<Setter Property="Background" Value="{DynamicResource BackgroundBrush2}"/>
+		<Setter Property="BorderBrush" Value="{DynamicResource AccentBrush3}"/>
 	</Style>
 
 	<Style Selector="CheckBox:checked /template/ Path#CheckGlyph">
-		<Setter Property="Fill" Value="{StaticResource SPT_Brush_Yellow}"/>
+		<Setter Property="Fill" Value="{DynamicResource AccentBrush3}"/>
 	</Style>
 
 	<!-- ComboBox Styles -->
-	<!-- Source Ref: https://github.com/AvaloniaUI/Avalonia/blob/master/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml -->
 	<Style Selector="ComboBox">
-		<Setter Property="Foreground" Value="{StaticResource SPT_Foreground_Light}"/>
-		<Setter Property="PlaceholderForeground" Value="{StaticResource SPT_Brush_Lighter}"/>
-		<Setter Property="Background" Value="{StaticResource SPT_Background_Dark}"/>
+		<Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
+		<Setter Property="PlaceholderForeground" Value="{DynamicResource ForegroundBrush}"/>
+		<Setter Property="Background" Value="{DynamicResource BackgroundBrush}"/>
 		<Setter Property="Template">
 			<ControlTemplate>
 				<DataValidationErrors>
@@ -356,8 +389,8 @@
 								Grid.Row="1"
 								Grid.Column="0"
 								Grid.ColumnSpan="2"
-								Background="{DynamicResource ComboBoxBackgroundUnfocused}"
-								BorderBrush="{DynamicResource ComboBoxBackgroundBorderBrushUnfocused}"
+								Background="{DynamicResource AltBackgroundBrush}"
+								BorderBrush="{DynamicResource AltAccentBrush2}"
 								BorderThickness="{TemplateBinding BorderThickness}"
 								CornerRadius="{TemplateBinding CornerRadius}" />
 						<TextBlock x:Name="PlaceholderTextBlock"
@@ -401,7 +434,9 @@
 								<Panel Height="12"
 									   Width="12" />
 								<Path x:Name="DropDownGlyph"
-									  VerticalAlignment="Center" />
+									  VerticalAlignment="Center"
+									  Data="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z"
+									  />
 							</Panel>
 						</Viewbox>
 						<Popup Name="PART_Popup"
@@ -412,8 +447,8 @@
 							   PlacementTarget="Background"
 							   IsLightDismissEnabled="True">
 							<Border x:Name="PopupBorder"
-									Background="{StaticResource SPT_Background_Dark}"
-									BorderBrush="{StaticResource SPT_Background_Dark}"
+									Background="{DynamicResource BackgroundBrush2}"
+									BorderBrush="{DynamicResource BackgroundBrush2}"
 									BorderThickness="{DynamicResource ComboBoxDropdownBorderThickness}"
 									Margin="0,-1,0,-1"
 									Padding="{DynamicResource ComboBoxDropdownBorderPadding}"
@@ -435,47 +470,32 @@
 	</Style>
 
 	<Style Selector="ComboBox /template/ Path#DropDownGlyph">
-		<Setter Property="Fill" Value="{StaticResource SPT_Foreground_Light}" />
+		<Setter Property="Fill" Value="{DynamicResource ForegroundBrush}" />
 	</Style>
 
 	<Style Selector="ComboBox:pointerover /template/ Path#DropDownGlyph">
-		<Setter Property="Fill" Value="{StaticResource SPT_Brush_Yellow}" />
+		<Setter Property="Fill" Value="{DynamicResource AccentBrush3}" />
 	</Style>
 
 	<Style Selector="ComboBox:pointerover">
-		<Setter Property="Foreground" Value="{StaticResource SPT_Brush_Yellow}"/>
-	</Style>
-
-	<Style Selector="ComboBox:pointerover /template/ Border#Background">
-		<Setter Property="Background" Value="Black"/>
-		<Setter Property="BorderBrush" Value="Black" />
-	</Style>
-
-	<Style Selector="ComboBox /template/ Border#PopupBorder">
-		<Setter Property="Background" Value="Black"/>
-		<Setter Property="BorderBrush" Value="Black"/>
+		<Setter Property="Foreground" Value="{DynamicResource AccentBrush3}"/>
 	</Style>
 
 	<!-- ComboBoxItem Styles -->
-	<!-- Source Ref: https://github.com/AvaloniaUI/Avalonia/blob/master/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml-->
-	<Style Selector="ComboBoxItem /template/ ContentPresenter">
-		<Setter Property="Background" Value="Black"/>
-	</Style>
-
 	<Style Selector="ComboBoxItem">
-		<Setter Property="Foreground" Value="{StaticResource SPT_Foreground_Light}"/>
-		<Setter Property="Background" Value="{StaticResource SPT_Background_Dark}"/>
+		<Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
+		<Setter Property="Background" Value="{DynamicResource BackgroundBrush2}"/>
 	</Style>
 
 	<Style Selector="ComboBoxItem:pointerover /template/ ContentPresenter">
-		<Setter Property="Background" Value="{StaticResource SPT_Background_Light}" />
-		<Setter Property="BorderBrush" Value="{StaticResource SPT_Background_Light}" />
-		<Setter Property="TextBlock.Foreground" Value="{StaticResource SPT_Foreground_Light}" />
+		<Setter Property="Background" Value="{DynamicResource AltAccentBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BackgroundBrush2}" />
+		<Setter Property="TextBlock.Foreground" Value="{DynamicResource ForegroundBrush}" />
 	</Style>
 
 	<Style Selector="ComboBoxItem:selected /template/ ContentPresenter">
-		<Setter Property="Background" Value="{StaticResource SPT_Brush_Yellow}" />
-		<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_Yellow}" />
-		<Setter Property="TextBlock.Foreground" Value="{StaticResource SPT_Background_Dark}" />
+		<Setter Property="Background" Value="{DynamicResource AccentBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource AccentBrush}" />
+		<Setter Property="TextBlock.Foreground" Value="{DynamicResource ForegroundBrush}" />
 	</Style>
 </Styles>
\ No newline at end of file
diff --git a/project/SPT.Launcher/CustomControls/ModInfoCard.axaml b/project/SPT.Launcher/CustomControls/ModInfoCard.axaml
index dd4fadc..da535d1 100644
--- a/project/SPT.Launcher/CustomControls/ModInfoCard.axaml
+++ b/project/SPT.Launcher/CustomControls/ModInfoCard.axaml
@@ -6,11 +6,11 @@
 			 xmlns:helpers="using:SPT.Launcher.Helpers"
              x:Class="SPT.Launcher.CustomControls.ModInfoCard">
 	<Border CornerRadius="5" HorizontalAlignment="Stretch" 
-			BorderBrush="{StaticResource SPT_Background_Dark}"
+			BorderBrush="{DynamicResource BackgroundBrush}"
 			BorderThickness="5"
 			>
 		<Grid RowDefinitions="10,AUTO,AUTO,AUTO,10" ColumnDefinitions="10,AUTO,*,AUTO,10"
-			  Background="{StaticResource SPT_Background_Dark}"
+			  Background="{DynamicResource BackgroundBrush}"
 			  >
 
 			<!-- Icon stack -->
@@ -19,12 +19,12 @@
 			            Orientation="Horizontal" Spacing="5"
 			>
 				<!-- Server Icon -->
-				<Path Data="{StaticResource Server}" Fill="{StaticResource SPT_Brush_DarkGrayBlue}"
+				<Path Data="{StaticResource Server}" Fill="DarkSlateGray"
 				      IsVisible="{Binding IsInServer, RelativeSource={RelativeSource AncestorType=UserControl}}"
 				/>
 				
 				<!-- Profile Icon -->
-				<Path Data="{StaticResource Profile}" Fill="{StaticResource SPT_Brush_DarkGrayBlue}"
+				<Path Data="{StaticResource Profile}" Fill="DarkSlateGray"
 				      IsVisible="{Binding IsInProfile, RelativeSource={RelativeSource AncestorType=UserControl}}"
 					  />
 				
@@ -54,7 +54,7 @@
 			        >
 				<StackPanel Orientation="Horizontal">
 					<Label Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=open_link}"/>
-					<Path Data="{StaticResource Open}" Fill="{StaticResource SPT_Brush_Yellow}"
+					<Path Data="{StaticResource Open}" Fill="{DynamicResource AccentBrush}"
 					      IsVisible="{Binding IsInProfile, RelativeSource={RelativeSource AncestorType=UserControl}}"
 					/>
 				</StackPanel>
diff --git a/project/SPT.Launcher/CustomControls/TitleBar.axaml b/project/SPT.Launcher/CustomControls/TitleBar.axaml
index 86179b4..988b156 100644
--- a/project/SPT.Launcher/CustomControls/TitleBar.axaml
+++ b/project/SPT.Launcher/CustomControls/TitleBar.axaml
@@ -55,12 +55,12 @@
             >
 			<Button.Styles>
 				<Style Selector="Button:pointerover /template/ ContentPresenter">
-					<Setter Property="Background" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/>
+					<Setter Property="Background" Value="DarkSlateGray"/>
 					<Setter Property="BorderThickness" Value="0"/>
 				</Style>
-				<Style Selector="Button:pressed /template/ ContentPresenter">
-					<Setter Property="Background" Value="{StaticResource SPT_Background_Light}"/>
-				</Style>
+				<!-- <Style Selector="Button:pressed /template/ ContentPresenter"> -->
+				<!-- 	<Setter Property="Background" Value="{DynamicResource BackgroundBrush}"/> -->
+				<!-- </Style> -->
 			</Button.Styles>
 		</Button>
 
diff --git a/project/SPT.Launcher/Views/Dialogs/ChangeEditionDialogView.axaml b/project/SPT.Launcher/Views/Dialogs/ChangeEditionDialogView.axaml
index 0da8f40..28522b7 100644
--- a/project/SPT.Launcher/Views/Dialogs/ChangeEditionDialogView.axaml
+++ b/project/SPT.Launcher/Views/Dialogs/ChangeEditionDialogView.axaml
@@ -7,7 +7,8 @@
              xmlns:s="clr-namespace:System;assembly=mscorlib"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SPT.Launcher.Views.Dialogs.ChangeEditionDialogView"
-             Background="{StaticResource SPT_Background_Dark}">
+             Background="{DynamicResource BackgroundBrush}"
+             >
   
   <Grid RowDefinitions="10,AUTO,AUTO,AUTO,10" ColumnDefinitions="10,*,AUTO,10">
     
@@ -31,7 +32,7 @@
       <Button Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=update}"
               Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=dialogHost:DialogHost}, Path=CloseDialogCommand}"
               CommandParameter="{Binding editions.SelectedEdition}"
-              Classes="yellow"
+              Classes="alt"
               />
       <Button Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=cancel}"
               Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=dialogHost:DialogHost}, Path=CloseDialogCommand}"
diff --git a/project/SPT.Launcher/Views/Dialogs/ConfirmationDialogView.axaml b/project/SPT.Launcher/Views/Dialogs/ConfirmationDialogView.axaml
index 98d020b..e84070f 100644
--- a/project/SPT.Launcher/Views/Dialogs/ConfirmationDialogView.axaml
+++ b/project/SPT.Launcher/Views/Dialogs/ConfirmationDialogView.axaml
@@ -6,19 +6,18 @@
              xmlns:s="clr-namespace:System;assembly=mscorlib"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SPT.Launcher.Views.Dialogs.ConfirmationDialogView"
-             Background="{StaticResource SPT_Background_Dark}"
              MinWidth="300"
              MinHeight="100"
+             Background="{DynamicResource BackgroundBrush}"
              >
   <Grid RowDefinitions="*,AUTO" ColumnDefinitions="*,AUTO" Margin="10">
     <TextBlock Text="{Binding Question}" Grid.ColumnSpan="2" FontSize="15"
-               Foreground="{StaticResource SPT_Foreground_Light}"
                />
     <StackPanel Grid.Row="1" Grid.Column="1"
                 Orientation="Horizontal" Spacing="10">
       <Button Content="{Binding ConfirmButtonText}"
               Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=dialogHost:DialogHost}, Path=CloseDialogCommand}"
-              Classes="yellow"
+              Classes="alt"
               IsEnabled="{Binding AllowConfirm}"
             >
         <Button.CommandParameter>
diff --git a/project/SPT.Launcher/Views/Dialogs/RegisterDialogView.axaml b/project/SPT.Launcher/Views/Dialogs/RegisterDialogView.axaml
index 1176d49..5473437 100644
--- a/project/SPT.Launcher/Views/Dialogs/RegisterDialogView.axaml
+++ b/project/SPT.Launcher/Views/Dialogs/RegisterDialogView.axaml
@@ -6,7 +6,7 @@
 			 xmlns:helpers="using:SPT.Launcher.Helpers"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SPT.Launcher.Views.Dialogs.RegisterDialogView"
-             Background="{StaticResource SPT_Background_Dark}"
+             Background="{DynamicResource BackgroundBrush}"
              MinWidth="300"
              MinHeight="100"
              >
@@ -15,8 +15,7 @@
 
 		<!-- Question Text -->
 		<TextBlock Text="{Binding Question}" Grid.ColumnSpan="2" FontSize="15"
-				   Foreground="{StaticResource SPT_Foreground_Light}"
-               />
+		           />
 
 	    <!-- Editions Combo Selection -->
 		<ComboBox ItemsSource="{Binding Editions.AvailableEditions}"
@@ -44,11 +43,9 @@
 			<StackPanel Spacing="10" Margin="10">
 				<TextBlock Text="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=description}"
 						   FontSize="12"
-					   Foreground="{StaticResource SPT_Foreground_Light}"
-					   />
+						   />
 				<TextBlock Text="{Binding Editions.SelectedEdition.Description}"
 					   TextWrapping="Wrap"
-					   Foreground="{StaticResource SPT_Foreground_Light}"
 					   />
 			</StackPanel>
 		</Border>
@@ -62,7 +59,7 @@
 					CommandParameter="{Binding Editions.SelectedEdition}"
 					IsEnabled="{Binding Editions.HasSelection}"
 					IsDefault="True"
-					Classes="yellow"
+					Classes="alt"
               />
 			<Button Content="{Binding CancelButtonText}"
 					Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=dialogHost:DialogHost}, Path=CloseDialogCommand}"
diff --git a/project/SPT.Launcher/Views/Dialogs/WarningDialogView.axaml b/project/SPT.Launcher/Views/Dialogs/WarningDialogView.axaml
index 793f8ad..be705ce 100644
--- a/project/SPT.Launcher/Views/Dialogs/WarningDialogView.axaml
+++ b/project/SPT.Launcher/Views/Dialogs/WarningDialogView.axaml
@@ -6,7 +6,7 @@
              xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SPT.Launcher.Views.Dialogs.WarningDialogView"
-			 Background="{StaticResource SPT_Background_Dark}"
+			 Background="{DynamicResource BackgroundBrush}"
 			 BorderBrush="IndianRed"
 			 BorderThickness="1"
 			 >
@@ -20,7 +20,7 @@
 				HorizontalAlignment="Center"
 				VerticalAlignment="Center"
 				Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=dialogHost:DialogHost}, Path=CloseDialogCommand}"
-				Classes="yellow"
+				Classes="alt"
 				/>
 	</Grid>
 </UserControl>
diff --git a/project/SPT.Launcher/Views/LoginView.axaml b/project/SPT.Launcher/Views/LoginView.axaml
index a5264dc..083dc0d 100644
--- a/project/SPT.Launcher/Views/LoginView.axaml
+++ b/project/SPT.Launcher/Views/LoginView.axaml
@@ -57,14 +57,14 @@
 									   HorizontalAlignment="Center"
 									   VerticalAlignment="Center"
 									   FontWeight="SemiBold"
-									   Foreground="{StaticResource SPT_Brush_DarkGrayBlue}"
+									   Foreground="DarkSlateGray"
 									   IsVisible="{Binding !HasData}"
 								   />
 
 								<!-- nickname -->
 								<Label Content="{Binding Nickname}" Grid.Row="1" Grid.Column="3"
 									   IsVisible="{Binding HasData}"
-									   Foreground="{StaticResource SPT_Brush_DarkGrayBlue}"
+									   Foreground="DarkSlateGray"
 								   />
 
 								<!-- remaining exp -->
@@ -107,11 +107,11 @@
 		<!-- Login Control backdrop -->
 		<Border CornerRadius="5"
 				Grid.Row="2" Grid.Column="2"
-				BorderBrush="{StaticResource SPT_Background_Dark}"
+				BorderBrush="{DynamicResource BackgroundBrush}"
 				BorderThickness="2"
-				Background="{StaticResource SPT_Background_Dark}"
+				Background="{DynamicResource BackgroundBrush}"
             >
-			<Rectangle Fill="{StaticResource SPT_Background_Dark}" />
+			<Rectangle Fill="{DynamicResource BackgroundBrush}" />
 		</Border>
 
 		<StackPanel Spacing="10" Margin="10" Grid.Row="2" Grid.Column="2" HorizontalAlignment="Stretch">
diff --git a/project/SPT.Launcher/Views/MainWindow.axaml b/project/SPT.Launcher/Views/MainWindow.axaml
index 5bec9bf..ad83ab6 100644
--- a/project/SPT.Launcher/Views/MainWindow.axaml
+++ b/project/SPT.Launcher/Views/MainWindow.axaml
@@ -18,7 +18,7 @@
         ExtendClientAreaToDecorationsHint="True"
         ExtendClientAreaChromeHints="NoChrome"
         ExtendClientAreaTitleBarHeightHint="-1"
-        Background="{StaticResource SPT_Background_Light}">
+        Background="Gray">
 
 	<Window.Resources>
 		<cvt:ImageSourceConverter x:Key="imageSourceCvt"/>
@@ -39,7 +39,7 @@
 					 MinButtonCommand="{Binding MinimizeCommand}"
 					 SettingsButtonCommand="{Binding GoToSettingsCommand}"
 					 Classes.versiontag="{Binding VersionInfo.HasTag}"
-                 />
+				     />
 
 		<Image Source="{Binding Background.Path, Converter={StaticResource imageSourceCvt}}"
 			   Stretch="Fill" RenderOptions.BitmapInterpolationMode="HighQuality"
@@ -50,7 +50,7 @@
 		<dialogHost:DialogHost Identifier="mainHost" Grid.Row="1" Grid.RowSpan="2"
 							   CornerRadius="5"
 							   DialogMargin="0"
-							   OverlayBackground="{StaticResource SPT_Background_Light}"
+							   OverlayBackground="Gray"
                            >
 			<rxui:RoutedViewHost Router="{Binding Router}"
 								 />
@@ -59,8 +59,8 @@
 		<Label Content="{Binding VersionInfo.Tag}" Grid.Row="1"
 			   HorizontalAlignment="Right"
 			   VerticalAlignment="Top"
-			   Background="{StaticResource SPT_Brush_Yellow}"
-			   Foreground="{StaticResource SPT_Brush_DarkGrayBlue}"
+			   Background="{DynamicResource AccentBrush}"
+			   Foreground="DarkSlateGray"
 			   FontWeight="SemiBold"
 			   CornerRadius="0 0 5 5"
 			   Margin="10 0"
diff --git a/project/SPT.Launcher/Views/ModInfoView.axaml b/project/SPT.Launcher/Views/ModInfoView.axaml
index 52e6a53..9058e5d 100644
--- a/project/SPT.Launcher/Views/ModInfoView.axaml
+++ b/project/SPT.Launcher/Views/ModInfoView.axaml
@@ -20,7 +20,7 @@
         <!-- Active Mods List Header -->
         <Border Grid.Row="3" Grid.Column="1"
                 CornerRadius="5"
-                Background="{StaticResource SPT_Background_Dark}">
+                Background="{DynamicResource BackgroundBrush}">
             <StackPanel Spacing="2" Margin="10">
                 <!-- Active mods count and text -->
                 <Label VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="16">
@@ -37,8 +37,7 @@
                            VerticalAlignment="Center" HorizontalAlignment="Center"
                            FontSize="12"
                            TextWrapping="Wrap"
-                           Foreground="{StaticResource SPT_Foreground_Light}"
-                />
+                           />
             </StackPanel>
         </Border>
         
@@ -63,7 +62,7 @@
         <!-- Inactive Mods List Header -->
         <Border Grid.Row="3" Grid.Column="3"
                 CornerRadius="5"
-                Background="{StaticResource SPT_Background_Dark}">
+                Background="{DynamicResource BackgroundBrush}">
             <StackPanel Spacing="2" Margin="10">
                 <!-- Inactive mods count and text -->
                 <Label VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="16">
@@ -80,7 +79,6 @@
                            VerticalAlignment="Center" HorizontalAlignment="Center"
                            FontSize="12"
                            TextWrapping="Wrap"
-                           Foreground="{StaticResource SPT_Foreground_Light}"
                            />
             </StackPanel>
         </Border>
diff --git a/project/SPT.Launcher/Views/Notifications/SPTNotificationView.axaml b/project/SPT.Launcher/Views/Notifications/SPTNotificationView.axaml
index af860af..bbba928 100644
--- a/project/SPT.Launcher/Views/Notifications/SPTNotificationView.axaml
+++ b/project/SPT.Launcher/Views/Notifications/SPTNotificationView.axaml
@@ -6,7 +6,7 @@
              x:Class="SPT.Launcher.Views.Notifications.SPTNotificationView"
              >
 
-  <Border Padding="12" MinHeight="20" Background="{StaticResource SPT_Background_Dark}"
+  <Border Padding="12" MinHeight="20" Background="{DynamicResource BackgroundBrush}"
           BorderBrush="{Binding BarColor}"
           BorderThickness="3 0 0 0">
     <Grid>
diff --git a/project/SPT.Launcher/Views/ProfileView.axaml b/project/SPT.Launcher/Views/ProfileView.axaml
index 9d3f6b4..9f146a9 100644
--- a/project/SPT.Launcher/Views/ProfileView.axaml
+++ b/project/SPT.Launcher/Views/ProfileView.axaml
@@ -15,10 +15,10 @@
 
         <!-- profile info -->
         <Border Grid.Row="1" Grid.Column="1" CornerRadius="5"
-                BorderBrush="{StaticResource SPT_Background_Dark}"
+                BorderBrush="{DynamicResource BackgroundBrush}"
                 BorderThickness="5">
             <Grid RowDefinitions="10,AUTO,AUTO,AUTO,AUTO,10" ColumnDefinitions="10,AUTO,*,10"
-                  Background="{StaticResource SPT_Background_Dark}">
+                  Background="{DynamicResource BackgroundBrush}">
                 <StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="1">
                     <Label Content="{Binding CurrentUsername}" Margin="5 0" />
 
@@ -69,10 +69,10 @@
 
         <!-- Total Mods Info -->
         <Border Grid.Row="3" Grid.Column="1" CornerRadius="5"
-                BorderBrush="{StaticResource SPT_Background_Dark}"
+                BorderBrush="{DynamicResource BackgroundBrush}"
                 BorderThickness="5" IsVisible="{Binding ModInfoCollection.HasMods}">
             <Grid RowDefinitions="10,AUTO,10" ColumnDefinitions="10,Auto,*,AUTO,10"
-                  Background="{StaticResource SPT_Background_Dark}">
+                  Background="{DynamicResource BackgroundBrush}">
                 
                 <!-- server mods count text -->
                 <Label Grid.Row="1" Grid.Column="1">
@@ -90,7 +90,7 @@
                         Command="{Binding OpenModsInfoCommand}"
                         Classes="icon">
                     <Button.Content>
-                        <Path Data="{StaticResource Open}" Fill="{StaticResource SPT_Foreground_Light}"
+                        <Path Data="{StaticResource Open}" Fill="{DynamicResource ForegroundBrush}"
                               VerticalAlignment="Center"
                               />
                     </Button.Content>
@@ -100,9 +100,9 @@
 
         <!-- Bottom bar -->
         <Border Grid.Row="7" Grid.Column="1" Grid.ColumnSpan="3" CornerRadius="5"
-                BorderBrush="{StaticResource SPT_Background_Dark}"
+                BorderBrush="{DynamicResource BackgroundBrush}"
                 BorderThickness="5">
-            <DockPanel Background="{StaticResource SPT_Background_Dark}">
+            <DockPanel Background="{DynamicResource BackgroundBrush}">
 
                 <StackPanel Orientation="Horizontal"
                             HorizontalAlignment="Stretch"
@@ -134,7 +134,7 @@
                         DockPanel.Dock="Right"
                         Command="{Binding StartGameCommand}"
                         IsEnabled="{Binding Source={x:Static helpers:LauncherSettingsProvider.Instance}, Path=!GameRunning}"
-                        Classes="yellow" />
+                        Classes="alt" />
 
                 <Button Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=logout}"
                         Command="{Binding LogoutCommand}"
diff --git a/project/SPT.Launcher/Views/SettingsView.axaml b/project/SPT.Launcher/Views/SettingsView.axaml
index 94ad579..df1f09a 100644
--- a/project/SPT.Launcher/Views/SettingsView.axaml
+++ b/project/SPT.Launcher/Views/SettingsView.axaml
@@ -11,7 +11,7 @@
   <Grid RowDefinitions="10,AUTO,AUTO,*, AUTO, AUTO, AUTO,10" ColumnDefinitions="10,2*,2*,AUTO,10">
 
     <!-- Backdrop -->
-    <Rectangle Fill="{StaticResource SPT_Background_Dark}"
+    <Rectangle Fill="{DynamicResource BackgroundBrush}"
                Grid.RowSpan="7" Grid.ColumnSpan="5"
                Opacity=".7"
                />