diff --git a/LightBulb.Core.Tests/LightBulb.Core.Tests.csproj b/LightBulb.Core.Tests/LightBulb.Core.Tests.csproj
index b829b6d..ba4c9c8 100644
--- a/LightBulb.Core.Tests/LightBulb.Core.Tests.csproj
+++ b/LightBulb.Core.Tests/LightBulb.Core.Tests.csproj
@@ -11,12 +11,12 @@
 
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.2" PrivateAssets="all" />
-    <PackageReference Include="CSharpier.MsBuild" Version="0.28.1" PrivateAssets="all" />
+    <PackageReference Include="CSharpier.MsBuild" Version="0.28.2" PrivateAssets="all" />
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" PrivateAssets="all" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="xunit" Version="2.7.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.8" PrivateAssets="all" />
+    <PackageReference Include="xunit" Version="2.8.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/LightBulb.Core/LightBulb.Core.csproj b/LightBulb.Core/LightBulb.Core.csproj
index 9cb25d0..35a9f20 100644
--- a/LightBulb.Core/LightBulb.Core.csproj
+++ b/LightBulb.Core/LightBulb.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <PackageReference Include="CSharpier.MsBuild" Version="0.28.1" PrivateAssets="all" />
+    <PackageReference Include="CSharpier.MsBuild" Version="0.28.2" PrivateAssets="all" />
     <PackageReference Include="JsonExtensions" Version="1.2.0" />
   </ItemGroup>
 
diff --git a/LightBulb.PlatformInterop/LightBulb.PlatformInterop.csproj b/LightBulb.PlatformInterop/LightBulb.PlatformInterop.csproj
index 5e9e81f..a37e6f7 100644
--- a/LightBulb.PlatformInterop/LightBulb.PlatformInterop.csproj
+++ b/LightBulb.PlatformInterop/LightBulb.PlatformInterop.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <PackageReference Include="CSharpier.MsBuild" Version="0.28.1" PrivateAssets="all" />
+    <PackageReference Include="CSharpier.MsBuild" Version="0.28.2" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/LightBulb/App.axaml b/LightBulb/App.axaml
index 13df945..820c0ee 100644
--- a/LightBulb/App.axaml
+++ b/LightBulb/App.axaml
@@ -4,29 +4,42 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:dialogHostAvalonia="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
     xmlns:framework="clr-namespace:LightBulb.Framework"
-    xmlns:sys="using:System"
     xmlns:materialAssists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
-    xmlns:materialControls="clr-namespace:Material.Styles.Controls;assembly=Material.Styles"
     xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-    xmlns:materialStyles="clr-namespace:Material.Styles.Themes;assembly=Material.Styles">
+    xmlns:materialStyles="clr-namespace:Material.Styles.Themes;assembly=Material.Styles"
+    ActualThemeVariantChanged="Application_OnActualThemeVariantChanged">
     <Application.DataTemplates>
         <framework:ViewManager />
     </Application.DataTemplates>
-
     <Application.Styles>
-        <Style>
-            <Style.Resources>
-                <ResourceDictionary>
-                    <!-- Fix bug with initialization of MaterialPaperBrush using MaterialThemeBase -->
-                    <SolidColorBrush x:Key="MaterialPaperBrush" Color="#FF0000"></SolidColorBrush>
-                </ResourceDictionary>
-            </Style.Resources>
-        </Style>
-
-        <materialStyles:MaterialThemeBase />
+        <!--  This theme is used as a stub to pre-load default resources, the actual colors are set through code  -->
+        <materialStyles:MaterialTheme
+            BaseTheme="Light"
+            PrimaryColor="Grey"
+            SecondaryColor="DeepOrange" />
         <materialIcons:MaterialIconStyles />
         <dialogHostAvalonia:DialogHostStyles />
 
+        <!--  Combo box  -->
+        <Style Selector="ComboBox">
+            <Setter Property="FontSize" Value="14" />
+
+            <Style Selector="^ /template/ Panel#PART_RootPanel">
+                <Setter Property="Height" Value="22" />
+            </Style>
+
+            <Style Selector="^ /template/ ToggleButton">
+                <Style Selector="^:checked, ^:unchecked">
+                    <Setter Property="Margin" Value="0" />
+                    <Setter Property="CornerRadius" Value="0" />
+
+                    <Style Selector="^ ContentPresenter#contentPresenter">
+                        <Setter Property="Margin" Value="12,8" />
+                    </Style>
+                </Style>
+            </Style>
+        </Style>
+
         <!--  Dialog host  -->
         <Style Selector="dialogHostAvalonia|DialogHost">
             <Setter Property="DialogMargin" Value="0" />
@@ -81,61 +94,18 @@
             </Style>
         </Style>
 
-        <!-- Apply Slider Accent class, since Material doesn't do it itself -->
-        <Style Selector="Slider.accent">
-            <Style Selector="^ Border#PART_InactiveState">
-                <Setter Property="Background" Value="{DynamicResource MaterialSecondaryMidBrush}" />
-            </Style>
-            <Style Selector="^ Border#PART_Indicator">
-                <Setter Property="Background" Value="{DynamicResource MaterialSecondaryMidBrush}" />
-            </Style>
-            <Style Selector="^ Border#PART_HoverEffect">
-                <Setter Property="Background" Value="{DynamicResource MaterialSecondaryMidBrush}" />
-            </Style>
-
-            <Style Selector="^ Border#PART_ThumbGrip">
-                <Setter Property="Background" Value="{DynamicResource MaterialSecondaryMidBrush}" />
-            </Style>
-        </Style>
-
         <!--  Text box  -->
         <Style Selector="TextBox">
             <Setter Property="FontSize" Value="14" />
         </Style>
 
-        <!-- Apply TextBox Accent class, since material doesn't do it itself -->
-        <Style Selector="TextBox.accent">
-            <Setter Property="SelectionBrush" Value="{DynamicResource MaterialSecondaryMidBrush}" />
-            <Setter Property="SelectionForegroundBrush" Value="{DynamicResource MaterialSecondaryForegroundBrush}" />
-            <Setter Property="CaretBrush" Value="{DynamicResource MaterialSecondaryMidBrush}" />
-            <Style Selector="^ materialControls|MaterialUnderline">
-                <Setter Property="ActiveBrush" Value="{DynamicResource MaterialSecondaryMidBrush}" />
-            </Style>
-        </Style>
-
         <!--  Toggle button  -->
         <Style Selector="ToggleButton">
             <Setter Property="TextElement.FontWeight" Value="Medium" />
         </Style>
 
-        <!-- Combo box -->
-        <Style Selector="ComboBox">
-            <Style Selector="^ /template/ Panel#PART_RootPanel">
-                <Setter Property="Height" Value="22" />
-            </Style>
-        </Style>
-
-        <!-- Apply ComboBox Accent class, since material doesn't do it itself -->
-        <Style Selector="ComboBox.accent">
-            <Style Selector="^ materialControls|MaterialUnderline">
-                <Setter Property="ActiveBrush" Value="{DynamicResource MaterialSecondaryMidBrush}" />
-            </Style>
-        </Style>
-
         <!--  Toggle switch  -->
         <Style Selector="ToggleSwitch">
-            <!-- Apply custom style for disabled toggles, because Material's default is bad.-->
-            <!-- Tracked in https://github.com/AvaloniaCommunity/Material.Avalonia/issues/379 -->
             <Setter Property="materialAssists:ToggleSwitchAssist.SwitchThumbOffBackground" Value="{DynamicResource ToggleBackgroundBrush}" />
         </Style>
 
@@ -150,6 +120,15 @@
 
     <Application.Resources>
         <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Default">
+                    <SolidColorBrush x:Key="ToggleBackgroundBrush" Color="#FFFFFF" />
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Dark">
+                    <SolidColorBrush x:Key="ToggleBackgroundBrush" Color="#8E8E8E" />
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+
             <!--  Text box  -->
             <ControlTheme
                 x:Key="CompactTextBox"
@@ -162,24 +141,13 @@
                         <Style Selector="^ /template/ Panel#PART_TextFieldPanel">
                             <Setter Property="MinHeight" Value="0" />
                         </Style>
+
                         <Style Selector="^ /template/ Panel#PART_TextContainer">
                             <Setter Property="Margin" Value="0" />
                         </Style>
                     </Style>
                 </Styles>
             </ControlTheme>
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Light">
-                    <!-- Custom style for disabled toggles -->
-                    <SolidColorBrush x:Key="ToggleBackgroundBrush" Color="#FFFFFF"></SolidColorBrush>
-                    <sys:Boolean x:Key="UseAccentControls">false</sys:Boolean>
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="Dark">
-                    <!-- Custom style for disabled toggles -->
-                    <SolidColorBrush x:Key="ToggleBackgroundBrush" Color="#8E8E8E"></SolidColorBrush>
-                    <sys:Boolean x:Key="UseAccentControls">true</sys:Boolean>
-                </ResourceDictionary>
-            </ResourceDictionary.ThemeDictionaries>
         </ResourceDictionary>
     </Application.Resources>
 
diff --git a/LightBulb/App.axaml.cs b/LightBulb/App.axaml.cs
index 10f1f12..4adbe50 100644
--- a/LightBulb/App.axaml.cs
+++ b/LightBulb/App.axaml.cs
@@ -8,7 +8,6 @@
 using Avalonia.Platform;
 using Avalonia.Threading;
 using LightBulb.Framework;
-using LightBulb.Models;
 using LightBulb.Services;
 using LightBulb.Utils;
 using LightBulb.Utils.Extensions;
@@ -27,8 +26,8 @@ public class App : Application, IDisposable
     private readonly DisposableCollector _eventRoot = new();
 
     private readonly ServiceProvider _services;
-    private readonly MainViewModel _mainViewModel;
     private readonly SettingsService _settingsService;
+    private readonly MainViewModel _mainViewModel;
 
     public App()
     {
@@ -58,30 +57,29 @@ public App()
         services.AddTransient<SettingsTabViewModelBase, LocationSettingsTabViewModel>();
 
         _services = services.BuildServiceProvider(true);
-        _mainViewModel = _services.GetRequiredService<ViewModelManager>().CreateMainViewModel();
         _settingsService = _services.GetRequiredService<SettingsService>();
+        _mainViewModel = _services.GetRequiredService<ViewModelManager>().CreateMainViewModel();
 
-        // Load settings
-        _settingsService.Load();
-
-        _settingsService.WatchProperty(
-            o => o.Theme,
-            () =>
-            {
-                if (PlatformSettings is IPlatformSettings settings)
+        // Re-initialize the theme when the user changes it
+        _eventRoot.Add(
+            _settingsService.WatchProperty(
+                o => o.Theme,
+                () =>
                 {
-                    SetupTheme(settings.GetColorValues());
-                }
-            },
-            false
+                    RequestedThemeVariant = _settingsService.Theme switch
+                    {
+                        ThemeVariant.Light => Avalonia.Styling.ThemeVariant.Light,
+                        ThemeVariant.Dark => Avalonia.Styling.ThemeVariant.Dark,
+                        _ => Avalonia.Styling.ThemeVariant.Default
+                    };
+
+                    InitializeTheme();
+                },
+                false
+            )
         );
-    }
 
-    public override void Initialize()
-    {
-        AvaloniaXamlLoader.Load(this);
-
-        // Tray icon does not support binding so we use this hack to update its tooltip
+        // Tray icon does not support binding so we use this hack to synchronize its tooltip
         _eventRoot.Add(
             _mainViewModel.Dashboard.WatchProperties(
                 [o => o.IsActive, o => o.CurrentConfiguration],
@@ -102,59 +100,52 @@ public override void Initialize()
                         if (TrayIcon.GetIcons(this)?.FirstOrDefault() is { } trayIcon)
                             trayIcon.ToolTipText = tooltip;
                     });
-                }
+                },
+                false
             )
         );
     }
 
-    public override void OnFrameworkInitializationCompleted()
+    public override void Initialize()
     {
-        if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktopLifetime)
-            desktopLifetime.MainWindow = new MainView { DataContext = _mainViewModel };
-
-        base.OnFrameworkInitializationCompleted();
+        base.Initialize();
 
-        if (PlatformSettings is IPlatformSettings settings)
-        {
-            settings.ColorValuesChanged += PlatformSettings_ColorValuesChanged;
-            SetupTheme(settings.GetColorValues());
-        }
+        AvaloniaXamlLoader.Load(this);
     }
 
-    private void PlatformSettings_ColorValuesChanged(object? sender, PlatformColorValues colors)
+    private void InitializeTheme()
     {
-        SetupTheme(colors);
+        var actualTheme = RequestedThemeVariant?.Key switch
+        {
+            "Light" => PlatformThemeVariant.Light,
+            "Dark" => PlatformThemeVariant.Dark,
+            _ => PlatformSettings?.GetColorValues().ThemeVariant ?? PlatformThemeVariant.Light
+        };
+
+        this.LocateMaterialTheme<MaterialThemeBase>().CurrentTheme =
+            actualTheme == PlatformThemeVariant.Light
+                ? Theme.Create(Theme.Light, Color.Parse("#343838"), Color.Parse("#F9A825"))
+                : Theme.Create(Theme.Dark, Color.Parse("#E8E8E8"), Color.Parse("#F9A825"));
     }
 
-    private void SetupTheme(PlatformColorValues colors)
+    public override void OnFrameworkInitializationCompleted()
     {
-        var themeMode = _settingsService.Theme;
-        if (themeMode == ThemeMode.System)
-        {
-            themeMode =
-                colors.ThemeVariant == PlatformThemeVariant.Dark ? ThemeMode.Dark : ThemeMode.Light;
-        }
+        if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktopLifetime)
+            desktopLifetime.MainWindow = new MainView { DataContext = _mainViewModel };
 
-        if (themeMode == ThemeMode.Dark)
-        {
-            RequestedThemeVariant = Avalonia.Styling.ThemeVariant.Dark;
-            this.LocateMaterialTheme<MaterialThemeBase>().CurrentTheme = Theme.Create(
-                Theme.Dark,
-                Color.Parse("#202222"),
-                Color.Parse("#F9A825")
-            );
-        }
-        else
-        {
-            RequestedThemeVariant = Avalonia.Styling.ThemeVariant.Light;
-            this.LocateMaterialTheme<MaterialThemeBase>().CurrentTheme = Theme.Create(
-                Theme.Light,
-                Color.Parse("#343838"),
-                Color.Parse("#F9A825")
-            );
-        }
+        base.OnFrameworkInitializationCompleted();
+
+        // Set up custom theme colors
+        InitializeTheme();
+
+        // Load settings
+        _settingsService.Load();
     }
 
+    private void Application_OnActualThemeVariantChanged(object? sender, EventArgs args) =>
+        // Re-initialize the theme when the system theme changes
+        InitializeTheme();
+
     private void TrayIcon_OnClicked(object? sender, EventArgs args) => this.TryFocusMainWindow();
 
     private void ShowSettingsMenuItem_OnClick(object? sender, EventArgs args)
diff --git a/LightBulb/Framework/ThemeVariant.cs b/LightBulb/Framework/ThemeVariant.cs
new file mode 100644
index 0000000..4a062ad
--- /dev/null
+++ b/LightBulb/Framework/ThemeVariant.cs
@@ -0,0 +1,8 @@
+namespace LightBulb.Framework;
+
+public enum ThemeVariant
+{
+    System,
+    Light,
+    Dark
+}
diff --git a/LightBulb/LightBulb.csproj b/LightBulb/LightBulb.csproj
index c13291a..00c8e75 100644
--- a/LightBulb/LightBulb.csproj
+++ b/LightBulb/LightBulb.csproj
@@ -19,14 +19,14 @@
     <PackageReference Include="Avalonia" Version="11.0.10" />
     <PackageReference Include="Avalonia.Desktop" Version="11.0.10" />
     <PackageReference Include="Avalonia.Diagnostics" Version="11.0.10" Condition="'$(Configuration)' == 'Debug'" />
-    <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.10.6" />
+    <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.10.9" />
     <PackageReference Include="Cogwheel" Version="2.0.4" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-    <PackageReference Include="CSharpier.MsBuild" Version="0.28.1" PrivateAssets="all" />
+    <PackageReference Include="CSharpier.MsBuild" Version="0.28.2" PrivateAssets="all" />
     <PackageReference Include="Deorcify" Version="1.0.2" PrivateAssets="all" />
     <PackageReference Include="DialogHost.Avalonia" Version="0.7.7" />
-    <PackageReference Include="DotnetRuntimeBootstrapper" Version="2.5.3" PrivateAssets="all" Condition="$([MSBuild]::IsOsPlatform('Windows'))" />
-    <PackageReference Include="Material.Avalonia" Version="3.6.0" />
+    <PackageReference Include="DotnetRuntimeBootstrapper" Version="2.5.4" PrivateAssets="all" Condition="$([MSBuild]::IsOsPlatform('Windows'))" />
+    <PackageReference Include="Material.Avalonia" Version="3.5.0" />
     <PackageReference Include="Material.Icons.Avalonia" Version="2.1.9" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="Onova" Version="2.6.11" />
diff --git a/LightBulb/Models/ThemeMode.cs b/LightBulb/Models/ThemeMode.cs
deleted file mode 100644
index 82d71c5..0000000
--- a/LightBulb/Models/ThemeMode.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace LightBulb.Models;
-
-/// <summary>
-/// Describes the application's theme mode.
-/// </summary>
-public enum ThemeMode
-{
-    /// <summary>
-    /// Use the light theme
-    /// </summary>
-    Light,
-
-    /// <summary>
-    /// Use the dark theme
-    /// </summary>
-    Dark,
-
-    /// <summary>
-    /// Use whichever theme is specified by system settings
-    /// </summary>
-    System
-}
diff --git a/LightBulb/Services/SettingsService.cs b/LightBulb/Services/SettingsService.cs
index c99f795..e85a80b 100644
--- a/LightBulb/Services/SettingsService.cs
+++ b/LightBulb/Services/SettingsService.cs
@@ -5,6 +5,7 @@
 using Cogwheel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using LightBulb.Core;
+using LightBulb.Framework;
 using LightBulb.Models;
 using LightBulb.PlatformInterop;
 using LightBulb.Utils;
@@ -85,11 +86,11 @@ public partial class SettingsService() : SettingsBase(GetFilePath())
     // Advanced
 
     [ObservableProperty]
-    [property: JsonIgnore] // comes from registry
-    private bool _isAutoStartEnabled;
+    private ThemeVariant _theme;
 
     [ObservableProperty]
-    private ThemeMode _theme = ThemeMode.System;
+    [property: JsonIgnore] // comes from registry
+    private bool _isAutoStartEnabled;
 
     [ObservableProperty]
     private bool _isAutoUpdateEnabled = true;
diff --git a/LightBulb/ViewModels/Components/Settings/AdvancedSettingsTabViewModel.cs b/LightBulb/ViewModels/Components/Settings/AdvancedSettingsTabViewModel.cs
index 059306f..7cb85f9 100644
--- a/LightBulb/ViewModels/Components/Settings/AdvancedSettingsTabViewModel.cs
+++ b/LightBulb/ViewModels/Components/Settings/AdvancedSettingsTabViewModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using LightBulb.Models;
+using LightBulb.Framework;
 using LightBulb.Services;
 
 namespace LightBulb.ViewModels.Components.Settings;
@@ -8,20 +8,20 @@ namespace LightBulb.ViewModels.Components.Settings;
 public class AdvancedSettingsTabViewModel(SettingsService settingsService)
     : SettingsTabViewModelBase(settingsService, 2, "Advanced")
 {
-    public bool IsAutoStartEnabled
-    {
-        get => SettingsService.IsAutoStartEnabled;
-        set => SettingsService.IsAutoStartEnabled = value;
-    }
-
-    public IReadOnlyList<ThemeMode> ThemeArray { get; } = Enum.GetValues<ThemeMode>();
+    public IReadOnlyList<ThemeVariant> AvailableThemes { get; } = Enum.GetValues<ThemeVariant>();
 
-    public ThemeMode Theme
+    public ThemeVariant Theme
     {
         get => SettingsService.Theme;
         set => SettingsService.Theme = value;
     }
 
+    public bool IsAutoStartEnabled
+    {
+        get => SettingsService.IsAutoStartEnabled;
+        set => SettingsService.IsAutoStartEnabled = value;
+    }
+
     public bool IsAutoUpdateEnabled
     {
         get => SettingsService.IsAutoUpdateEnabled;
diff --git a/LightBulb/Views/Components/DashboardView.axaml b/LightBulb/Views/Components/DashboardView.axaml
index ad06e36..349bab7 100644
--- a/LightBulb/Views/Components/DashboardView.axaml
+++ b/LightBulb/Views/Components/DashboardView.axaml
@@ -12,39 +12,6 @@
         <components:DashboardViewModel />
     </Design.DataContext>
 
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Light">
-                    <!-- Sundial brushes -->
-                    <SolidColorBrush x:Key="SundialNightBorderBrush" Color="#FFAF1A"></SolidColorBrush>
-                    <SolidColorBrush x:Key="SundialNightBrush" Color="#FFD280"></SolidColorBrush>
-                    <SolidColorBrush x:Key="SundialDayBorderBrush" Color="#8AC0FF"></SolidColorBrush>
-                    <SolidColorBrush x:Key="SundialDayBrush" Color="#F2F8FF"></SolidColorBrush>
-                    <SolidColorBrush x:Key="SundialSunriseBorderBrush" Color="#FFC766"></SolidColorBrush>
-                    <SolidColorBrush x:Key="SundialSunriseBrush" Color="#FFEDCD"></SolidColorBrush>
-                    <SolidColorBrush x:Key="SundialSunsetBorderBrush" Color="#FFC766"></SolidColorBrush>
-                    <SolidColorBrush x:Key="SundialSunsetBrush" Color="#FFEDCD"></SolidColorBrush>
-                    <SolidColorBrush x:Key="SundialMarkerBorderBrush" Color="#FF7733"></SolidColorBrush>
-                    <SolidColorBrush x:Key="SundialMarkerBrush" Color="#FFAB85"></SolidColorBrush>
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="Dark">
-                    <!-- Sundial brushes -->
-                    <SolidColorBrush x:Key="SundialNightBorderBrush" Color="#B18B4E"></SolidColorBrush>
-                    <SolidColorBrush x:Key="SundialNightBrush" Color="#ECC17E"></SolidColorBrush>
-                    <SolidColorBrush x:Key="SundialDayBorderBrush" Color="#4E93B1"></SolidColorBrush>
-                    <SolidColorBrush x:Key="SundialDayBrush" Color="#AAD7EA"></SolidColorBrush>
-                    <SolidColorBrush x:Key="SundialSunriseBorderBrush" Color="#B18C4E"></SolidColorBrush>
-                    <SolidColorBrush x:Key="SundialSunriseBrush" Color="#FAEDD6"></SolidColorBrush>
-                    <SolidColorBrush x:Key="SundialSunsetBorderBrush" Color="#B18C4E"></SolidColorBrush>
-                    <SolidColorBrush x:Key="SundialSunsetBrush" Color="#FAEDD6"></SolidColorBrush>
-                    <SolidColorBrush x:Key="SundialMarkerBorderBrush" Color="#B1704E"></SolidColorBrush>
-                    <SolidColorBrush x:Key="SundialMarkerBrush" Color="#E38755"></SolidColorBrush>
-                </ResourceDictionary>
-            </ResourceDictionary.ThemeDictionaries>
-        </ResourceDictionary>
-    </UserControl.Resources>
-
     <Grid ColumnDefinitions="*,Auto,*">
         <!--  Sunset time  -->
         <TextBlock
@@ -68,6 +35,37 @@
 
         <!--  Sundial  -->
         <Panel Grid.Column="1">
+            <Panel.Resources>
+                <ResourceDictionary>
+                    <ResourceDictionary.ThemeDictionaries>
+                        <ResourceDictionary x:Key="Default">
+                            <SolidColorBrush x:Key="SundialNightBorderBrush" Color="#B4FFAF1A" />
+                            <SolidColorBrush x:Key="SundialNightBrush" Color="#B4FFD280" />
+                            <SolidColorBrush x:Key="SundialDayBorderBrush" Color="#B48AC0FF" />
+                            <SolidColorBrush x:Key="SundialDayBrush" Color="#B4F2F8FF" />
+                            <SolidColorBrush x:Key="SundialSunriseBorderBrush" Color="#B4FFC766" />
+                            <SolidColorBrush x:Key="SundialSunriseBrush" Color="#B4FFEDCD" />
+                            <SolidColorBrush x:Key="SundialSunsetBorderBrush" Color="#B4FFC766" />
+                            <SolidColorBrush x:Key="SundialSunsetBrush" Color="#B4FFEDCD" />
+                            <SolidColorBrush x:Key="SundialMarkerBorderBrush" Color="#B4FF7733" />
+                            <SolidColorBrush x:Key="SundialMarkerBrush" Color="#B4FFAB85" />
+                        </ResourceDictionary>
+                        <ResourceDictionary x:Key="Dark">
+                            <SolidColorBrush x:Key="SundialNightBorderBrush" Color="#B4B18B4E" />
+                            <SolidColorBrush x:Key="SundialNightBrush" Color="#B4ECC17E" />
+                            <SolidColorBrush x:Key="SundialDayBorderBrush" Color="#B44E93B1" />
+                            <SolidColorBrush x:Key="SundialDayBrush" Color="#B48FBDCD" />
+                            <SolidColorBrush x:Key="SundialSunriseBorderBrush" Color="#B4B18C4E" />
+                            <SolidColorBrush x:Key="SundialSunriseBrush" Color="#B4FAEDD6" />
+                            <SolidColorBrush x:Key="SundialSunsetBorderBrush" Color="#B4B18C4E" />
+                            <SolidColorBrush x:Key="SundialSunsetBrush" Color="#B4FAEDD6" />
+                            <SolidColorBrush x:Key="SundialMarkerBorderBrush" Color="#B4B1704E" />
+                            <SolidColorBrush x:Key="SundialMarkerBrush" Color="#B4E38755" />
+                        </ResourceDictionary>
+                    </ResourceDictionary.ThemeDictionaries>
+                </ResourceDictionary>
+            </Panel.Resources>
+
             <!--  Night time arc  -->
             <controls:Arc
                 Width="180"
diff --git a/LightBulb/Views/Components/Settings/AdvancedSettingsTabView.axaml b/LightBulb/Views/Components/Settings/AdvancedSettingsTabView.axaml
index 87df660..f3e8cdd 100644
--- a/LightBulb/Views/Components/Settings/AdvancedSettingsTabView.axaml
+++ b/LightBulb/Views/Components/Settings/AdvancedSettingsTabView.axaml
@@ -8,109 +8,67 @@
     </Design.DataContext>
 
     <StackPanel Margin="16" Orientation="Vertical">
-        <!--  Auto start  -->
-        <DockPanel ToolTip.Tip="Launch LightBulb at Windows startup">
-            <TextBlock
-                VerticalAlignment="Center"
-                DockPanel.Dock="Left"
-                Text="Start with Windows" />
-            <ToggleSwitch
-                HorizontalAlignment="Right"
-                VerticalAlignment="Center"
+        <!--  Theme  -->
+        <DockPanel LastChildFill="False" ToolTip.Tip="Preferred user interface theme">
+            <TextBlock DockPanel.Dock="Left" Text="Theme" />
+            <ComboBox
                 DockPanel.Dock="Right"
-                IsChecked="{Binding IsAutoStartEnabled}"
-                Classes.accent="{DynamicResource UseAccentControls}" />
+                ItemsSource="{Binding AvailableThemes}"
+                SelectedItem="{Binding Theme}" />
         </DockPanel>
 
-        <!-- Theme -->
-        <DockPanel Margin="0,16,0,0" ToolTip.Tip="LightBulb UI Theme">
-            <TextBlock
-                VerticalAlignment="Center"
-                DockPanel.Dock="Left"
-                Text="Theme" />
-            <ComboBox
-                HorizontalAlignment="Right"
-                DockPanel.Dock="Right"
-                ItemsSource="{Binding ThemeArray}"
-                SelectedItem="{Binding Theme}"
-                Classes.accent="{DynamicResource UseAccentControls}">
-                <ComboBox.ItemTemplate>
-                    <DataTemplate>
-                        <!-- Required for correct Material display, via https://github.com/AvaloniaCommunity/Material.Avalonia/issues/269#issuecomment-1738117187-->
-                        <TextBlock Text="{Binding StringFormat='\{0\}'}" VerticalAlignment="Center"></TextBlock>
-                    </DataTemplate>
-                </ComboBox.ItemTemplate>
-            </ComboBox>
+        <!--  Auto start  -->
+        <DockPanel
+            Margin="0,16,0,0"
+            LastChildFill="False"
+            ToolTip.Tip="Launch LightBulb at Windows startup">
+            <TextBlock DockPanel.Dock="Left" Text="Start with Windows" />
+            <ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding IsAutoStartEnabled}" />
         </DockPanel>
 
         <!--  Auto update  -->
-        <DockPanel Margin="0,14,0,0" ToolTip.Tip="Keep LightBulb updated by automatically installing new versions as they become available">
-            <TextBlock
-                VerticalAlignment="Center"
-                DockPanel.Dock="Left"
-                Text="Auto-update" />
-            <ToggleSwitch
-                HorizontalAlignment="Right"
-                VerticalAlignment="Center"
-                DockPanel.Dock="Right"
-                IsChecked="{Binding IsAutoUpdateEnabled}"
-                Classes.accent="{DynamicResource UseAccentControls}" />
+        <DockPanel
+            Margin="0,16,0,0"
+            LastChildFill="False"
+            ToolTip.Tip="Keep LightBulb updated by automatically installing new versions as they become available">
+            <TextBlock DockPanel.Dock="Left" Text="Auto-update" />
+            <ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding IsAutoUpdateEnabled}" />
         </DockPanel>
 
         <!--  Default to day time  -->
-        <DockPanel Margin="0,16,0,0" ToolTip.Tip="When LightBulb is disabled or paused, restore the configured day-time temperature and brightness instead of the default monitor gamma">
-            <TextBlock
-                VerticalAlignment="Center"
-                DockPanel.Dock="Left"
-                Text="Default to day-time configuration" />
-            <ToggleSwitch
-                HorizontalAlignment="Right"
-                VerticalAlignment="Center"
-                DockPanel.Dock="Right"
-                IsChecked="{Binding IsDefaultToDayConfigurationEnabled}"
-                Classes.accent="{DynamicResource UseAccentControls}" />
+        <DockPanel
+            Margin="0,16,0,0"
+            LastChildFill="False"
+            ToolTip.Tip="When LightBulb is disabled or paused, restore the configured day-time temperature and brightness instead of the default monitor gamma">
+            <TextBlock DockPanel.Dock="Left" Text="Default to day-time configuration" />
+            <ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding IsDefaultToDayConfigurationEnabled}" />
         </DockPanel>
 
         <!--  Pause when full screen  -->
-        <DockPanel Margin="0,16,0,0" ToolTip.Tip="Pause LightBulb when any fullscreen window is in the foreground">
-            <TextBlock
-                VerticalAlignment="Center"
-                DockPanel.Dock="Left"
-                Text="Pause when fullscreen" />
-            <ToggleSwitch
-                HorizontalAlignment="Right"
-                VerticalAlignment="Center"
-                DockPanel.Dock="Right"
-                IsChecked="{Binding IsPauseWhenFullScreenEnabled}"
-                Classes.accent="{DynamicResource UseAccentControls}" />
+        <DockPanel
+            Margin="0,16,0,0"
+            LastChildFill="False"
+            ToolTip.Tip="Pause LightBulb when any fullscreen window is in the foreground">
+            <TextBlock DockPanel.Dock="Left" Text="Pause when fullscreen" />
+            <ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding IsPauseWhenFullScreenEnabled}" />
         </DockPanel>
 
         <!--  Configuration smoothing  -->
-        <DockPanel Margin="0,16,0,0" ToolTip.Tip="Transition slowly when enabling or disabling LightBulb to give time for eyes to adjust">
-            <TextBlock
-                VerticalAlignment="Center"
-                DockPanel.Dock="Left"
-                Text="Gamma smoothing" />
-            <ToggleSwitch
-                HorizontalAlignment="Right"
-                VerticalAlignment="Center"
-                DockPanel.Dock="Right"
-                IsChecked="{Binding IsConfigurationSmoothingEnabled}"
-                Classes.accent="{DynamicResource UseAccentControls}" />
+        <DockPanel
+            Margin="0,16,0,0"
+            LastChildFill="False"
+            ToolTip.Tip="Transition slowly when enabling or disabling LightBulb to give time for eyes to adjust">
+            <TextBlock DockPanel.Dock="Left" Text="Gamma smoothing" />
+            <ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding IsConfigurationSmoothingEnabled}" />
         </DockPanel>
 
         <!--  Gamma polling  -->
-        <DockPanel Margin="0,16,0,0" ToolTip.Tip="Force-refresh monitor gamma at regular intervals to prevent other programs from overriding it">
-            <TextBlock
-                VerticalAlignment="Center"
-                DockPanel.Dock="Left"
-                Text="Gamma polling" />
-            <ToggleSwitch
-                HorizontalAlignment="Right"
-                VerticalAlignment="Center"
-                DockPanel.Dock="Right"
-                IsChecked="{Binding IsGammaPollingEnabled}"
-                Classes.accent="{DynamicResource UseAccentControls}" />
+        <DockPanel
+            Margin="0,16,0,0"
+            LastChildFill="False"
+            ToolTip.Tip="Force-refresh monitor gamma at regular intervals to prevent other programs from overriding it">
+            <TextBlock DockPanel.Dock="Left" Text="Gamma polling" />
+            <ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding IsGammaPollingEnabled}" />
         </DockPanel>
     </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/LightBulb/Views/Components/Settings/ApplicationWhitelistSettingsTabView.axaml b/LightBulb/Views/Components/Settings/ApplicationWhitelistSettingsTabView.axaml
index 22a0d90..a97a14b 100644
--- a/LightBulb/Views/Components/Settings/ApplicationWhitelistSettingsTabView.axaml
+++ b/LightBulb/Views/Components/Settings/ApplicationWhitelistSettingsTabView.axaml
@@ -42,8 +42,7 @@
                 HorizontalAlignment="Right"
                 VerticalAlignment="Center"
                 IsChecked="{Binding IsApplicationWhitelistEnabled}"
-                ToolTip.Tip="Pause LightBulb when one of the selected applications is in the foreground"
-                Classes.accent="{DynamicResource UseAccentControls}" />
+                ToolTip.Tip="Pause LightBulb when one of the selected applications is in the foreground" />
         </Grid>
 
         <!--  Whitelisted applications  -->
@@ -70,8 +69,7 @@
                         <CheckBox
                             Content="{Binding Name}"
                             IsChecked="{Binding $parent[ListBoxItem].IsSelected, Mode=OneWay}"
-                            IsHitTestVisible="False"
-                            Classes.accent="{DynamicResource UseAccentControls}"/>
+                            IsHitTestVisible="False" />
                     </Panel>
                 </DataTemplate>
             </ListBox.ItemTemplate>
diff --git a/LightBulb/Views/Components/Settings/GeneralSettingsTabView.axaml b/LightBulb/Views/Components/Settings/GeneralSettingsTabView.axaml
index d1db410..621f466 100644
--- a/LightBulb/Views/Components/Settings/GeneralSettingsTabView.axaml
+++ b/LightBulb/Views/Components/Settings/GeneralSettingsTabView.axaml
@@ -17,8 +17,7 @@
                 MinWidth="24"
                 HorizontalAlignment="Right"
                 DockPanel.Dock="Right"
-                Theme="{DynamicResource CompactTextBox}"
-                Classes.accent="{DynamicResource UseAccentControls}">
+                Theme="{DynamicResource CompactTextBox}">
                 <Interaction.Behaviors>
                     <behaviors:LostFocusUpdateBindingBehavior Text="{Binding DayTemperature, Converter={x:Static converters:DoubleToStringConverter.Instance}}" />
                 </Interaction.Behaviors>
@@ -32,8 +31,7 @@
             Minimum="2500"
             SmallChange="100"
             TickFrequency="20"
-            Value="{Binding DayTemperature}"
-            Classes.accent="{DynamicResource UseAccentControls}" />
+            Value="{Binding DayTemperature}" />
 
         <!--  Night temperature  -->
         <DockPanel Margin="0,24,0,0" ToolTip.Tip="Color temperature during the night">
@@ -42,8 +40,7 @@
                 MinWidth="24"
                 HorizontalAlignment="Right"
                 DockPanel.Dock="Right"
-                Theme="{DynamicResource CompactTextBox}"
-                Classes.accent="{DynamicResource UseAccentControls}">
+                Theme="{DynamicResource CompactTextBox}">
                 <Interaction.Behaviors>
                     <behaviors:LostFocusUpdateBindingBehavior Text="{Binding NightTemperature, Converter={x:Static converters:DoubleToStringConverter.Instance}}" />
                 </Interaction.Behaviors>
@@ -57,8 +54,7 @@
             Minimum="2500"
             SmallChange="100"
             TickFrequency="20"
-            Value="{Binding NightTemperature}"
-            Classes.accent="{DynamicResource UseAccentControls}" />
+            Value="{Binding NightTemperature}" />
 
         <!--  Day brightness  -->
         <DockPanel Margin="0,24,0,0">
@@ -80,8 +76,7 @@
                 MinWidth="24"
                 HorizontalAlignment="Right"
                 DockPanel.Dock="Right"
-                Theme="{DynamicResource CompactTextBox}"
-                Classes.accent="{DynamicResource UseAccentControls}">
+                Theme="{DynamicResource CompactTextBox}">
                 <Interaction.Behaviors>
                     <behaviors:LostFocusUpdateBindingBehavior Text="{Binding DayBrightness, Converter={x:Static converters:FractionToPercentageStringConverter.Instance}}" />
                 </Interaction.Behaviors>
@@ -95,8 +90,7 @@
             Minimum="0.1"
             SmallChange="0.01"
             TickFrequency="0.01"
-            Value="{Binding DayBrightness}"
-            Classes.accent="{DynamicResource UseAccentControls}" />
+            Value="{Binding DayBrightness}" />
 
         <!--  Night brightness  -->
         <DockPanel Margin="0,24,0,0">
@@ -118,8 +112,7 @@
                 MinWidth="24"
                 HorizontalAlignment="Right"
                 DockPanel.Dock="Right"
-                Theme="{DynamicResource CompactTextBox}"
-                Classes.accent="{DynamicResource UseAccentControls}">
+                Theme="{DynamicResource CompactTextBox}">
                 <Interaction.Behaviors>
                     <behaviors:LostFocusUpdateBindingBehavior Text="{Binding NightBrightness, Converter={x:Static converters:FractionToPercentageStringConverter.Instance}}" />
                 </Interaction.Behaviors>
@@ -133,8 +126,7 @@
             Minimum="0.1"
             SmallChange="0.01"
             TickFrequency="0.01"
-            Value="{Binding NightBrightness}"
-            Classes.accent="{DynamicResource UseAccentControls}" />
+            Value="{Binding NightBrightness}" />
 
         <!--  Configuration transition duration  -->
         <DockPanel Margin="0,24,0,0" ToolTip.Tip="Duration of time it takes to switch between day-time and night-time configurations">
@@ -143,8 +135,7 @@
                 MinWidth="48"
                 HorizontalAlignment="Right"
                 DockPanel.Dock="Right"
-                Theme="{DynamicResource CompactTextBox}"
-                Classes.accent="{DynamicResource UseAccentControls}">
+                Theme="{DynamicResource CompactTextBox}">
                 <Interaction.Behaviors>
                     <behaviors:LostFocusUpdateBindingBehavior Text="{Binding ConfigurationTransitionDuration, Converter={x:Static converters:TimeSpanToDurationStringConverter.Instance}}" />
                 </Interaction.Behaviors>
@@ -156,8 +147,7 @@
             Maximum="3"
             Minimum="0"
             SmallChange="0.08"
-            Value="{Binding ConfigurationTransitionDuration, Converter={x:Static converters:TimeSpanToHoursDoubleConverter.Instance}}"
-            Classes.accent="{DynamicResource UseAccentControls}" />
+            Value="{Binding ConfigurationTransitionDuration, Converter={x:Static converters:TimeSpanToHoursDoubleConverter.Instance}}" />
 
         <!--  Configuration transition offset  -->
         <DockPanel Margin="0,24,0,0" ToolTip.Tip="Offset that specifies how early or late the transition starts, relative to the sunrise and sunset">
@@ -166,8 +156,7 @@
                 MinWidth="24"
                 HorizontalAlignment="Right"
                 DockPanel.Dock="Right"
-                Theme="{DynamicResource CompactTextBox}"
-                Classes.accent="{DynamicResource UseAccentControls}">
+                Theme="{DynamicResource CompactTextBox}">
                 <Interaction.Behaviors>
                     <behaviors:LostFocusUpdateBindingBehavior Text="{Binding ConfigurationTransitionOffset, Converter={x:Static converters:FractionToPercentageStringConverter.Instance}}" />
                 </Interaction.Behaviors>
@@ -179,7 +168,6 @@
             Maximum="1"
             Minimum="0"
             SmallChange="0.01"
-            Value="{Binding ConfigurationTransitionOffset}"
-            Classes.accent="{DynamicResource UseAccentControls}" />
+            Value="{Binding ConfigurationTransitionOffset}" />
     </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/LightBulb/Views/Components/Settings/LocationSettingsTabView.axaml b/LightBulb/Views/Components/Settings/LocationSettingsTabView.axaml
index 86edeb4..7a55f83 100644
--- a/LightBulb/Views/Components/Settings/LocationSettingsTabView.axaml
+++ b/LightBulb/Views/Components/Settings/LocationSettingsTabView.axaml
@@ -18,15 +18,13 @@
                 Content="Manual"
                 DockPanel.Dock="Left"
                 IsChecked="{Binding IsManualSunriseSunsetEnabled}"
-                ToolTip.Tip="Configure sunrise and sunset manually"
-                Classes.accent="{DynamicResource UseAccentControls}" />
+                ToolTip.Tip="Configure sunrise and sunset manually" />
             <RadioButton
                 HorizontalAlignment="Right"
                 Content="Location-based"
                 DockPanel.Dock="Right"
                 IsChecked="{Binding !IsManualSunriseSunsetEnabled}"
-                ToolTip.Tip="Configure your location and use it to automatically calculate the sunrise and sunset times"
-                Classes.accent="{DynamicResource UseAccentControls}" />
+                ToolTip.Tip="Configure your location and use it to automatically calculate the sunrise and sunset times" />
         </DockPanel>
 
         <!--  Manual  -->
@@ -41,8 +39,7 @@
                     MinWidth="24"
                     HorizontalAlignment="Right"
                     DockPanel.Dock="Right"
-                    Theme="{DynamicResource CompactTextBox}"
-                    Classes.accent="{DynamicResource UseAccentControls}">
+                    Theme="{DynamicResource CompactTextBox}">
                     <Interaction.Behaviors>
                         <behaviors:LostFocusUpdateBindingBehavior Text="{Binding ManualSunrise, Converter={x:Static converters:TimeOnlyToStringConverter.Instance}}" />
                     </Interaction.Behaviors>
@@ -54,8 +51,7 @@
                 Maximum="23.99999"
                 Minimum="0"
                 SmallChange="0.25"
-                Value="{Binding ManualSunrise, Converter={x:Static converters:TimeOnlyToHoursDoubleConverter.Instance}}"
-                Classes.accent="{DynamicResource UseAccentControls}" />
+                Value="{Binding ManualSunrise, Converter={x:Static converters:TimeOnlyToHoursDoubleConverter.Instance}}" />
 
             <!--  Sunset time  -->
             <DockPanel Margin="0,16,0,0">
@@ -64,8 +60,7 @@
                     MinWidth="24"
                     HorizontalAlignment="Right"
                     DockPanel.Dock="Right"
-                    Theme="{DynamicResource CompactTextBox}"
-                    Classes.accent="{DynamicResource UseAccentControls}">
+                    Theme="{DynamicResource CompactTextBox}">
                     <Interaction.Behaviors>
                         <behaviors:LostFocusUpdateBindingBehavior Text="{Binding ManualSunset, Converter={x:Static converters:TimeOnlyToStringConverter.Instance}}" />
                     </Interaction.Behaviors>
@@ -77,8 +72,7 @@
                 Maximum="23.99999"
                 Minimum="0"
                 SmallChange="0.25"
-                Value="{Binding ManualSunset, Converter={x:Static converters:TimeOnlyToHoursDoubleConverter.Instance}}"
-                Classes.accent="{DynamicResource UseAccentControls}" />
+                Value="{Binding ManualSunset, Converter={x:Static converters:TimeOnlyToHoursDoubleConverter.Instance}}" />
         </StackPanel>
 
         <!--  Location-based  -->
@@ -110,8 +104,7 @@
                     VerticalAlignment="Center"
                     IsEnabled="{Binding !IsBusy}"
                     Text="{Binding LocationQuery}"
-                    Theme="{DynamicResource CompactTextBox}"
-                    Classes.accent="{DynamicResource UseAccentControls}">
+                    Theme="{DynamicResource CompactTextBox}">
                     <ToolTip.Tip>
                         <TextBlock>
                             <Run Text="Specify your location using geographic coordinates or a search query" />
diff --git a/LightBulb/Views/Controls/HotKeyTextBox.axaml b/LightBulb/Views/Controls/HotKeyTextBox.axaml
index 2c81dd7..7777ecf 100644
--- a/LightBulb/Views/Controls/HotKeyTextBox.axaml
+++ b/LightBulb/Views/Controls/HotKeyTextBox.axaml
@@ -8,6 +8,5 @@
         IsUndoEnabled="False"
         Text="{Binding $parent[UserControl].HotKey, Mode=OneWay}"
         TextAlignment="Center"
-        Theme="{DynamicResource CompactTextBox}"
-        Classes.accent="{DynamicResource UseAccentControls}" />
+        Theme="{DynamicResource CompactTextBox}" />
 </UserControl>
diff --git a/LightBulb/Views/Dialogs/SettingsView.axaml b/LightBulb/Views/Dialogs/SettingsView.axaml
index 9412346..05facd5 100644
--- a/LightBulb/Views/Dialogs/SettingsView.axaml
+++ b/LightBulb/Views/Dialogs/SettingsView.axaml
@@ -16,8 +16,8 @@
         <Border
             Grid.Column="0"
             VerticalAlignment="Stretch"
-            Background="{DynamicResource MaterialPrimaryMidBrush}">
-            <ItemsControl Background="{DynamicResource MaterialPrimaryMidBrush}" ItemsSource="{Binding Tabs}">
+            Background="{DynamicResource MaterialDarkBackgroundBrush}">
+            <ItemsControl ItemsSource="{Binding Tabs}">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
                         <Border BorderThickness="0,0,2,0" Classes.active="{Binding IsActive}">
@@ -45,11 +45,13 @@
             </ItemsControl>
         </Border>
 
-        <Grid Grid.Column="1" RowDefinitions="*,Auto,Auto">
+        <Grid
+            Grid.Column="1"
+            Background="{DynamicResource MaterialCardBackgroundBrush}"
+            RowDefinitions="*,Auto,Auto">
             <!--  Active settings tab  -->
             <ScrollViewer
                 Grid.Row="0"
-                Background="{DynamicResource MaterialCardBackgroundBrush}"
                 HorizontalScrollBarVisibility="Disabled"
                 VerticalScrollBarVisibility="Auto">
                 <ContentControl Margin="0,0,8,16" Content="{Binding ActiveTab}" />
diff --git a/LightBulb/Views/MainView.axaml b/LightBulb/Views/MainView.axaml
index 0d8b759..c137fd9 100644
--- a/LightBulb/Views/MainView.axaml
+++ b/LightBulb/Views/MainView.axaml
@@ -21,7 +21,10 @@
         <viewModels:MainViewModel />
     </Design.DataContext>
 
-    <Border BorderBrush="{DynamicResource MaterialPrimaryLightBrush}" BorderThickness="1">
+    <Border
+        Background="{DynamicResource MaterialCardBackgroundBrush}"
+        BorderBrush="{DynamicResource MaterialDividerBrush}"
+        BorderThickness="1">
         <dialogHostAvalonia:DialogHost
             x:Name="DialogHost"
             CloseOnClickAway="False"
@@ -32,10 +35,9 @@
                     x:Name="HeaderBorder"
                     Grid.Row="0"
                     Padding="8,12"
-                    Background="{DynamicResource MaterialPrimaryMidBrush}"
+                    Background="{DynamicResource MaterialDarkBackgroundBrush}"
                     PointerPressed="HeaderBorder_OnPointerPressed">
                     <Grid ColumnDefinitions="Auto,Auto,*,Auto">
-                        <Border Background="{DynamicResource MaterialSecondaryMidBrush}" Width="32" Height="32" CornerRadius="32" />
                         <!--  On/Off button and logo  -->
                         <ToggleButton
                             Grid.Column="0"
@@ -43,10 +45,11 @@
                             Height="32"
                             Padding="0"
                             VerticalAlignment="Center"
+                            Background="{DynamicResource MaterialSecondaryMidBrush}"
+                            Foreground="{DynamicResource MaterialSecondaryMidForegroundBrush}"
                             IsChecked="{Binding Dashboard.IsEnabled}"
                             Theme="{DynamicResource MaterialIconToggleButton}"
-                            ToolTip.Tip="Toggle LightBulb on/off"
-                            Classes="primary">
+                            ToolTip.Tip="Toggle LightBulb on/off">
                             <ToggleButton.Content>
                                 <materialIcons:MaterialIcon Width="24" Height="24">
                                     <materialIcons:MaterialIcon.Styles>
@@ -68,7 +71,7 @@
                             Margin="8,1,0,0"
                             VerticalAlignment="Center"
                             FontSize="16"
-                            Foreground="{DynamicResource MaterialPrimaryMidForegroundBrush}">
+                            Foreground="{DynamicResource MaterialDarkForegroundBrush}">
                             <Run
                                 FontSize="19"
                                 FontWeight="Medium"