From 54a0f14f58b5305812999ae3c61cd9f482ffd54c Mon Sep 17 00:00:00 2001
From: JakariaMods <JakariaMods@Gmail.com>
Date: Mon, 12 May 2025 17:22:09 -0400
Subject: [PATCH 1/4] first time user experience tip

---
 MainWindow.xaml    | 2 +-
 MainWindow.xaml.cs | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/MainWindow.xaml b/MainWindow.xaml
index e469099..3b8f34e 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -31,7 +31,7 @@
                     Margin="0, 0, 0, 2"
                     >
                     <TextBox Text="{Binding GamePath}" Width="400"  />
-                    <Button Margin="2, 0, 0, 0" Padding="4, 2, 4, 2" Click="OnLocateGame" Content="Locate Game" />
+                    <Button Margin="2, 0, 0, 0" Padding="4, 2, 4, 2" Click="OnLocateGame" Content="Locate Game" x:Name="LocateGameButton"/>
                 </StackPanel>
 
                 <TextBox
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 85f939f..08ddd5b 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -46,7 +46,7 @@ private async void Reload(object sender, RoutedEventArgs e)
 
         if (string.IsNullOrWhiteSpace(this.GamePath))
         {
-            this.InfoText.Text = "First, please show me where is the Game installed";
+            this.InfoText.Text = $"First, please show me where is the Game installed by pressing the '{LocateGameButton.Content.ToString()}' button";
             return;
         }
 
@@ -106,6 +106,7 @@ private void OnLocateGame(object sender, RoutedEventArgs e)
         var dialog = new OpenFolderDialog
         {
             Multiselect = false,
+            Title = "Select Space Engineers 2's Directory"
         };
 
         var found = dialog.ShowDialog(this);

From e9e59ec7cb09097c40a204105ff667b2d2535f49 Mon Sep 17 00:00:00 2001
From: JakariaMods <JakariaMods@Gmail.com>
Date: Mon, 12 May 2025 20:24:52 -0400
Subject: [PATCH 2/4] Add dark theme

---
 App.config                   |   3 +
 App.xaml                     |  15 +-
 Controls/InputsEditor.xaml   |   2 +-
 Controls/KeyBindsEditor.xaml |   6 -
 Data/Settings.Designer.cs    |  12 ++
 Data/Settings.cs             |   2 +-
 Data/Settings.settings       |   3 +
 MainWindow.xaml              | 180 ++++++++++++----------
 MainWindow.xaml.cs           |  30 ++++
 SpaceEditor.csproj           |   9 ++
 Themes/Dark.xaml             |  12 ++
 Themes/Global.xaml           | 282 +++++++++++++++++++++++++++++++++++
 Themes/Light.xaml            |  12 ++
 13 files changed, 474 insertions(+), 94 deletions(-)
 create mode 100644 Themes/Dark.xaml
 create mode 100644 Themes/Global.xaml
 create mode 100644 Themes/Light.xaml

diff --git a/App.config b/App.config
index c2cb143..23ef88f 100644
--- a/App.config
+++ b/App.config
@@ -10,6 +10,9 @@
             <setting name="GamePath" serializeAs="String">
                 <value />
             </setting>
+            <setting name="Theme" serializeAs="String">
+                <value>0</value>
+            </setting>
         </SpaceEditor.Data.Settings>
     </userSettings>
 </configuration>
\ No newline at end of file
diff --git a/App.xaml b/App.xaml
index 176d4d8..21e8383 100644
--- a/App.xaml
+++ b/App.xaml
@@ -5,10 +5,15 @@
              StartupUri="MainWindow.xaml"
              Exit="OnExit">
     <Application.Resources>
-         <Style TargetType="GridSplitter">
-            <Setter Property="ResizeBehavior" Value="PreviousAndNext" />
-            <Setter Property="Background" Value="#FF7F7F7F"/>
-            <Setter Property="Width" Value="4"/>
-        </Style>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <!--Load all themes and keep them for later-->
+                <ResourceDictionary Source="Themes/Light.xaml"/>
+                <ResourceDictionary Source="Themes/Dark.xaml"/>
+
+                <!--Override any changes we don't want themes to modify/declare themselves-->
+                <ResourceDictionary Source="Themes/Global.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/Controls/InputsEditor.xaml b/Controls/InputsEditor.xaml
index 3ca05aa..5d85539 100644
--- a/Controls/InputsEditor.xaml
+++ b/Controls/InputsEditor.xaml
@@ -37,7 +37,7 @@
             </Grid.RowDefinitions>
 
             <TextBox
-                Margin="2, 0, 2, 2"
+                Margin="2, 0, 2, 2" 
                 Text="{Binding Path=InputActionsSearchString, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType=UserControl}}"
                 />
 
diff --git a/Controls/KeyBindsEditor.xaml b/Controls/KeyBindsEditor.xaml
index ba11546..fb33470 100644
--- a/Controls/KeyBindsEditor.xaml
+++ b/Controls/KeyBindsEditor.xaml
@@ -47,12 +47,6 @@
             VerticalAlignment="Center"
             Name="ActionButtons"
             >
-            <StackPanel.Resources>
-                <Style TargetType="Button">
-                    <Setter Property="Margin" Value="2, 0, 0, 0" />
-                    <Setter Property="Padding" Value="2" />
-                </Style>
-            </StackPanel.Resources>
 
             <Button
                 Content="Save"
diff --git a/Data/Settings.Designer.cs b/Data/Settings.Designer.cs
index 7b79278..d1f2273 100644
--- a/Data/Settings.Designer.cs
+++ b/Data/Settings.Designer.cs
@@ -45,5 +45,17 @@ public string GamePath {
                 this["Presets"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public int Theme {
+            get {
+                return ((int)(this["Theme"]));
+            }
+            set {
+                this["Theme"] = value;
+            }
+        }
     }
 }
diff --git a/Data/Settings.cs b/Data/Settings.cs
index 5fb46ba..3e1a7ef 100644
--- a/Data/Settings.cs
+++ b/Data/Settings.cs
@@ -41,7 +41,7 @@ public Dictionary<string, string> NamedPresets
     public void InvokeGameAction(Action action)
     {
         var sb = new StringBuilder();
-        sb.AppendLine("This action is about change Game Content which may result in incompatibilities, bugs or crashes.");
+        sb.AppendLine("This action is about to change Game Content which may result in incompatibilities, bugs or crashes.");
         sb.AppendLine("In case of any issues use Steam Verify Game Integrity feature to automatically revert all modifications.");
         sb.AppendLine("Use at your own risk.");
         sb.AppendLine("Continue?");
diff --git a/Data/Settings.settings b/Data/Settings.settings
index 28f81d3..3d0a965 100644
--- a/Data/Settings.settings
+++ b/Data/Settings.settings
@@ -8,5 +8,8 @@
     <Setting Name="Presets" Type="System.Collections.Specialized.StringCollection" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="Theme" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 3b8f34e..6dce493 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -12,95 +12,113 @@
         Width="1000"
         d:DataContext="{local:MainWindow}"
         >
-    <TabControl
-        Name="MainTabs"
-        >
-        <TabItem Header="Main">
-            <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="*" />
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-
-                <StackPanel
-                    Orientation="Horizontal"
-                    Margin="0, 0, 0, 2"
-                    >
-                    <TextBox Text="{Binding GamePath}" Width="400"  />
-                    <Button Margin="2, 0, 0, 0" Padding="4, 2, 4, 2" Click="OnLocateGame" Content="Locate Game" x:Name="LocateGameButton"/>
-                </StackPanel>
-
-                <TextBox
-                    Grid.Row="1"
-                    Grid.Column="0"
-                    Name="InfoText"
-                    IsReadOnly="True"
-                    />
-
-                <Image
-                    Grid.Row="1"
-                    Grid.Column="1"
-                    VerticalAlignment="Bottom"
-                    HorizontalAlignment="Right"
-                    Opacity="0.4"
-                    Stretch="Fill"
-                    Source="pack://application:,,,/Resources/SpaceEditor.png"
-                    />
-
-                <Grid
-                    Grid.Row="1"
-                    Grid.Column="1"
-                    >
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="23*"/>
+            <ColumnDefinition Width="177*"/>
+        </Grid.ColumnDefinitions>
+        <TabControl
+    Name="MainTabs" Grid.ColumnSpan="2"
+    >
+            <TabItem Header="Main" x:Name="MainTabItem">
+                <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="*" />
                     </Grid.RowDefinitions>
-                    <Grid.Resources>
-                        <Style TargetType="TextBlock">
-                            <Setter Property="Background" Value="Transparent" />
-                            <Setter Property="FontSize" Value="15" />
-                        </Style>
-                    </Grid.Resources>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
 
-                    <TextBlock
-                        Text="Change log"
-                        FontSize="35"
-                        FontWeight="Bold"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        Margin="5"
-                        />
+                    <StackPanel
+                Orientation="Horizontal"
+                Margin="0, 0, 0, 2"
+                >
+                        <TextBox Text="{Binding GamePath}" Width="400"  />
+                        <Button Margin="2, 0, 0, 0" Padding="4, 2, 4, 2" Click="OnLocateGame" Content="Locate Game" x:Name="LocateGameButton"/>
+                    </StackPanel>
+
+                    <TextBox
+                Grid.Row="1"
+                Grid.Column="0"
+                Name="InfoText"
+                IsReadOnly="True"
+                />
+
+                    <Image
+                Grid.Row="1"
+                Grid.Column="1"
+                VerticalAlignment="Bottom"
+                HorizontalAlignment="Right"
+                Opacity="0.4"
+                Stretch="Fill"
+                Source="pack://application:,,,/Resources/SpaceEditor.png"
+                />
+
+                    <Grid
+                Grid.Row="1"
+                Grid.Column="1"
+                >
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+                        <Grid.Resources>
+                            <Style TargetType="TextBlock">
+                                <Setter Property="Background" Value="Transparent" />
+                                <Setter Property="FontSize" Value="15" />
+                            </Style>
+                        </Grid.Resources>
 
-                    <ScrollViewer
-                        Grid.Row="1"
-                        VerticalScrollBarVisibility="Auto"
-                        HorizontalScrollBarVisibility="Auto"
-                        >
                         <TextBlock
-                            Margin="10, 0, 0, 0"
-                            >
-                            <Run FontSize="20" FontWeight="Bold">May 12 2025 - v0.9.1</Run>
-                            <LineBreak />
-                            <Run>- Fixed detection of bins location in Steam builds</Run>
-                            <LineBreak />
-                            <LineBreak />
-                            
-                            <Run FontSize="20" FontWeight="Bold">May 12 2025 - v0.9</Run>
-                            <LineBreak />
-                            <Run>- Locates and loads SE2 binaries</Run>
-                            <LineBreak />
-                            <Run> - Key Binds Editor Mk1</Run>
-                            <LineBreak />
-                            <Run> - Writes new Bindings to SE2 Content</Run>
+                    Text="Change log"
+                    FontSize="35"
+                    FontWeight="Bold"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    Margin="5"
+                    >
                         </TextBlock>
-                    </ScrollViewer>
+
+                        <ScrollViewer
+                    Grid.Row="1"
+                    VerticalScrollBarVisibility="Auto"
+                    HorizontalScrollBarVisibility="Auto"
+                    >
+                            <TextBlock
+                        Margin="10, 0, 0, 0"
+                        >
+                        <Run FontSize="20" FontWeight="Bold">May 12 2025 - v0.9.1</Run>
+                        <LineBreak />
+                        <Run>- Fixed detection of bins location in Steam builds</Run>
+                        <LineBreak />
+                        <LineBreak />
+                        
+                        <Run FontSize="20" FontWeight="Bold">May 12 2025 - v0.9</Run>
+                        <LineBreak />
+                        <Run>- Locates and loads SE2 binaries</Run>
+                        <LineBreak />
+                        <Run> - Key Binds Editor Mk1</Run>
+                        <LineBreak />
+                        <Run> - Writes new Bindings to SE2 Content</Run>
+                            </TextBlock>
+                        </ScrollViewer>
+                    </Grid>
                 </Grid>
-            </Grid>
-        </TabItem>
-    </TabControl>
+            </TabItem>
+        </TabControl>
+        <Grid HorizontalAlignment="Right" VerticalAlignment="Top" x:Name="Toolbar" Height="{Binding ActualHeight, ElementName=MainTabItem}" Grid.Column="1">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock VerticalAlignment="Center" Margin="5">Theme</TextBlock>
+                    <ComboBox SelectedIndex="{Binding Theme, Mode=TwoWay}" Width="65">
+                        <ComboBoxItem>Light</ComboBoxItem>
+                        <ComboBoxItem>Dark</ComboBoxItem>
+                    </ComboBox>
+                </StackPanel>
+            </StackPanel>
+        </Grid>
+    </Grid>
 
 </Window>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 08ddd5b..dee9b54 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -29,6 +29,22 @@ public string GamePath
         }
     }
 
+    public int Theme
+    {
+        get => this.Settings.Theme;
+        set
+        {
+            if (this.Settings.Theme == value)
+                return;
+
+            this.Settings.Theme = value;
+            OnPropertyChanged();
+            OnThemeChanged(value);
+        }
+    }
+
+    private List<ResourceDictionary> _themes = new();
+
     public MainWindow()
     {
         this.DataContext = this;
@@ -38,6 +54,8 @@ public MainWindow()
 
     private async void Reload(object sender, RoutedEventArgs e)
     {
+        OnThemeChanged(this.Settings.Theme);
+
         var tabs = this.MainTabs.Items;
         while (tabs.Count > 1)
         {
@@ -120,4 +138,16 @@ protected void OnPropertyChanged([CallerMemberName] string? propertyName = null)
     {
         this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
     }
+
+    private void OnThemeChanged(int themeIndex)
+    {
+        var resources = Application.Current.Resources.MergedDictionaries;
+        while (resources.Count > 1) //Remove all but the last, that is the global theme.
+        {
+            _themes.Add(resources[0]);
+            resources.RemoveAt(0);
+        }
+
+        resources.Insert(0, _themes[themeIndex]);
+    }
 }
\ No newline at end of file
diff --git a/SpaceEditor.csproj b/SpaceEditor.csproj
index 9736eeb..c121820 100644
--- a/SpaceEditor.csproj
+++ b/SpaceEditor.csproj
@@ -13,10 +13,19 @@
     <None Remove="Resources\SpaceEditor.png" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Page Remove="Themes\Dark.xaml" />
+    <Page Remove="Themes\Global.xaml" />
+    <Page Remove="Themes\Light.xaml" />
+  </ItemGroup>
+
   <ItemGroup>
     <Resource Include="Resources\SpaceEditor.png">
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </Resource>
+    <Resource Include="Themes\Dark.xaml" />
+    <Resource Include="Themes\Global.xaml" />
+    <Resource Include="Themes\Light.xaml" />
     <Content Include="SpaceEditor.ico" />
   </ItemGroup>
 
diff --git a/Themes/Dark.xaml b/Themes/Dark.xaml
new file mode 100644
index 0000000..a92dada
--- /dev/null
+++ b/Themes/Dark.xaml
@@ -0,0 +1,12 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="Background" Color="#151515"/>
+    <SolidColorBrush x:Key="Foreground" Color="White"/>
+
+    <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="Black" />
+    <SolidColorBrush x:Key="DisabledForegroundBrush" Color="Gray" />
+    <SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#404040" />
+    <SolidColorBrush x:Key="MouseoverBackgroundBrush" Color="#202020" />
+    <SolidColorBrush x:Key="UnselectedBackgroundBrush" Color="#050505" />
+    <SolidColorBrush x:Key="Border" Color="#AAA" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Themes/Global.xaml b/Themes/Global.xaml
new file mode 100644
index 0000000..bf7dc98
--- /dev/null
+++ b/Themes/Global.xaml
@@ -0,0 +1,282 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:theme="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.AeroLite">
+    <!-- Values loaded after the dark/light themes. These values should not be touched by user themes. -->
+    <Style TargetType="GridSplitter">
+        <Setter Property="ResizeBehavior" Value="PreviousAndNext" />
+        <Setter Property="Width" Value="4"/>
+    </Style>
+
+    <Style TargetType="Window">
+        <Setter Property="Background" Value="{DynamicResource Background}" />
+    </Style>
+
+    <Style TargetType="TextBlock">
+        <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
+    </Style>
+
+    <Style TargetType="TextBox">
+        <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
+        <Setter Property="Background" Value="{DynamicResource Background}" />
+    </Style>
+
+    <Style TargetType="ListBox">
+        <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
+        <Setter Property="Background" Value="{DynamicResource Background}" />
+    </Style>
+
+    <Style TargetType="TabControl">
+        <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
+        <Setter Property="Background" Value="{DynamicResource Background}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TabControl}">
+                    <Grid x:Name="templateRoot" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition x:Name="ColumnDefinition0"/>
+                            <ColumnDefinition x:Name="ColumnDefinition1" Width="0"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition x:Name="RowDefinition0" Height="Auto"/>
+                            <RowDefinition x:Name="RowDefinition1" Height="*"/>
+                        </Grid.RowDefinitions>
+                        <TabPanel x:Name="headerPanel" Background="{DynamicResource Background}" Grid.Column="0" IsItemsHost="true" Grid.Row="0" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1"/>
+                        <Grid x:Name="contentPanel" Background="{DynamicResource Background}" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
+                            <ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </Grid>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="TabStripPlacement" Value="Bottom">
+                            <Setter Property="Grid.Row" TargetName="headerPanel" Value="1"/>
+                            <Setter Property="Grid.Row" TargetName="contentPanel" Value="0"/>
+                            <Setter Property="Height" TargetName="RowDefinition0" Value="*"/>
+                            <Setter Property="Height" TargetName="RowDefinition1" Value="Auto"/>
+                            <Setter Property="Margin" TargetName="headerPanel" Value="2,0,2,2"/>
+                        </Trigger>
+                        <Trigger Property="TabStripPlacement" Value="Left">
+                            <Setter Property="Grid.Row" TargetName="headerPanel" Value="0"/>
+                            <Setter Property="Grid.Row" TargetName="contentPanel" Value="0"/>
+                            <Setter Property="Grid.Column" TargetName="headerPanel" Value="0"/>
+                            <Setter Property="Grid.Column" TargetName="contentPanel" Value="1"/>
+                            <Setter Property="Width" TargetName="ColumnDefinition0" Value="Auto"/>
+                            <Setter Property="Width" TargetName="ColumnDefinition1" Value="*"/>
+                            <Setter Property="Height" TargetName="RowDefinition0" Value="*"/>
+                            <Setter Property="Height" TargetName="RowDefinition1" Value="0"/>
+                            <Setter Property="Margin" TargetName="headerPanel" Value="2,2,0,2"/>
+                        </Trigger>
+                        <Trigger Property="TabStripPlacement" Value="Right">
+                            <Setter Property="Grid.Row" TargetName="headerPanel" Value="0"/>
+                            <Setter Property="Grid.Row" TargetName="contentPanel" Value="0"/>
+                            <Setter Property="Grid.Column" TargetName="headerPanel" Value="1"/>
+                            <Setter Property="Grid.Column" TargetName="contentPanel" Value="0"/>
+                            <Setter Property="Width" TargetName="ColumnDefinition0" Value="*"/>
+                            <Setter Property="Width" TargetName="ColumnDefinition1" Value="Auto"/>
+                            <Setter Property="Height" TargetName="RowDefinition0" Value="*"/>
+                            <Setter Property="Height" TargetName="RowDefinition1" Value="0"/>
+                            <Setter Property="Margin" TargetName="headerPanel" Value="0,2,2,2"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="TextElement.Foreground" TargetName="templateRoot" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="ComboBox">
+        <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
+        <Setter Property="Background" Value="{DynamicResource Background}" />
+
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ComboBox}">
+                    <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0"/>
+                        </Grid.ColumnDefinitions>
+                        <Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource Mode=TemplatedParent}}" Margin="1" Placement="Bottom" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
+                            <theme:SystemDropShadowChrome x:Name="shadow" Color="Transparent" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" MaxHeight="{TemplateBinding MaxDropDownHeight}">
+                                <Border x:Name="dropDownBorder" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1">
+                                    <ScrollViewer x:Name="DropDownScrollViewer">
+                                        <Grid x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
+                                            <Canvas x:Name="canvas" HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+                                                <Rectangle x:Name="opaqueRect" Fill="{Binding Background, ElementName=dropDownBorder}" Height="{Binding ActualHeight, ElementName=dropDownBorder}" Width="{Binding ActualWidth, ElementName=dropDownBorder}"/>
+                                            </Canvas>
+                                            <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                        </Grid>
+                                    </ScrollViewer>
+                                </Border>
+                            </theme:SystemDropShadowChrome>
+                        </Popup>
+                        <ToggleButton x:Name="toggleButton" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
+                        <ContentPresenter x:Name="contentPresenter" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" Content="{TemplateBinding SelectionBoxItem}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="HasDropShadow" SourceName="PART_Popup" Value="true">
+                            <Setter Property="Margin" TargetName="shadow" Value="0,0,5,5"/>
+                            <Setter Property="Color" TargetName="shadow" Value="#71000000"/>
+                        </Trigger>
+                        <Trigger Property="HasItems" Value="false">
+                            <Setter Property="Height" TargetName="dropDownBorder" Value="95"/>
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsGrouping" Value="true"/>
+                                <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
+                            </MultiTrigger.Conditions>
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+                        </MultiTrigger>
+                        <Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer" Value="false">
+                            <Setter Property="Canvas.Top" TargetName="opaqueRect" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}"/>
+                            <Setter Property="Canvas.Left" TargetName="opaqueRect" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="ComboBoxItem">
+        <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
+        <Setter Property="Background" Value="{DynamicResource Background}" />
+
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ComboBoxItem}">
+                    <Grid Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
+                        <Border 
+                    Name="Border"
+                    Background="{DynamicResource UnselectedBackgroundBrush}"
+                    BorderBrush="{DynamicResource Border}" 
+                    BorderThickness="1" >
+                            <ContentPresenter x:Name="contentPresenter" Margin="2" TextBlock.Foreground="{DynamicResource Foreground}" />
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource MouseoverBackgroundBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource DisabledBackgroundBrush}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource Border}" />
+                            <Setter Property="Foreground" Value="{DynamicResource DisabledForegroundBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type Button}">
+        <Setter Property="Margin" Value="2, 0, 0, 0" />
+        <Setter Property="Padding" Value="2" />
+        <Setter Property="Background" Value="{DynamicResource Background}" />
+        <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Grid Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
+                        <Border 
+                            Name="Border"
+                            Background="{DynamicResource UnselectedBackgroundBrush}"
+                            BorderBrush="{DynamicResource Border}" 
+                            BorderThickness="1" >
+
+                        <ContentPresenter x:Name="contentPresenter" Margin="2" Content="{TemplateBinding Content}" TextBlock.Foreground="{DynamicResource Foreground}" />
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource SelectedBackgroundBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="False">
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource SelectedBackgroundBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource MouseoverBackgroundBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource DisabledBackgroundBrush}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource Border}" />
+                            <Setter Property="Foreground" Value="{DynamicResource DisabledForegroundBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type ToggleButton}">  
+        <Setter Property="Background" Value="{DynamicResource Background}" />
+        <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Grid Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
+                        <Border 
+                        Name="Border"
+                        Background="{DynamicResource UnselectedBackgroundBrush}"
+                        BorderBrush="{DynamicResource Border}" 
+                        BorderThickness="1" >
+                            <ContentPresenter x:Name="contentPresenter" Margin="2" TextBlock.Foreground="{DynamicResource Foreground}" />
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource MouseoverBackgroundBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource SelectedBackgroundBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="False">
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource SelectedBackgroundBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource DisabledBackgroundBrush}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource Border}" />
+                            <Setter Property="Foreground" Value="{DynamicResource DisabledForegroundBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type TabItem}">
+        <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TabItem}">
+                    <Grid>
+                        <Border 
+                                Name="Border"
+                                Background="{DynamicResource UnselectedBackgroundBrush}"
+                                BorderBrush="{DynamicResource Border}" 
+                                BorderThickness="1" >
+                            <ContentPresenter x:Name="ContentSite"
+                                    VerticalAlignment="Center"
+                                    HorizontalAlignment="Center"
+                                    ContentSource="Header"
+                                    Margin="12,2,12,2"
+                                    RecognizesAccessKey="True"/>
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource MouseoverBackgroundBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource SelectedBackgroundBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource DisabledBackgroundBrush}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource Border}" />
+                            <Setter Property="Foreground" Value="{DynamicResource DisabledForegroundBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Themes/Light.xaml b/Themes/Light.xaml
new file mode 100644
index 0000000..4ad55cd
--- /dev/null
+++ b/Themes/Light.xaml
@@ -0,0 +1,12 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="Background" Color="#FFFFFF"/>
+    <SolidColorBrush x:Key="Foreground" Color="#151515"/>
+
+    <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="Gray" />
+    <SolidColorBrush x:Key="DisabledForegroundBrush" Color="Black" />
+    <SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#F0F0F0" />
+    <SolidColorBrush x:Key="MouseoverBackgroundBrush" Color="#BBB" />
+    <SolidColorBrush x:Key="UnselectedBackgroundBrush" Color="#F1F1F1" />
+    <SolidColorBrush x:Key="Border" Color="#AAA" />
+</ResourceDictionary>
\ No newline at end of file

From d8e23a5b4b9fa5a5da299cdb31eb6ffeed7521b4 Mon Sep 17 00:00:00 2001
From: JakariaMods <JakariaMods@Gmail.com>
Date: Mon, 12 May 2025 20:38:35 -0400
Subject: [PATCH 3/4] Fix style not applying to control

---
 Controls/ReflectedObject.xaml | 4 ++++
 Themes/Dark.xaml              | 2 +-
 Themes/Global.xaml            | 3 ---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Controls/ReflectedObject.xaml b/Controls/ReflectedObject.xaml
index 5546a3e..3cb2f7e 100644
--- a/Controls/ReflectedObject.xaml
+++ b/Controls/ReflectedObject.xaml
@@ -9,6 +9,10 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800" Name="Root">
     <UserControl.Resources>
+        <Style TargetType="local:ReflectedObject">
+            <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
+            <Setter Property="Background" Value="{DynamicResource Background}" />
+        </Style>
         <local:FlatGroupingDataGridOperator x:Key="FlatGroupingDataGridOperator" />
         
         <DataTemplate x:Key="NotNullTemplate">
diff --git a/Themes/Dark.xaml b/Themes/Dark.xaml
index a92dada..37ee1b9 100644
--- a/Themes/Dark.xaml
+++ b/Themes/Dark.xaml
@@ -4,7 +4,7 @@
     <SolidColorBrush x:Key="Foreground" Color="White"/>
 
     <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="Black" />
-    <SolidColorBrush x:Key="DisabledForegroundBrush" Color="Gray" />
+    <SolidColorBrush x:Key="DisabledForegroundBrush" Color="DarkGray" />
     <SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#404040" />
     <SolidColorBrush x:Key="MouseoverBackgroundBrush" Color="#202020" />
     <SolidColorBrush x:Key="UnselectedBackgroundBrush" Color="#050505" />
diff --git a/Themes/Global.xaml b/Themes/Global.xaml
index bf7dc98..3ddca12 100644
--- a/Themes/Global.xaml
+++ b/Themes/Global.xaml
@@ -263,9 +263,6 @@
                         </Border>
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource MouseoverBackgroundBrush}" />
-                        </Trigger>
                         <Trigger Property="IsSelected" Value="True">
                             <Setter TargetName="Border" Property="Background" Value="{DynamicResource SelectedBackgroundBrush}" />
                         </Trigger>

From 31fdefb0e61fa23f83e0fbdae496c9638c67ac9b Mon Sep 17 00:00:00 2001
From: JakariaMods <JakariaMods@Gmail.com>
Date: Tue, 13 May 2025 17:11:47 -0400
Subject: [PATCH 4/4] Stable theme

---
 MainWindow.xaml.cs | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index dee9b54..47ba457 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -44,18 +44,27 @@ public int Theme
     }
 
     private List<ResourceDictionary> _themes = new();
+    private ResourceDictionary _globalTheme;
 
     public MainWindow()
     {
         this.DataContext = this;
         this.Loaded += Reload;
         InitializeComponent();
+
+        var resources = Application.Current.Resources.MergedDictionaries;
+        //Theme index is determined in App.xaml
+        for (int i = 0; i < resources.Count - 1; i++)
+        {
+            _themes.Add(resources[i]);
+        }
+
+        _globalTheme = resources.Last();
+        OnThemeChanged(this.Settings.Theme);
     }
 
     private async void Reload(object sender, RoutedEventArgs e)
     {
-        OnThemeChanged(this.Settings.Theme);
-
         var tabs = this.MainTabs.Items;
         while (tabs.Count > 1)
         {
@@ -142,12 +151,8 @@ protected void OnPropertyChanged([CallerMemberName] string? propertyName = null)
     private void OnThemeChanged(int themeIndex)
     {
         var resources = Application.Current.Resources.MergedDictionaries;
-        while (resources.Count > 1) //Remove all but the last, that is the global theme.
-        {
-            _themes.Add(resources[0]);
-            resources.RemoveAt(0);
-        }
-
-        resources.Insert(0, _themes[themeIndex]);
+        resources.Clear();
+        resources.Add(_themes[themeIndex]);
+        resources.Add(_globalTheme);
     }
 }
\ No newline at end of file