From e6ccb7324f6d141e06561731c4d2c5ea92e24246 Mon Sep 17 00:00:00 2001
From: Lann <8305632+Lann094@users.noreply.github.com>
Date: Fri, 7 Aug 2026 21:41:16 +1000
Subject: [PATCH] Add dark theme

---
 .../ProjectLocales.Designer.cs                | 11 +++-
 .../ProjectLocales.de.resx                    | 12 +++++
 .../ProjectLocales.resx                       | 12 +++++
 Source/AutoActions/App.xaml                   |  4 +-
 Source/AutoActions/App.xaml.cs                | 27 +++++++++-
 Source/AutoActions/AutoActions.csproj         | 13 ++---
 Source/AutoActions/Controls/1_Colors.xaml     | 40 --------------
 ...ltControls.xaml => 1_DefaultControls.xaml} | 12 +++--
 ...tomComboBox.xaml => 2_CustomComboBox.xaml} |  4 +-
 Source/AutoActions/Controls/AppResources.xaml | 52 ++++---------------
 Source/AutoActions/Theming/DarkColors.xaml    | 43 +++++++++++++++
 Source/AutoActions/Theming/LightColors.xaml   | 40 +++++++++++---
 .../Theming/ThemeResourceDirectory.cs         |  2 +-
 Source/AutoActions/Theming/ThemeSetting.cs    |  9 ++++
 Source/AutoActions/UserAppSettings.cs         | 13 +++++
 .../Views/ActionShortcutManagerView.xaml      |  2 +-
 .../Views/ApplicationAdderView.xaml           |  2 +-
 .../Views/AutoActionsInfoView.xaml            |  2 +-
 .../Views/AutoActionsLicenseView.xaml         |  2 +-
 .../Views/AutoActionsLogsView.xaml            |  2 +-
 .../Views/AutoActionsMainView.xaml            |  6 +--
 .../Views/ProfileActionAdderView.xaml         |  2 +-
 Source/AutoActions/Views/StatusView.xaml      |  4 +-
 .../Views/UWPApplicationDialogView.xaml       |  4 +-
 .../Views/UserAppSettingsView.xaml            | 49 ++++++++++-------
 Source/AutoActions/WinAPIFunctions.cs         | 22 ++++++++
 26 files changed, 253 insertions(+), 138 deletions(-)
 delete mode 100644 Source/AutoActions/Controls/1_Colors.xaml
 rename Source/AutoActions/Controls/{2_DefaultControls.xaml => 1_DefaultControls.xaml} (96%)
 rename Source/AutoActions/Controls/{3_CustomComboBox.xaml => 2_CustomComboBox.xaml} (98%)
 create mode 100644 Source/AutoActions/Theming/DarkColors.xaml
 create mode 100644 Source/AutoActions/Theming/ThemeSetting.cs

diff --git a/Source/AutoActions.ProjectResources/ProjectLocales.Designer.cs b/Source/AutoActions.ProjectResources/ProjectLocales.Designer.cs
index 225a533..a8fd9b3 100644
--- a/Source/AutoActions.ProjectResources/ProjectLocales.Designer.cs
+++ b/Source/AutoActions.ProjectResources/ProjectLocales.Designer.cs
@@ -402,7 +402,16 @@ public static string ColorDepth {
                 return ResourceManager.GetString("ColorDepth", resourceCulture);
             }
         }
-        
+
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Theme ähnelt.
+        /// </summary>
+        public static string Theme {
+            get {
+                return ResourceManager.GetString("Theme", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die 10-Bit ähnelt.
         /// </summary>
diff --git a/Source/AutoActions.ProjectResources/ProjectLocales.de.resx b/Source/AutoActions.ProjectResources/ProjectLocales.de.resx
index e100045..f6ec053 100644
--- a/Source/AutoActions.ProjectResources/ProjectLocales.de.resx
+++ b/Source/AutoActions.ProjectResources/ProjectLocales.de.resx
@@ -207,6 +207,18 @@
   <data name="CheckForNewVersion" xml:space="preserve">
     <value>Beim Start auf neuere Version prüfen</value>
   </data>
+  <data name="Theme" xml:space="preserve">
+    <value>Design</value>
+  </data>
+  <data name="ThemeSetting.System" xml:space="preserve">
+    <value>Automatisch</value>
+  </data>
+  <data name="ThemeSetting.Light" xml:space="preserve">
+    <value>Hell</value>
+  </data>
+  <data name="ThemeSetting.Dark" xml:space="preserve">
+    <value>Dunkel</value>
+  </data>
   <data name="ChooseApplication" xml:space="preserve">
     <value>Anwendungen wählen</value>
   </data>
diff --git a/Source/AutoActions.ProjectResources/ProjectLocales.resx b/Source/AutoActions.ProjectResources/ProjectLocales.resx
index 1d4e8df..3da512f 100644
--- a/Source/AutoActions.ProjectResources/ProjectLocales.resx
+++ b/Source/AutoActions.ProjectResources/ProjectLocales.resx
@@ -217,6 +217,18 @@
   <data name="CheckForNewVersion" xml:space="preserve">
     <value>Check for new version on startup</value>
   </data>
+  <data name="Theme" xml:space="preserve">
+    <value>Theme</value>
+  </data>
+  <data name="ThemeSetting.System" xml:space="preserve">
+    <value>Auto</value>
+  </data>
+  <data name="ThemeSetting.Light" xml:space="preserve">
+    <value>Light</value>
+  </data>
+  <data name="ThemeSetting.Dark" xml:space="preserve">
+    <value>Dark</value>
+  </data>
   <data name="ChooseApplication" xml:space="preserve">
     <value>Choose application</value>
   </data>
diff --git a/Source/AutoActions/App.xaml b/Source/AutoActions/App.xaml
index c8c1e11..a74f5c5 100644
--- a/Source/AutoActions/App.xaml
+++ b/Source/AutoActions/App.xaml
@@ -19,6 +19,8 @@
         <ResourceDictionary>
 
             <ResourceDictionary.MergedDictionaries>
+                <thm:ThemeResourceDirectory LightResource="/AutoActions;component/Theming/LightColors.xaml"
+                                            DarkResource="/AutoActions;component/Theming/DarkColors.xaml"/>
                 <ResourceDictionary Source="Controls\AppResources.xaml"/>
             </ResourceDictionary.MergedDictionaries>
 
@@ -49,7 +51,7 @@
                                 </DataTrigger>
 
                                 <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}" Value="False" >
-                                    <Setter  TargetName="HeaderContent" Property="Foreground" Value="Black"/>
+                                    <Setter  TargetName="HeaderContent" Property="Foreground" Value="{StaticResource TextForegroundBrush}"/>
                                     <Setter TargetName="HeaderContent" Property="FontSize" Value="{StaticResource DefaultFontSize}"/>
 
                                 </DataTrigger>
diff --git a/Source/AutoActions/App.xaml.cs b/Source/AutoActions/App.xaml.cs
index b689eb1..1a0f5e1 100644
--- a/Source/AutoActions/App.xaml.cs
+++ b/Source/AutoActions/App.xaml.cs
@@ -30,8 +30,10 @@ public static void Main()
             if (mutex.WaitOne(TimeSpan.Zero, true))
             {
                 var application = new App();
-                application.InitializeComponent();
+                // Resolve the theme before InitializeComponent() so App.xaml merges the matching palette.
                 Globals.Instance.LoadSettings();
+                Theme = ResolveTheme(Globals.Instance.Settings.ThemeSetting);
+                application.InitializeComponent();
                 application.Run();
             }
             else
@@ -43,11 +45,34 @@ public static void Main()
         protected override void OnStartup(StartupEventArgs e)
         {
             base.OnStartup(e);
+            // Dark theme: darken the native title bar of every window (main, dialogs, splash) as it loads.
+            if (App.Theme == Theme.Dark)
+                EventManager.RegisterClassHandler(typeof(Window), Window.LoadedEvent, new RoutedEventHandler(OnAnyWindowLoaded));
             Views.AutoActionsMainView mainView = new Views.AutoActionsMainView();
             if (!Globals.Instance.Settings.StartMinimizedToTray)
                 mainView.Show();
         }
 
+        private static void OnAnyWindowLoaded(object sender, RoutedEventArgs e)
+        {
+            if (sender is Window window)
+                WinAPIFunctions.SetWindowDarkMode(window, true);
+        }
+
+        private static Theme ResolveTheme(ThemeSetting setting)
+        {
+            switch (setting)
+            {
+                case ThemeSetting.Light:
+                    return Theme.Light;
+                case ThemeSetting.Dark:
+                    return Theme.Dark;
+                default:
+                    return AutoActions.Windows.UI.GetWindowsTheme() == AutoActions.Windows.WindowsTheme.Dark
+                        ? Theme.Dark : Theme.Light;
+            }
+        }
+
         protected override void OnExit(ExitEventArgs e)
         {
             if (mutex.WaitOne(TimeSpan.Zero, true))
diff --git a/Source/AutoActions/AutoActions.csproj b/Source/AutoActions/AutoActions.csproj
index eb92c32..05e1fc1 100644
--- a/Source/AutoActions/AutoActions.csproj
+++ b/Source/AutoActions/AutoActions.csproj
@@ -302,6 +302,7 @@
     <Compile Include="Profiles\Actions\ReferenceProfileAction.cs" />
     <Compile Include="Theming\ThemeResourceDirectory.cs" />
     <Compile Include="Theming\Theme.cs" />
+    <Compile Include="Theming\ThemeSetting.cs" />
     <Compile Include="UserAppSettings.cs" />
     <Compile Include="UWP\WWAHostHandler.cs" />
     <Compile Include="Views\StatusView.xaml.cs">
@@ -382,19 +383,15 @@
     <Compile Include="UWP\AppxManifest.cs" />
     <Compile Include="UWP\UWPAppsManager.cs" />
     <Compile Include="UWP\UWPApp.cs" />
-    <Page Include="Controls\1_Colors.xaml">
-      <SubType>Designer</SubType>
-      <Generator>XamlIntelliSenseFileGenerator</Generator>
-    </Page>
     <Page Include="Controls\AppResources.xaml">
       <Generator>XamlIntelliSenseFileGenerator</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Controls\2_DefaultControls.xaml">
+    <Page Include="Controls\1_DefaultControls.xaml">
       <SubType>Designer</SubType>
       <Generator>XamlIntelliSenseFileGenerator</Generator>
     </Page>
-    <Page Include="Controls\3_CustomComboBox.xaml">
+    <Page Include="Controls\2_CustomComboBox.xaml">
       <SubType>Designer</SubType>
       <Generator>XamlIntelliSenseFileGenerator</Generator>
     </Page>
@@ -402,6 +399,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Theming\DarkColors.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\StatusView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/Source/AutoActions/Controls/1_Colors.xaml b/Source/AutoActions/Controls/1_Colors.xaml
deleted file mode 100644
index 3a2f2e9..0000000
--- a/Source/AutoActions/Controls/1_Colors.xaml
+++ /dev/null
@@ -1,40 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Color x:Key="ActiveColor">#2ac987</Color>
-    <Color x:Key="AccentColor">#ff6666</Color>
-    <Color x:Key="ControlMouseOverColor">#fa8e8e</Color>
-    <Color x:Key="ControlPressedColor">#e36b6b</Color>
-
-    <Color x:Key="WindowColor">White</Color>
-    <Color x:Key="SelectedBackgroundColor">#fca9a9</Color>
-    <Color x:Key="SelectedUnfocusedColor">#FFDDDDDD</Color>
-    <Color x:Key="ControlLightColor">White</Color>
-    <Color x:Key="ControlMediumColor">#FFCCCCCC</Color>
-    <Color x:Key="IconBackgroundColor">#d4d4d4</Color>
-    <Color x:Key="GlyphColor">#FF444444</Color>
-    <Color x:Key="DisabledForegroundColor">#cfcfcf</Color>
-    <Color x:Key="DisabledControlDarkColor">#8A8A8A</Color>
-
-    <Color x:Key="DisabledBorderColor">#adadad</Color>
-    <SolidColorBrush x:Key="WindowBackgroundBrush" Color="{StaticResource WindowColor}"/>
-    <SolidColorBrush x:Key="ButtonForegroundBrush"  Color="{StaticResource WindowColor}"/>
-    <SolidColorBrush x:Key="ActiveBrush"  Color="{StaticResource ActiveColor}"/>
-    <SolidColorBrush x:Key="AccentBrush"  Color="{StaticResource AccentColor}"/>
-    <SolidColorBrush x:Key="HighlightedBrush"  Color="{StaticResource SelectedBackgroundColor}"/>
-    <SolidColorBrush x:Key="MouseOverBrush"  Color="{StaticResource ControlMouseOverColor}"/>
-    <SolidColorBrush x:Key="ControlLightBrush"  Color="{StaticResource ControlLightColor}"/>
-    <SolidColorBrush x:Key="GlyphBrush"  Color="{StaticResource GlyphColor}"/>
-    <SolidColorBrush x:Key="IconBackgroundBrush"  Color="{StaticResource IconBackgroundColor}"/>
-
-
-    <SolidColorBrush x:Key="InactiveAccentBrush">#ad7b7b</SolidColorBrush>
-    <SolidColorBrush x:Key="DragScrollBrush">#757575</SolidColorBrush>
-    <SolidColorBrush x:Key="ScrollBrush">#969696</SolidColorBrush>
-    <SolidColorBrush x:Key="MouseOverScrollBrush">#a1a1a1</SolidColorBrush>
-
-    <SolidColorBrush x:Key="DisabledAccentBrush" Color="{StaticResource DisabledControlDarkColor}"/>
-    <SolidColorBrush x:Key="HighlightedInactiveAccentBrush" Color="#95bfdb"/>
-    <StaticResource x:Key="ButtonBackgroundBrush"  ResourceKey="AccentBrush"/>
-
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Source/AutoActions/Controls/2_DefaultControls.xaml b/Source/AutoActions/Controls/1_DefaultControls.xaml
similarity index 96%
rename from Source/AutoActions/Controls/2_DefaultControls.xaml
rename to Source/AutoActions/Controls/1_DefaultControls.xaml
index f3328d7..8742a36 100644
--- a/Source/AutoActions/Controls/2_DefaultControls.xaml
+++ b/Source/AutoActions/Controls/1_DefaultControls.xaml
@@ -51,18 +51,18 @@
     </Style>
     <Style x:Key="DefaultTextBlock" TargetType="TextBlock">
         <Setter Property="FontSize" Value="{StaticResource DefaultFontSize}" />
-        <Setter Property="Foreground" Value="Black"/>
+        <Setter Property="Foreground" Value="{StaticResource TextForegroundBrush}"/>
         <Setter Property="Margin" Value="5"/>
 
     </Style>
     <Style x:Key="TitleTextBlock" TargetType="TextBlock" BasedOn="{StaticResource DefaultTextBlock}">
         <Setter Property="FontSize" Value="25"/>
-        <Setter Property="Foreground" Value="Black"/>
+        <Setter Property="Foreground" Value="{StaticResource TextForegroundBrush}"/>
         <Setter Property="FontWeight" Value="Bold"/>
     </Style>
     <Style x:Key="SubTitleTextBlock" TargetType="TextBlock" BasedOn="{StaticResource DefaultTextBlock}">
         <Setter Property="FontSize" Value="20"/>
-        <Setter Property="Foreground" Value="Black"/>
+        <Setter Property="Foreground" Value="{StaticResource TextForegroundBrush}"/>
         <Setter Property="FontWeight" Value="DemiBold"/>
     </Style>
     <Style x:Key="ToggleStatus"  TargetType="{x:Type CheckBox}">
@@ -83,7 +83,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type CheckBox}">
-                    <Ellipse Fill="{TemplateBinding Background}" HorizontalAlignment="Stretch"   Stroke="Black" VerticalAlignment="Stretch" />
+                    <Ellipse Fill="{TemplateBinding Background}" HorizontalAlignment="Stretch"   Stroke="{StaticResource GlyphBrush}" VerticalAlignment="Stretch" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -99,12 +99,14 @@
     </Style>
     <Style x:Key="DefaultUserControl" TargetType="UserControl">
         <Setter Property="Background" Value="{StaticResource WindowBackgroundBrush}"/>
-        <Setter Property="Foreground" Value="Black"/>
+        <Setter Property="Foreground" Value="{StaticResource TextForegroundBrush}"/>
 
     </Style>
     <Style TargetType="UserControl" BasedOn="{StaticResource DefaultUserControl}"/>
     <Style x:Key="DefaultTextBox" TargetType="TextBox" >
         <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Background" Value="{StaticResource ControlLightBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource TextForegroundBrush}"/>
 		<Setter Property="FontSize" Value="{StaticResource DefaultFontSize}"/>
 		<Setter Property="FontWeight" Value="Normal" />
 		<Setter Property="Template">
diff --git a/Source/AutoActions/Controls/3_CustomComboBox.xaml b/Source/AutoActions/Controls/2_CustomComboBox.xaml
similarity index 98%
rename from Source/AutoActions/Controls/3_CustomComboBox.xaml
rename to Source/AutoActions/Controls/2_CustomComboBox.xaml
index 55f0cdc..3946fcf 100644
--- a/Source/AutoActions/Controls/3_CustomComboBox.xaml
+++ b/Source/AutoActions/Controls/2_CustomComboBox.xaml
@@ -56,7 +56,7 @@
         <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
         <Setter Property="MinWidth" Value="120"/>
         <Setter Property="MinHeight" Value="20"/>
-        <Setter Property="Foreground" Value="Black"/>
+        <Setter Property="Foreground" Value="{StaticResource TextForegroundBrush}"/>
 		<Setter Property="FontWeight" Value="DemiBold"/>
 		<Setter Property="FontSize" Value="{StaticResource DefaultFontSize}" />
         <Setter Property="Template">
@@ -136,7 +136,7 @@
 
     <Style x:Key="{x:Type ComboBoxItem}" TargetType="{x:Type ComboBoxItem}">
         <Setter Property="SnapsToDevicePixels" Value="true"/>
-        <Setter Property="Foreground" Value="Black"/>
+        <Setter Property="Foreground" Value="{StaticResource TextForegroundBrush}"/>
         <Setter Property="OverridesDefaultStyle" Value="true"/>
         <Setter Property="Template">
             <Setter.Value>
diff --git a/Source/AutoActions/Controls/AppResources.xaml b/Source/AutoActions/Controls/AppResources.xaml
index 1cdbe1e..c6fc09b 100644
--- a/Source/AutoActions/Controls/AppResources.xaml
+++ b/Source/AutoActions/Controls/AppResources.xaml
@@ -2,39 +2,7 @@
   <!--This is an auto-generated file. Do not change by yourself since it's overridden with each build-->
   <!---->
   <!---->
-  <!--Merged from file 1_Colors.xaml-->
-  <Color x:Key="ActiveColor">#2ac987</Color>
-  <Color x:Key="AccentColor">#ff6666</Color>
-  <Color x:Key="ControlMouseOverColor">#fa8e8e</Color>
-  <Color x:Key="ControlPressedColor">#e36b6b</Color>
-  <Color x:Key="WindowColor">White</Color>
-  <Color x:Key="SelectedBackgroundColor">#fca9a9</Color>
-  <Color x:Key="SelectedUnfocusedColor">#FFDDDDDD</Color>
-  <Color x:Key="ControlLightColor">White</Color>
-  <Color x:Key="ControlMediumColor">#FFCCCCCC</Color>
-  <Color x:Key="IconBackgroundColor">#d4d4d4</Color>
-  <Color x:Key="GlyphColor">#FF444444</Color>
-  <Color x:Key="DisabledForegroundColor">#cfcfcf</Color>
-  <Color x:Key="DisabledControlDarkColor">#8A8A8A</Color>
-  <Color x:Key="DisabledBorderColor">#adadad</Color>
-  <SolidColorBrush x:Key="WindowBackgroundBrush" Color="{StaticResource WindowColor}" />
-  <SolidColorBrush x:Key="ButtonForegroundBrush" Color="{StaticResource WindowColor}" />
-  <SolidColorBrush x:Key="ActiveBrush" Color="{StaticResource ActiveColor}" />
-  <SolidColorBrush x:Key="AccentBrush" Color="{StaticResource AccentColor}" />
-  <SolidColorBrush x:Key="HighlightedBrush" Color="{StaticResource SelectedBackgroundColor}" />
-  <SolidColorBrush x:Key="MouseOverBrush" Color="{StaticResource ControlMouseOverColor}" />
-  <SolidColorBrush x:Key="ControlLightBrush" Color="{StaticResource ControlLightColor}" />
-  <SolidColorBrush x:Key="GlyphBrush" Color="{StaticResource GlyphColor}" />
-  <SolidColorBrush x:Key="IconBackgroundBrush" Color="{StaticResource IconBackgroundColor}" />
-  <SolidColorBrush x:Key="InactiveAccentBrush">#ad7b7b</SolidColorBrush>
-  <SolidColorBrush x:Key="DragScrollBrush">#757575</SolidColorBrush>
-  <SolidColorBrush x:Key="ScrollBrush">#969696</SolidColorBrush>
-  <SolidColorBrush x:Key="MouseOverScrollBrush">#a1a1a1</SolidColorBrush>
-  <SolidColorBrush x:Key="DisabledAccentBrush" Color="{StaticResource DisabledControlDarkColor}" />
-  <SolidColorBrush x:Key="HighlightedInactiveAccentBrush" Color="#95bfdb" />
-  <StaticResource x:Key="ButtonBackgroundBrush" ResourceKey="AccentBrush" />
-  <!---->
-  <!--Merged from file 2_DefaultControls.xaml-->
+  <!--Merged from file 1_DefaultControls.xaml-->
   <system:Double x:Key="DefaultFontSize">15</system:Double>
   <system:Double x:Key="DefaultRadius">7.5</system:Double>
   <CornerRadius x:Key="DefaultCornerRadius">7.5</CornerRadius>
@@ -77,17 +45,17 @@
   </Style>
   <Style x:Key="DefaultTextBlock" TargetType="TextBlock">
     <Setter Property="FontSize" Value="{StaticResource DefaultFontSize}" />
-    <Setter Property="Foreground" Value="Black" />
+    <Setter Property="Foreground" Value="{StaticResource TextForegroundBrush}" />
     <Setter Property="Margin" Value="5" />
   </Style>
   <Style x:Key="TitleTextBlock" TargetType="TextBlock" BasedOn="{StaticResource DefaultTextBlock}">
     <Setter Property="FontSize" Value="25" />
-    <Setter Property="Foreground" Value="Black" />
+    <Setter Property="Foreground" Value="{StaticResource TextForegroundBrush}" />
     <Setter Property="FontWeight" Value="Bold" />
   </Style>
   <Style x:Key="SubTitleTextBlock" TargetType="TextBlock" BasedOn="{StaticResource DefaultTextBlock}">
     <Setter Property="FontSize" Value="20" />
-    <Setter Property="Foreground" Value="Black" />
+    <Setter Property="Foreground" Value="{StaticResource TextForegroundBrush}" />
     <Setter Property="FontWeight" Value="DemiBold" />
   </Style>
   <Style x:Key="ToggleStatus" TargetType="{x:Type CheckBox}">
@@ -100,7 +68,7 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type CheckBox}">
-          <Ellipse Fill="{TemplateBinding Background}" HorizontalAlignment="Stretch" Stroke="Black" VerticalAlignment="Stretch" />
+          <Ellipse Fill="{TemplateBinding Background}" HorizontalAlignment="Stretch" Stroke="{StaticResource GlyphBrush}" VerticalAlignment="Stretch" />
         </ControlTemplate>
       </Setter.Value>
     </Setter>
@@ -115,11 +83,13 @@
   </Style>
   <Style x:Key="DefaultUserControl" TargetType="UserControl">
     <Setter Property="Background" Value="{StaticResource WindowBackgroundBrush}" />
-    <Setter Property="Foreground" Value="Black" />
+    <Setter Property="Foreground" Value="{StaticResource TextForegroundBrush}" />
   </Style>
   <Style TargetType="UserControl" BasedOn="{StaticResource DefaultUserControl}" />
   <Style x:Key="DefaultTextBox" TargetType="TextBox">
     <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Background" Value="{StaticResource ControlLightBrush}" />
+    <Setter Property="Foreground" Value="{StaticResource TextForegroundBrush}" />
     <Setter Property="FontSize" Value="{StaticResource DefaultFontSize}" />
     <Setter Property="FontWeight" Value="Normal" />
     <Setter Property="Template">
@@ -285,7 +255,7 @@
   </Style>
   <Style TargetType="CheckBox" BasedOn="{StaticResource DefaultCheckBox}" />
   <!---->
-  <!--Merged from file 3_CustomComboBox.xaml-->
+  <!--Merged from file 2_CustomComboBox.xaml-->
   <ControlTemplate x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
     <Grid>
       <Grid.ColumnDefinitions>
@@ -322,7 +292,7 @@
     <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
     <Setter Property="MinWidth" Value="120" />
     <Setter Property="MinHeight" Value="20" />
-    <Setter Property="Foreground" Value="Black" />
+    <Setter Property="Foreground" Value="{StaticResource TextForegroundBrush}" />
     <Setter Property="FontWeight" Value="DemiBold" />
     <Setter Property="FontSize" Value="{StaticResource DefaultFontSize}" />
     <Setter Property="Template">
@@ -367,7 +337,7 @@
   </Style>
   <Style x:Key="{x:Type ComboBoxItem}" TargetType="{x:Type ComboBoxItem}">
     <Setter Property="SnapsToDevicePixels" Value="true" />
-    <Setter Property="Foreground" Value="Black" />
+    <Setter Property="Foreground" Value="{StaticResource TextForegroundBrush}" />
     <Setter Property="OverridesDefaultStyle" Value="true" />
     <Setter Property="Template">
       <Setter.Value>
diff --git a/Source/AutoActions/Theming/DarkColors.xaml b/Source/AutoActions/Theming/DarkColors.xaml
new file mode 100644
index 0000000..d27eac9
--- /dev/null
+++ b/Source/AutoActions/Theming/DarkColors.xaml
@@ -0,0 +1,43 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Dark theme palette. Keep in sync (same keys) with LightColors.xaml. -->
+
+    <Color x:Key="ActiveColor">#2ac987</Color>
+    <Color x:Key="AccentColor">#ff6666</Color>
+    <Color x:Key="ControlMouseOverColor">#fa8e8e</Color>
+    <Color x:Key="ControlPressedColor">#e36b6b</Color>
+    <!-- Selection highlight: matched to the mouse-over salmon for better contrast with light text on dark. -->
+    <Color x:Key="SelectedBackgroundColor">#fa8e8e</Color>
+    <Color x:Key="SelectedUnfocusedColor">#FFDDDDDD</Color>
+    <Color x:Key="ControlMediumColor">#FFCCCCCC</Color>
+    <Color x:Key="DisabledForegroundColor">#cfcfcf</Color>
+    <Color x:Key="DisabledControlDarkColor">#8A8A8A</Color>
+    <Color x:Key="DisabledBorderColor">#adadad</Color>
+
+    <Color x:Key="WindowColor">#202020</Color>
+    <Color x:Key="ControlLightColor">#2D2D2D</Color>
+    <Color x:Key="IconBackgroundColor">#3A3A3A</Color>
+    <Color x:Key="GlyphColor">#C8C8C8</Color>
+    <Color x:Key="TextForegroundColor">#F0F0F0</Color>
+
+    <SolidColorBrush x:Key="WindowBackgroundBrush" Color="{StaticResource WindowColor}"/>
+    <SolidColorBrush x:Key="ButtonForegroundBrush" Color="White"/>
+    <SolidColorBrush x:Key="TextForegroundBrush" Color="{StaticResource TextForegroundColor}"/>
+    <SolidColorBrush x:Key="ActiveBrush" Color="{StaticResource ActiveColor}"/>
+    <SolidColorBrush x:Key="AccentBrush" Color="{StaticResource AccentColor}"/>
+    <SolidColorBrush x:Key="HighlightedBrush" Color="{StaticResource SelectedBackgroundColor}"/>
+    <SolidColorBrush x:Key="MouseOverBrush" Color="{StaticResource ControlMouseOverColor}"/>
+    <SolidColorBrush x:Key="ControlLightBrush" Color="{StaticResource ControlLightColor}"/>
+    <SolidColorBrush x:Key="GlyphBrush" Color="{StaticResource GlyphColor}"/>
+    <SolidColorBrush x:Key="IconBackgroundBrush" Color="{StaticResource IconBackgroundColor}"/>
+
+    <SolidColorBrush x:Key="InactiveAccentBrush">#ad7b7b</SolidColorBrush>
+    <SolidColorBrush x:Key="DragScrollBrush">#757575</SolidColorBrush>
+    <SolidColorBrush x:Key="ScrollBrush">#969696</SolidColorBrush>
+    <SolidColorBrush x:Key="MouseOverScrollBrush">#a1a1a1</SolidColorBrush>
+
+    <SolidColorBrush x:Key="DisabledAccentBrush" Color="{StaticResource DisabledControlDarkColor}"/>
+    <SolidColorBrush x:Key="HighlightedInactiveAccentBrush" Color="#95bfdb"/>
+    <StaticResource x:Key="ButtonBackgroundBrush" ResourceKey="AccentBrush"/>
+
+</ResourceDictionary>
diff --git a/Source/AutoActions/Theming/LightColors.xaml b/Source/AutoActions/Theming/LightColors.xaml
index 1746787..fe5926e 100644
--- a/Source/AutoActions/Theming/LightColors.xaml
+++ b/Source/AutoActions/Theming/LightColors.xaml
@@ -1,16 +1,42 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Light theme palette. Keep in sync (same keys) with DarkColors.xaml. -->
+
     <Color x:Key="ActiveColor">#2ac987</Color>
     <Color x:Key="AccentColor">#ff6666</Color>
-
     <Color x:Key="ControlMouseOverColor">#fa8e8e</Color>
     <Color x:Key="ControlPressedColor">#e36b6b</Color>
-
-    <Color x:Key="WindowColor">White</Color>
     <Color x:Key="SelectedBackgroundColor">#fca9a9</Color>
     <Color x:Key="SelectedUnfocusedColor">#FFDDDDDD</Color>
-    <Color x:Key="ControlLightColor">White</Color>
     <Color x:Key="ControlMediumColor">#FFCCCCCC</Color>
+    <Color x:Key="DisabledForegroundColor">#cfcfcf</Color>
+    <Color x:Key="DisabledControlDarkColor">#8A8A8A</Color>
+    <Color x:Key="DisabledBorderColor">#adadad</Color>
+
+    <Color x:Key="WindowColor">White</Color>
+    <Color x:Key="ControlLightColor">White</Color>
+    <Color x:Key="IconBackgroundColor">#d4d4d4</Color>
     <Color x:Key="GlyphColor">#FF444444</Color>
-    <Color x:Key="DisabledBorderDarkColor">#FF888888</Color>
-</ResourceDictionary>
\ No newline at end of file
+    <Color x:Key="TextForegroundColor">#000000</Color>
+
+    <SolidColorBrush x:Key="WindowBackgroundBrush" Color="{StaticResource WindowColor}"/>
+    <SolidColorBrush x:Key="ButtonForegroundBrush" Color="White"/>
+    <SolidColorBrush x:Key="TextForegroundBrush" Color="{StaticResource TextForegroundColor}"/>
+    <SolidColorBrush x:Key="ActiveBrush" Color="{StaticResource ActiveColor}"/>
+    <SolidColorBrush x:Key="AccentBrush" Color="{StaticResource AccentColor}"/>
+    <SolidColorBrush x:Key="HighlightedBrush" Color="{StaticResource SelectedBackgroundColor}"/>
+    <SolidColorBrush x:Key="MouseOverBrush" Color="{StaticResource ControlMouseOverColor}"/>
+    <SolidColorBrush x:Key="ControlLightBrush" Color="{StaticResource ControlLightColor}"/>
+    <SolidColorBrush x:Key="GlyphBrush" Color="{StaticResource GlyphColor}"/>
+    <SolidColorBrush x:Key="IconBackgroundBrush" Color="{StaticResource IconBackgroundColor}"/>
+
+    <SolidColorBrush x:Key="InactiveAccentBrush">#ad7b7b</SolidColorBrush>
+    <SolidColorBrush x:Key="DragScrollBrush">#757575</SolidColorBrush>
+    <SolidColorBrush x:Key="ScrollBrush">#969696</SolidColorBrush>
+    <SolidColorBrush x:Key="MouseOverScrollBrush">#a1a1a1</SolidColorBrush>
+
+    <SolidColorBrush x:Key="DisabledAccentBrush" Color="{StaticResource DisabledControlDarkColor}"/>
+    <SolidColorBrush x:Key="HighlightedInactiveAccentBrush" Color="#95bfdb"/>
+    <StaticResource x:Key="ButtonBackgroundBrush" ResourceKey="AccentBrush"/>
+
+</ResourceDictionary>
diff --git a/Source/AutoActions/Theming/ThemeResourceDirectory.cs b/Source/AutoActions/Theming/ThemeResourceDirectory.cs
index a794882..d14eb7c 100644
--- a/Source/AutoActions/Theming/ThemeResourceDirectory.cs
+++ b/Source/AutoActions/Theming/ThemeResourceDirectory.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Windows.UI.Xaml;
+using System.Windows;
 
 namespace AutoActions.Theming
 {
diff --git a/Source/AutoActions/Theming/ThemeSetting.cs b/Source/AutoActions/Theming/ThemeSetting.cs
new file mode 100644
index 0000000..605ba92
--- /dev/null
+++ b/Source/AutoActions/Theming/ThemeSetting.cs
@@ -0,0 +1,9 @@
+namespace AutoActions.Theming
+{
+    public enum ThemeSetting
+    {
+        System, // shown as "Auto"; resolved to the OS theme at startup
+        Light,
+        Dark
+    }
+}
diff --git a/Source/AutoActions/UserAppSettings.cs b/Source/AutoActions/UserAppSettings.cs
index 2a4c4df..00048d1 100644
--- a/Source/AutoActions/UserAppSettings.cs
+++ b/Source/AutoActions/UserAppSettings.cs
@@ -1,10 +1,12 @@
 using AutoActions.Displays;
 using AutoActions.Profiles;
 using AutoActions.Profiles.Actions;
+using AutoActions.Theming;
 using CodectoryCore;
 using CodectoryCore.UI.Wpf;
 using Newtonsoft.Json;
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
@@ -27,6 +29,7 @@ public class UserAppSettings : BaseViewModel
         private bool _checkForNewVersion = true;
         private bool _hideSplashScreenOnStartup = false;
         private bool _hideSplashScreenOnAutoUpdate = false;
+        private ThemeSetting _themeSetting = ThemeSetting.System;
 
         readonly object _audioDevicesLock = new object();
         private Guid _defaultProfileGuid = Guid.Empty;
@@ -73,6 +76,16 @@ public class UserAppSettings : BaseViewModel
         [JsonProperty]
         public bool CheckForNewVersion { get => _checkForNewVersion; set { _checkForNewVersion = value; OnPropertyChanged(); } }
 
+        [JsonProperty]
+        public ThemeSetting ThemeSetting
+        {
+            get => _themeSetting;
+            // Applied at next startup, so persist immediately (SaveSettings is a no-op until load finishes).
+            set { _themeSetting = value; OnPropertyChanged(); Globals.Instance.SaveSettings(); }
+        }
+
+        public IEnumerable<ThemeSetting> ThemeSettingValues => Enum.GetValues(typeof(ThemeSetting)).Cast<ThemeSetting>();
+
 
         [JsonProperty(Order = 2)]
         public SortableObservableCollection<ApplicationProfileAssignment> ApplicationProfileAssignments { get => _applicationProfileAssignments; set { _applicationProfileAssignments = value; OnPropertyChanged(); } }
diff --git a/Source/AutoActions/Views/ActionShortcutManagerView.xaml b/Source/AutoActions/Views/ActionShortcutManagerView.xaml
index 41f6ff7..dbd531a 100644
--- a/Source/AutoActions/Views/ActionShortcutManagerView.xaml
+++ b/Source/AutoActions/Views/ActionShortcutManagerView.xaml
@@ -66,7 +66,7 @@
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
             <Button Width="50" Margin="10" Style="{StaticResource AddActionButton}" Grid.Row="0" Grid.Column="0" Command="{Binding AddActionShortcutCommand }" VerticalAlignment="Top" HorizontalAlignment="Left" />
-            <ListView  Grid.ColumnSpan="3" Grid.Row="1" BorderThickness="0" Margin="5" ItemContainerStyle="{StaticResource ListBoxItemStyle}" x:Name="ActionsList"   ItemsPanel="{StaticResource WrapPanelTemplate}" ItemsSource="{Binding ActionShortcuts}"  ItemTemplate="{StaticResource ActionShortcutItemTemplate}" ScrollViewer.HorizontalScrollBarVisibility="Disabled"/>
+            <ListView  Grid.ColumnSpan="3" Grid.Row="1" Background="Transparent" BorderThickness="0" Margin="5" ItemContainerStyle="{StaticResource ListBoxItemStyle}" x:Name="ActionsList"   ItemsPanel="{StaticResource WrapPanelTemplate}" ItemsSource="{Binding ActionShortcuts}"  ItemTemplate="{StaticResource ActionShortcutItemTemplate}" ScrollViewer.HorizontalScrollBarVisibility="Disabled"/>
         </Grid>
 
 
diff --git a/Source/AutoActions/Views/ApplicationAdderView.xaml b/Source/AutoActions/Views/ApplicationAdderView.xaml
index 2d93a44..bf3c8b0 100644
--- a/Source/AutoActions/Views/ApplicationAdderView.xaml
+++ b/Source/AutoActions/Views/ApplicationAdderView.xaml
@@ -8,7 +8,7 @@
         xmlns:pres="clr-namespace:AutoActions.ProjectResources;assembly=AutoActions.ProjectResources"
         mc:Ignorable="d"
         d:DataContext="{d:DesignInstance Type=root:ApplicationAdder, IsDesignTimeCreatable=False}"
-          MinWidth="414">
+          MinWidth="414" Background="{StaticResource WindowBackgroundBrush}" Foreground="{StaticResource TextForegroundBrush}">
 
     <Grid Margin="5">
         <Grid.RowDefinitions>
diff --git a/Source/AutoActions/Views/AutoActionsInfoView.xaml b/Source/AutoActions/Views/AutoActionsInfoView.xaml
index 1041014..97ff643 100644
--- a/Source/AutoActions/Views/AutoActionsInfoView.xaml
+++ b/Source/AutoActions/Views/AutoActionsInfoView.xaml
@@ -8,7 +8,7 @@
              xmlns:info="clr-namespace:AutoActions.Info"
              xmlns:local="clr-namespace:AutoActions.Views"
              d:DataContext="{d:DesignInstance Type=info:AutoActionsInfo, IsDesignTimeCreatable=False}"
-             mc:Ignorable="d" MinWidth="300" MinHeight="600" >
+             mc:Ignorable="d" MinWidth="300" MinHeight="600" Background="{StaticResource WindowBackgroundBrush}" Foreground="{StaticResource TextForegroundBrush}" >
 
     <i:Interaction.Triggers>
         <i:EventTrigger EventName="Loaded">
diff --git a/Source/AutoActions/Views/AutoActionsLicenseView.xaml b/Source/AutoActions/Views/AutoActionsLicenseView.xaml
index d6acbcc..5380273 100644
--- a/Source/AutoActions/Views/AutoActionsLicenseView.xaml
+++ b/Source/AutoActions/Views/AutoActionsLicenseView.xaml
@@ -7,7 +7,7 @@
              xmlns:pres="clr-namespace:AutoActions.ProjectResources;assembly=AutoActions.ProjectResources"
              xmlns:info="clr-namespace:AutoActions.Info"
              xmlns:local="clr-namespace:AutoActions.Views"
-             mc:Ignorable="d" MinWidth="600" MinHeight="600"  >
+             mc:Ignorable="d" MinWidth="600" MinHeight="600" Background="{StaticResource WindowBackgroundBrush}" Foreground="{StaticResource TextForegroundBrush}"  >
 
     <i:Interaction.Triggers>
         <i:EventTrigger EventName="Loaded">
diff --git a/Source/AutoActions/Views/AutoActionsLogsView.xaml b/Source/AutoActions/Views/AutoActionsLogsView.xaml
index e0300f9..9d81bda 100644
--- a/Source/AutoActions/Views/AutoActionsLogsView.xaml
+++ b/Source/AutoActions/Views/AutoActionsLogsView.xaml
@@ -8,7 +8,7 @@
              xmlns:info="clr-namespace:AutoActions.Info"
              xmlns:local="clr-namespace:AutoActions.Views"
              d:DataContext="{d:DesignInstance Type=info:LogsStorage, IsDesignTimeCreatable=False}"
-             mc:Ignorable="d" MinWidth="300" MinHeight="600" Background="White" >
+             mc:Ignorable="d" MinWidth="300" MinHeight="600" Background="{StaticResource WindowBackgroundBrush}" Foreground="{StaticResource TextForegroundBrush}" >
 
     <i:Interaction.Triggers>
         <i:EventTrigger EventName="Loaded">
diff --git a/Source/AutoActions/Views/AutoActionsMainView.xaml b/Source/AutoActions/Views/AutoActionsMainView.xaml
index f705e1e..05fe537 100644
--- a/Source/AutoActions/Views/AutoActionsMainView.xaml
+++ b/Source/AutoActions/Views/AutoActionsMainView.xaml
@@ -12,7 +12,7 @@
         xmlns:local="clr-namespace:AutoActions.Views"
         xmlns:root="clr-namespace:AutoActions"
         mc:Ignorable="d" 
-        Title="AutoActions" Name="MainWindow" MinHeight="480" MinWidth="480" Closing="Window_Closing"  Visibility="{Binding ShowView, Mode=TwoWay, Converter={StaticResource VisibilityBooleanConverter}}"
+        Title="AutoActions" Background="{StaticResource WindowBackgroundBrush}" Foreground="{StaticResource TextForegroundBrush}" Name="MainWindow" MinHeight="480" MinWidth="480" Closing="Window_Closing"  Visibility="{Binding ShowView, Mode=TwoWay, Converter={StaticResource VisibilityBooleanConverter}}"
          Loaded="MainWindow_Loaded">
     <i:Interaction.Triggers>
         <i:EventTrigger EventName="Closing">
@@ -67,7 +67,7 @@
                 <RowDefinition Height="Auto"/>
 
             </Grid.RowDefinitions>
-            <TabControl Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="5" BorderBrush="{StaticResource AccentBrush}"  BorderThickness="0 5 0 0">
+            <TabControl Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="5" Background="{StaticResource WindowBackgroundBrush}" BorderBrush="{StaticResource AccentBrush}"  BorderThickness="0 5 0 0">
                 <TabItem Header="{x:Static pres:ProjectLocales.Status}" HorizontalAlignment="Left" Width="58"  >
                     <local:StatusView DataContext="{Binding}"/>
                 </TabItem>
@@ -223,7 +223,7 @@
                     <RowDefinition Height="*"/>
                 </Grid.RowDefinitions>
 
-                <TextBlock  Text="{Binding Path=Version, Mode=OneWay,  StringFormat= V\{0\} }"  Width="Auto" Margin="5,0"  Grid.Row="1"  Grid.Column="0"  HorizontalAlignment="Left" VerticalAlignment="Center"  />
+                <TextBlock  Text="{Binding Path=Version, Mode=OneWay,  StringFormat= V\{0\} }"  Foreground="{StaticResource TextForegroundBrush}" Width="Auto" Margin="5,0"  Grid.Row="1"  Grid.Column="0"  HorizontalAlignment="Left" VerticalAlignment="Center"  />
 
                 <Button  Grid.Column="1" Padding="0"  Command="{Binding ShowLicenseCommand}" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="{x:Null}" Margin="5,0" HorizontalAlignment="Left" >
                     <Button.Resources>
diff --git a/Source/AutoActions/Views/ProfileActionAdderView.xaml b/Source/AutoActions/Views/ProfileActionAdderView.xaml
index a65b439..d65399a 100644
--- a/Source/AutoActions/Views/ProfileActionAdderView.xaml
+++ b/Source/AutoActions/Views/ProfileActionAdderView.xaml
@@ -9,7 +9,7 @@
              xmlns:prflActns="clr-namespace:AutoActions.Profiles.Actions"
              mc:Ignorable="d"
              d:DataContext="{d:DesignInstance Type=prflActns:ProfileActionAdder, IsDesignTimeCreatable=False}"
-              MinWidth="414"  >
+              MinWidth="414" Background="{StaticResource WindowBackgroundBrush}" Foreground="{StaticResource TextForegroundBrush}"  >
     <UserControl.Resources>
         <DataTemplate DataType="{x:Type prflActns:DisplayAction}">
             <local:DisplayActionView/>
diff --git a/Source/AutoActions/Views/StatusView.xaml b/Source/AutoActions/Views/StatusView.xaml
index ae563be..9074f3f 100644
--- a/Source/AutoActions/Views/StatusView.xaml
+++ b/Source/AutoActions/Views/StatusView.xaml
@@ -91,7 +91,7 @@
         </ScrollViewer>
         <TextBlock Style="{StaticResource SubTitleTextBlock}"   Grid.Row="2" Grid.Column="1" Text="{x:Static pres:ProjectLocales.ActionShortcuts}" Width="Auto" VerticalAlignment="Center" HorizontalAlignment="Left"/>
         <Border Style="{StaticResource DefaultBorder}" Grid.Row="3" Grid.Column="1"  Margin="5"/>
-        <ListView Grid.Row="3" Grid.Column="1" BorderThickness="0" Margin="10" ItemContainerStyle="{StaticResource ListBoxItemStyle}" x:Name="ActionsList"   ItemsPanel="{StaticResource WrapPanelTemplate}" ItemsSource="{Binding Settings.ActionShortcuts}"  ItemTemplate="{StaticResource ActionShortcutItemTemplate}" ScrollViewer.HorizontalScrollBarVisibility="Disabled"/>
+        <ListView Grid.Row="3" Grid.Column="1" Background="Transparent" BorderThickness="0" Margin="10" ItemContainerStyle="{StaticResource ListBoxItemStyle}" x:Name="ActionsList"   ItemsPanel="{StaticResource WrapPanelTemplate}" ItemsSource="{Binding Settings.ActionShortcuts}"  ItemTemplate="{StaticResource ActionShortcutItemTemplate}" ScrollViewer.HorizontalScrollBarVisibility="Disabled"/>
 
         <TextBlock Style="{StaticResource SubTitleTextBlock}"   Grid.Row="0" Grid.Column="1" Text="{x:Static pres:ProjectLocales.Status}" Width="Auto" VerticalAlignment="Center" HorizontalAlignment="Left"/>
         <Border Style="{StaticResource DefaultBorder}" Grid.Row="1" Grid.Column="1"  Margin="5"/>
@@ -132,7 +132,7 @@
             <Border  Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2"  Style="{StaticResource DefaultBorder}"  >
             </Border>
 
-            <ListView Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2"  BorderThickness="0" Margin="5" ItemContainerStyle="{StaticResource ListBoxItemStyle}" ItemsPanel="{StaticResource WrapPanelTemplate}" ItemsSource="{Binding LastActions}"  ItemTemplate="{StaticResource ProfileActionTemplate}" ScrollViewer.HorizontalScrollBarVisibility="Disabled"/>
+            <ListView Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Background="Transparent" BorderThickness="0" Margin="5" ItemContainerStyle="{StaticResource ListBoxItemStyle}" ItemsPanel="{StaticResource WrapPanelTemplate}" ItemsSource="{Binding LastActions}"  ItemTemplate="{StaticResource ProfileActionTemplate}" ScrollViewer.HorizontalScrollBarVisibility="Disabled"/>
         </Grid>
     </Grid>
 </UserControl>
diff --git a/Source/AutoActions/Views/UWPApplicationDialogView.xaml b/Source/AutoActions/Views/UWPApplicationDialogView.xaml
index d3eebad..01e6e45 100644
--- a/Source/AutoActions/Views/UWPApplicationDialogView.xaml
+++ b/Source/AutoActions/Views/UWPApplicationDialogView.xaml
@@ -8,7 +8,7 @@
         xmlns:uwp="clr-namespace:AutoActions.UWP"
         mc:Ignorable="d"
         d:DataContext="{d:DesignInstance Type=uwp:UWPApplicationDialog, IsDesignTimeCreatable=False}"
-         MinWidth="414">
+         MinWidth="414" Background="{StaticResource WindowBackgroundBrush}" Foreground="{StaticResource TextForegroundBrush}">
     <UserControl.Resources>
         <ItemsPanelTemplate x:Key="StackListViewTemplate">
             <StackPanel/>
@@ -38,7 +38,7 @@
             <RowDefinition Height="*"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <ListBox  Grid.Row="0" x:Name="ApplicationList" SelectedItem="{Binding ApplicationItem}" ItemContainerStyle="{StaticResource ListBoxItemStyle}" HorizontalContentAlignment="Stretch" ItemsPanel="{StaticResource StackListViewTemplate}"  ItemTemplate="{StaticResource ApplicationItemTemplate}" ItemsSource="{Binding UWPApplications}" ScrollViewer.VerticalScrollBarVisibility="Auto"   BorderThickness="0" Margin="0,0,0,5"/>
+        <ListBox  Grid.Row="0" x:Name="ApplicationList" Background="Transparent" SelectedItem="{Binding ApplicationItem}" ItemContainerStyle="{StaticResource ListBoxItemStyle}" HorizontalContentAlignment="Stretch" ItemsPanel="{StaticResource StackListViewTemplate}"  ItemTemplate="{StaticResource ApplicationItemTemplate}" ItemsSource="{Binding UWPApplications}" ScrollViewer.VerticalScrollBarVisibility="Auto"   BorderThickness="0" Margin="0,0,0,5"/>
 
         <Grid Grid.Row="1" Height="Auto">
             <Grid.ColumnDefinitions>
diff --git a/Source/AutoActions/Views/UserAppSettingsView.xaml b/Source/AutoActions/Views/UserAppSettingsView.xaml
index 37ff160..dbf3365 100644
--- a/Source/AutoActions/Views/UserAppSettingsView.xaml
+++ b/Source/AutoActions/Views/UserAppSettingsView.xaml
@@ -42,6 +42,7 @@
                     <RowDefinition Height="Auto"/>
                     <RowDefinition Height="Auto"/>
                     <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
                     <RowDefinition Height="*"/>
 
                 </Grid.RowDefinitions>
@@ -50,28 +51,36 @@
                     <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
-                <TextBlock Style="{StaticResource DefaultTextBlock}"    Text="{x:Static pres:ProjectLocales.AutoStart}" Grid.Column="0" Grid.Row="0" Margin="10,4,10,2"  VerticalAlignment="Center"/>
-                <TextBlock Style="{StaticResource DefaultTextBlock}"   Text="{x:Static pres:ProjectLocales.StartToTray}"  Grid.Column="0" Grid.Row="1" Margin="10,3,2,3"  VerticalAlignment="Center"/>
-                <TextBlock Style="{StaticResource DefaultTextBlock}"   Text="{x:Static pres:ProjectLocales.MinimizeToTray}"  Grid.Column="0" Grid.Row="2" Margin="10,3,2,3"  VerticalAlignment="Center"/>
-                <TextBlock Style="{StaticResource DefaultTextBlock}"   Text="{x:Static pres:ProjectLocales.CreateLogFile}"  Grid.Column="0" Grid.Row="3" Margin="10,3,2,3"  VerticalAlignment="Center"/>
-                <TextBlock Style="{StaticResource DefaultTextBlock}"   Text="{x:Static pres:ProjectLocales.CheckForNewVersion}"  Grid.Column="0" Grid.Row="4" Margin="10,3,3,3"  VerticalAlignment="Center"/>
-                <TextBlock Style="{StaticResource DefaultTextBlock}"   Text="{x:Static pres:ProjectLocales.AutoUpdate}"  Grid.Column="0" Grid.Row="5" Margin="10,3,3,3"  VerticalAlignment="Center"/>
-                <TextBlock Style="{StaticResource DefaultTextBlock}"   Text="{x:Static pres:ProjectLocales.HideSplashScreenOnStartup}"  Grid.Column="0" Grid.Row="6" Margin="10,3,3,3"  VerticalAlignment="Center"/>
-                <TextBlock Style="{StaticResource DefaultTextBlock}"   Text="{x:Static pres:ProjectLocales.HideSplashScreenOnUpdate}"  Grid.Column="0" Grid.Row="7" Margin="10,3,3,3"  VerticalAlignment="Center"/>
-                <TextBlock Style="{StaticResource DefaultTextBlock}"   Text="{x:Static pres:ProjectLocales.GlobalAutoHDR}"  Grid.Column="0" Grid.Row="8" Margin="10,3,3,3" HorizontalAlignment="Left"  VerticalAlignment="Center"/>
-                <TextBlock  Style="{StaticResource DefaultTextBlock}"  Text="{x:Static pres:ProjectLocales.DefaultProfile}"  Grid.Column="0" Grid.Row="9" Margin="10,3,3,3" HorizontalAlignment="Left"  VerticalAlignment="Center"/>
+                <TextBlock Style="{StaticResource DefaultTextBlock}"   Text="{x:Static pres:ProjectLocales.Theme}"  Grid.Column="0" Grid.Row="0" Margin="10,3,3,3" HorizontalAlignment="Left"  VerticalAlignment="Center"/>
+                <ComboBox Grid.Column="1" Grid.Row="0" MaxWidth="250" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" ItemsSource="{Binding ThemeSettingValues}" SelectedItem="{Binding ThemeSetting}">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                            <ContentPresenter Content="{Binding Converter={StaticResource EnumLocaleConverter}, ConverterParameter={x:Static pres:ProjectLocales.ResourceManager}}"/>
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
 
-                <CheckBox  IsChecked="{Binding AutoStart}" Grid.Column="1" Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5"/>
-                <CheckBox  IsChecked="{Binding StartMinimizedToTray}" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5"/>
-                <CheckBox  IsChecked="{Binding CloseToTray}" Grid.Column="1" Grid.Row="2" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5"/>
-                <CheckBox  IsChecked="{Binding CreateLogFile}" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5"/>
-                <CheckBox  IsChecked="{Binding CheckForNewVersion}" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5"/>
-                <CheckBox  IsChecked="{Binding AutoUpdate}" IsEnabled="{Binding CheckForNewVersion}" Grid.Column="1" Grid.Row="5" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5"/>
-                <CheckBox  IsChecked="{Binding HideSplashScreenOnStartup}" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5"/>
-                <CheckBox  IsChecked="{Binding HideSplashScreenOnAutoUpdate}" IsEnabled="{Binding AutoUpdate}" Grid.Column="1" Grid.Row="7" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5"/>
-                <CheckBox IsChecked="{Binding GlobalAutoActions}" Grid.Column="1" Grid.Row="8" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5"/>
-                <ComboBox Grid.Column="1" Grid.Row="9" MaxWidth="250"  HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" SelectedValuePath="Name" DisplayMemberPath="Name" SelectedValue="{Binding DefaultProfile, Mode=TwoWay}" SelectedItem="{Binding DefaultProfile, Mode=TwoWay}" ItemsSource="{Binding ApplicationProfiles}" Background="Black"  />
+                <TextBlock Style="{StaticResource DefaultTextBlock}"    Text="{x:Static pres:ProjectLocales.AutoStart}" Grid.Column="0" Grid.Row="1" Margin="10,4,10,2"  VerticalAlignment="Center"/>
+                <TextBlock Style="{StaticResource DefaultTextBlock}"   Text="{x:Static pres:ProjectLocales.StartToTray}"  Grid.Column="0" Grid.Row="2" Margin="10,3,2,3"  VerticalAlignment="Center"/>
+                <TextBlock Style="{StaticResource DefaultTextBlock}"   Text="{x:Static pres:ProjectLocales.MinimizeToTray}"  Grid.Column="0" Grid.Row="3" Margin="10,3,2,3"  VerticalAlignment="Center"/>
+                <TextBlock Style="{StaticResource DefaultTextBlock}"   Text="{x:Static pres:ProjectLocales.CreateLogFile}"  Grid.Column="0" Grid.Row="4" Margin="10,3,2,3"  VerticalAlignment="Center"/>
+                <TextBlock Style="{StaticResource DefaultTextBlock}"   Text="{x:Static pres:ProjectLocales.CheckForNewVersion}"  Grid.Column="0" Grid.Row="5" Margin="10,3,3,3"  VerticalAlignment="Center"/>
+                <TextBlock Style="{StaticResource DefaultTextBlock}"   Text="{x:Static pres:ProjectLocales.AutoUpdate}"  Grid.Column="0" Grid.Row="6" Margin="10,3,3,3"  VerticalAlignment="Center"/>
+                <TextBlock Style="{StaticResource DefaultTextBlock}"   Text="{x:Static pres:ProjectLocales.HideSplashScreenOnStartup}"  Grid.Column="0" Grid.Row="7" Margin="10,3,3,3"  VerticalAlignment="Center"/>
+                <TextBlock Style="{StaticResource DefaultTextBlock}"   Text="{x:Static pres:ProjectLocales.HideSplashScreenOnUpdate}"  Grid.Column="0" Grid.Row="8" Margin="10,3,3,3"  VerticalAlignment="Center"/>
+                <TextBlock Style="{StaticResource DefaultTextBlock}"   Text="{x:Static pres:ProjectLocales.GlobalAutoHDR}"  Grid.Column="0" Grid.Row="9" Margin="10,3,3,3" HorizontalAlignment="Left"  VerticalAlignment="Center"/>
+                <TextBlock  Style="{StaticResource DefaultTextBlock}"  Text="{x:Static pres:ProjectLocales.DefaultProfile}"  Grid.Column="0" Grid.Row="10" Margin="10,3,3,3" HorizontalAlignment="Left"  VerticalAlignment="Center"/>
 
+                <CheckBox  IsChecked="{Binding AutoStart}" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5"/>
+                <CheckBox  IsChecked="{Binding StartMinimizedToTray}" Grid.Column="1" Grid.Row="2" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5"/>
+                <CheckBox  IsChecked="{Binding CloseToTray}" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5"/>
+                <CheckBox  IsChecked="{Binding CreateLogFile}" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5"/>
+                <CheckBox  IsChecked="{Binding CheckForNewVersion}" Grid.Column="1" Grid.Row="5" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5"/>
+                <CheckBox  IsChecked="{Binding AutoUpdate}" IsEnabled="{Binding CheckForNewVersion}" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5"/>
+                <CheckBox  IsChecked="{Binding HideSplashScreenOnStartup}" Grid.Column="1" Grid.Row="7" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5"/>
+                <CheckBox  IsChecked="{Binding HideSplashScreenOnAutoUpdate}" IsEnabled="{Binding AutoUpdate}" Grid.Column="1" Grid.Row="8" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5"/>
+                <CheckBox IsChecked="{Binding GlobalAutoActions}" Grid.Column="1" Grid.Row="9" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5"/>
+                <ComboBox Grid.Column="1" Grid.Row="10" MaxWidth="250"  HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" SelectedValuePath="Name" DisplayMemberPath="Name" SelectedValue="{Binding DefaultProfile, Mode=TwoWay}" SelectedItem="{Binding DefaultProfile, Mode=TwoWay}" ItemsSource="{Binding ApplicationProfiles}" Background="{StaticResource ControlLightBrush}"  />
             </Grid>
         </ScrollViewer>
         <local:ActionShortcutManagerView Grid.Row="1"  Grid.Column="1" />
diff --git a/Source/AutoActions/WinAPIFunctions.cs b/Source/AutoActions/WinAPIFunctions.cs
index 4a7b242..073616b 100644
--- a/Source/AutoActions/WinAPIFunctions.cs
+++ b/Source/AutoActions/WinAPIFunctions.cs
@@ -4,11 +4,33 @@
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Interop;
 
 namespace AutoActions
 {
     public class WinAPIFunctions
     {
+        private const int DWMWA_USE_IMMERSIVE_DARK_MODE = 20;
+        private const int DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1 = 19;
+
+        [DllImport("dwmapi.dll", PreserveSig = true)]
+        private static extern int DwmSetWindowAttribute(IntPtr hwnd, int attribute, ref int value, int size);
+
+        public static void SetWindowDarkMode(Window window, bool enabled)
+        {
+            if (window == null)
+                return;
+            IntPtr hwnd = new WindowInteropHelper(window).Handle;
+            if (hwnd == IntPtr.Zero)
+                return;
+
+            int useDark = enabled ? 1 : 0;
+            // Attribute 20 (Win10 2004+/Win11); fall back to 19 on older builds.
+            if (DwmSetWindowAttribute(hwnd, DWMWA_USE_IMMERSIVE_DARK_MODE, ref useDark, sizeof(int)) != 0)
+                DwmSetWindowAttribute(hwnd, DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1, ref useDark, sizeof(int));
+        }
+
         //Used to get Handle for Foreground Window
         [DllImport("user32.dll", CharSet = CharSet.Auto)]
         public static extern IntPtr GetForegroundWindow();