From 16a002189593c294850eefe4129553639124ea9b Mon Sep 17 00:00:00 2001
From: Daniel Chalmers <daniel.chalmers@outlook.com>
Date: Sun, 28 Dec 2025 10:12:37 -0600
Subject: [PATCH 1/5] Add option to follow Windows theme

Closes #83
---
 DesktopClock/MainWindow.xaml        |   6 +-
 DesktopClock/Properties/Settings.cs | 154 +++++++++++++++++++++++++++-
 DesktopClock/SettingsWindow.xaml    |  97 ++++++++++--------
 3 files changed, 212 insertions(+), 45 deletions(-)

diff --git a/DesktopClock/MainWindow.xaml b/DesktopClock/MainWindow.xaml
index 32297ea..75001a9 100644
--- a/DesktopClock/MainWindow.xaml
+++ b/DesktopClock/MainWindow.xaml
@@ -111,7 +111,7 @@
                                 <Setter Property="Background">
                                     <Setter.Value>
                                         <SolidColorBrush Opacity="{Binding BackgroundOpacity, Source={x:Static p:Settings.Default}, Mode=OneWay}"
-                                                         Color="{Binding OuterColor, Source={x:Static p:Settings.Default}, Mode=OneWay}" />
+                                                         Color="{Binding EffectiveOuterColor, Source={x:Static p:Settings.Default}, Mode=OneWay}" />
                                     </Setter.Value>
                                 </Setter>
                             </MultiDataTrigger.Setters>
@@ -126,7 +126,7 @@
 
                 <local:OutlinedTextBlock.Fill>
                     <SolidColorBrush Opacity="{Binding TextOpacity, Source={x:Static p:Settings.Default}, Mode=OneWay}"
-                                     Color="{Binding TextColor, Source={x:Static p:Settings.Default}, Mode=OneWay}" />
+                                     Color="{Binding EffectiveTextColor, Source={x:Static p:Settings.Default}, Mode=OneWay}" />
                 </local:OutlinedTextBlock.Fill>
 
                 <local:OutlinedTextBlock.Style>
@@ -141,7 +141,7 @@
                                     <Setter Property="Stroke">
                                         <Setter.Value>
                                             <SolidColorBrush Opacity="{Binding BackgroundOpacity, Source={x:Static p:Settings.Default}, Mode=OneWay}"
-                                                             Color="{Binding OuterColor, Source={x:Static p:Settings.Default}, Mode=OneWay}" />
+                                                             Color="{Binding EffectiveOuterColor, Source={x:Static p:Settings.Default}, Mode=OneWay}" />
                                         </Setter.Value>
                                     </Setter>
 
diff --git a/DesktopClock/Properties/Settings.cs b/DesktopClock/Properties/Settings.cs
index 6c83d13..b729e60 100644
--- a/DesktopClock/Properties/Settings.cs
+++ b/DesktopClock/Properties/Settings.cs
@@ -1,7 +1,9 @@
 using System;
 using System.ComponentModel;
 using System.IO;
+using System.Windows;
 using System.Windows.Media;
+using Microsoft.Win32;
 using Newtonsoft.Json;
 using WpfWindowPlacement;
 
@@ -10,6 +12,11 @@ namespace DesktopClock.Properties;
 public sealed class Settings : INotifyPropertyChanged, IDisposable
 {
     private readonly FileSystemWatcher _watcher;
+    private bool _followSystemTheme;
+    private bool _systemThemeIsLight = true;
+    private Color _systemAccentColor = DefaultAccentColor;
+    private Color _textColor = Color.FromRgb(33, 33, 33);
+    private Color _outerColor = Color.FromRgb(247, 247, 247);
 
     private static readonly Lazy<Settings> _default = new(LoadAndAttemptSave);
 
@@ -25,6 +32,11 @@ public sealed class Settings : INotifyPropertyChanged, IDisposable
     public static readonly double MaxSizeLog = 6.5;
 
     public static readonly double MinSizeLog = 2.7;
+    private static readonly Color DefaultAccentColor = Color.FromRgb(0, 120, 215);
+    private static readonly Color LightThemeOuterColor = Color.FromRgb(247, 247, 247);
+    private static readonly Color DarkThemeOuterColor = Color.FromRgb(32, 32, 32);
+    private const string PersonalizeKeyPath = @"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize";
+    private const string AppsUseLightThemeValueName = "AppsUseLightTheme";
 
     static Settings()
     {
@@ -42,6 +54,10 @@ private Settings()
             EnableRaisingEvents = true,
         };
         _watcher.Changed += FileChanged;
+
+        RefreshSystemThemeColors(notifyIfFollowing: false);
+        SystemEvents.UserPreferenceChanged += SystemEvents_UserPreferenceChanged;
+        SystemParameters.StaticPropertyChanged += SystemParameters_StaticPropertyChanged;
     }
 
 #pragma warning disable CS0067 // The event 'Settings.PropertyChanged' is never used. Handled by Fody.
@@ -122,7 +138,19 @@ private Settings()
     /// <summary>
     /// Text color for the clock's text.
     /// </summary>
-    public Color TextColor { get; set; } = Color.FromRgb(33, 33, 33);
+    public Color TextColor
+    {
+        get => _textColor;
+        set
+        {
+            if (_textColor.Equals(value))
+                return;
+
+            _textColor = value;
+            NotifyPropertyChanged(nameof(TextColor));
+            NotifyEffectiveThemeChanged();
+        }
+    }
 
     /// <summary>
     /// Opacity of the text.
@@ -132,7 +160,51 @@ private Settings()
     /// <summary>
     /// The outer color, for either the background or the outline.
     /// </summary>
-    public Color OuterColor { get; set; } = Color.FromRgb(247, 247, 247);
+    public Color OuterColor
+    {
+        get => _outerColor;
+        set
+        {
+            if (_outerColor.Equals(value))
+                return;
+
+            _outerColor = value;
+            NotifyPropertyChanged(nameof(OuterColor));
+            NotifyEffectiveThemeChanged();
+        }
+    }
+
+    /// <summary>
+    /// Follow the system theme and accent color.
+    /// </summary>
+    public bool FollowSystemTheme
+    {
+        get => _followSystemTheme;
+        set
+        {
+            if (_followSystemTheme == value)
+                return;
+
+            _followSystemTheme = value;
+            NotifyPropertyChanged(nameof(FollowSystemTheme));
+            RefreshSystemThemeColors(notifyIfFollowing: false);
+            NotifyEffectiveThemeChanged();
+        }
+    }
+
+    /// <summary>
+    /// Effective text color based on theme-following preference.
+    /// </summary>
+    [JsonIgnore]
+    public Color EffectiveTextColor => FollowSystemTheme ? _systemAccentColor : TextColor;
+
+    /// <summary>
+    /// Effective outer color based on theme-following preference.
+    /// </summary>
+    [JsonIgnore]
+    public Color EffectiveOuterColor => FollowSystemTheme
+        ? (_systemThemeIsLight ? LightThemeOuterColor : DarkThemeOuterColor)
+        : OuterColor;
 
     /// <summary>
     /// Shows a solid background instead of an outline.
@@ -382,6 +454,84 @@ public void ScaleHeight(double steps)
         Height = (int)exp;
     }
 
+    private void SystemEvents_UserPreferenceChanged(object sender, UserPreferenceChangedEventArgs e)
+    {
+        if (!FollowSystemTheme)
+            return;
+
+        if (e.Category == UserPreferenceCategory.General ||
+            e.Category == UserPreferenceCategory.Color ||
+            e.Category == UserPreferenceCategory.VisualStyle)
+        {
+            RefreshSystemThemeColors(notifyIfFollowing: true);
+        }
+    }
+
+    private void SystemParameters_StaticPropertyChanged(object sender, PropertyChangedEventArgs e)
+    {
+        if (!FollowSystemTheme)
+            return;
+
+        if (e.PropertyName == nameof(SystemParameters.WindowGlassColor))
+        {
+            RefreshSystemThemeColors(notifyIfFollowing: true);
+        }
+    }
+
+    private void RefreshSystemThemeColors(bool notifyIfFollowing)
+    {
+        var dispatcher = Application.Current?.Dispatcher;
+        if (dispatcher != null && !dispatcher.CheckAccess())
+        {
+            dispatcher.BeginInvoke(new Action(() => RefreshSystemThemeColors(notifyIfFollowing)));
+            return;
+        }
+
+        var isLightTheme = GetSystemThemeIsLight();
+        var accentColor = GetSystemAccentColor();
+        var themeChanged = isLightTheme != _systemThemeIsLight;
+        var accentChanged = !_systemAccentColor.Equals(accentColor);
+
+        _systemThemeIsLight = isLightTheme;
+        _systemAccentColor = accentColor;
+
+        if (notifyIfFollowing && (themeChanged || accentChanged) && FollowSystemTheme)
+        {
+            NotifyEffectiveThemeChanged();
+        }
+    }
+
+    private static bool GetSystemThemeIsLight()
+    {
+        var value = Registry.GetValue(PersonalizeKeyPath, AppsUseLightThemeValueName, 1);
+        return value switch
+        {
+            int intValue => intValue > 0,
+            byte byteValue => byteValue > 0,
+            _ => true,
+        };
+    }
+
+    private static Color GetSystemAccentColor()
+    {
+        var accent = SystemParameters.WindowGlassColor;
+        if (accent.A == 0)
+            return DefaultAccentColor;
+
+        return Color.FromArgb(255, accent.R, accent.G, accent.B);
+    }
+
+    private void NotifyEffectiveThemeChanged()
+    {
+        NotifyPropertyChanged(nameof(EffectiveTextColor));
+        NotifyPropertyChanged(nameof(EffectiveOuterColor));
+    }
+
+    private void NotifyPropertyChanged(string propertyName)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
+
     public void Dispose()
     {
         // We don't dispose of the watcher anymore because it would actually hang indefinitely if you had multiple instances of the same clock open.
diff --git a/DesktopClock/SettingsWindow.xaml b/DesktopClock/SettingsWindow.xaml
index 81766b2..ed472bc 100644
--- a/DesktopClock/SettingsWindow.xaml
+++ b/DesktopClock/SettingsWindow.xaml
@@ -44,6 +44,16 @@
             <Setter Property="Margin" Value="0,0,0,4" />
         </Style>
 
+        <Style x:Key="DisableWhenFollowingSystemTheme"
+               TargetType="StackPanel">
+            <Setter Property="IsEnabled" Value="True" />
+            <Style.Triggers>
+                <DataTrigger Binding="{Binding Settings.FollowSystemTheme}" Value="True">
+                    <Setter Property="IsEnabled" Value="False" />
+                </DataTrigger>
+            </Style.Triggers>
+        </Style>
+
         <Style x:Key="LabelTextBlock"
                TargetType="TextBlock">
             <Setter Property="FontWeight" Value="SemiBold" />
@@ -150,6 +160,11 @@
             <ScrollViewer VerticalScrollBarVisibility="Auto"
                           Padding="0">
                 <StackPanel>
+                    <CheckBox Content="Follow system theme and accent color"
+                              IsChecked="{Binding Settings.FollowSystemTheme, Mode=TwoWay}" />
+                    <TextBlock Text="Use Windows light/dark mode and your accent color for the clock."
+                               Style="{StaticResource DescriptionTextBlock}" />
+
                     <TextBlock Text="Font Family:"
                                Style="{StaticResource LabelTextBlock}" />
                     <ComboBox ItemsSource="{Binding FontFamilies}"
@@ -178,45 +193,47 @@
                     <TextBlock Text="Change text to uppercase or lowercase."
                                Style="{StaticResource DescriptionTextBlock}" />
 
-                    <TextBlock Text="Text Color:"
-                               Style="{StaticResource LabelTextBlock}" />
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="4" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-
-                        <TextBox Text="{Binding Settings.TextColor, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                 Grid.Column="0" />
-                        <Button Content="Pick..."
-                                Click="PickTextColor"
-                                Grid.Column="2" />
-                    </Grid>
-                    <TextBlock Text="Change the color of the text (hex code or name)."
-                               Style="{StaticResource DescriptionTextBlock}" />
-
-                    <TextBlock Text="Text Opacity:"
-                               Style="{StaticResource LabelTextBlock}" />
-                    <Grid Margin="0,0,0,4">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="30" />
-                        </Grid.ColumnDefinitions>
-                        <Slider Value="{Binding Settings.TextOpacity, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                Minimum="0"
-                                Maximum="1"
-                                TickFrequency="0.01"
-                                IsSnapToTickEnabled="True"
-                                Grid.Column="0"
-                                Margin="0" />
-                        <TextBlock Text="{Binding Settings.TextOpacity, StringFormat=0.00}"
-                                   VerticalAlignment="Center"
-                                   HorizontalAlignment="Right"
-                                   Grid.Column="1" />
-                    </Grid>
-                    <TextBlock Text="Adjust how transparent the text is."
-                               Style="{StaticResource DescriptionTextBlock}" />
+                    <StackPanel Style="{StaticResource DisableWhenFollowingSystemTheme}">
+                        <TextBlock Text="Text Color:"
+                                   Style="{StaticResource LabelTextBlock}" />
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="4" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+
+                            <TextBox Text="{Binding Settings.TextColor, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                     Grid.Column="0" />
+                            <Button Content="Pick..."
+                                    Click="PickTextColor"
+                                    Grid.Column="2" />
+                        </Grid>
+                        <TextBlock Text="Change the color of the text (hex code or name)."
+                                   Style="{StaticResource DescriptionTextBlock}" />
+
+                        <TextBlock Text="Text Opacity:"
+                                   Style="{StaticResource LabelTextBlock}" />
+                        <Grid Margin="0,0,0,4">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="30" />
+                            </Grid.ColumnDefinitions>
+                            <Slider Value="{Binding Settings.TextOpacity, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                    Minimum="0"
+                                    Maximum="1"
+                                    TickFrequency="0.01"
+                                    IsSnapToTickEnabled="True"
+                                    Grid.Column="0"
+                                    Margin="0" />
+                            <TextBlock Text="{Binding Settings.TextOpacity, StringFormat=0.00}"
+                                       VerticalAlignment="Center"
+                                       HorizontalAlignment="Right"
+                                       Grid.Column="1" />
+                        </Grid>
+                        <TextBlock Text="Adjust how transparent the text is."
+                                   Style="{StaticResource DescriptionTextBlock}" />
+                    </StackPanel>
                 </StackPanel>
             </ScrollViewer>
         </TabItem>
@@ -224,7 +241,7 @@
         <TabItem Header="_Background">
             <ScrollViewer VerticalScrollBarVisibility="Auto"
                           Padding="0">
-                <StackPanel>
+                <StackPanel Style="{StaticResource DisableWhenFollowingSystemTheme}">
                     <TextBlock Text="Background/Outline Color:"
                                Style="{StaticResource LabelTextBlock}" />
                     <Grid>

From 3448b044af26bbd4df9164f5b5fdc8c3d7a8cdbe Mon Sep 17 00:00:00 2001
From: Daniel Chalmers <daniel.chalmers@outlook.com>
Date: Sun, 28 Dec 2025 10:53:33 -0600
Subject: [PATCH 2/5] change defaults instead of adding a new setting

---
 DesktopClock/MainWindow.xaml                 |   6 +-
 DesktopClock/Properties/Settings.cs          | 160 ++-----------------
 DesktopClock/SettingsWindow.xaml             |  97 +++++------
 DesktopClock/Utilities/SystemThemeService.cs |  55 +++++++
 4 files changed, 110 insertions(+), 208 deletions(-)
 create mode 100644 DesktopClock/Utilities/SystemThemeService.cs

diff --git a/DesktopClock/MainWindow.xaml b/DesktopClock/MainWindow.xaml
index 75001a9..32297ea 100644
--- a/DesktopClock/MainWindow.xaml
+++ b/DesktopClock/MainWindow.xaml
@@ -111,7 +111,7 @@
                                 <Setter Property="Background">
                                     <Setter.Value>
                                         <SolidColorBrush Opacity="{Binding BackgroundOpacity, Source={x:Static p:Settings.Default}, Mode=OneWay}"
-                                                         Color="{Binding EffectiveOuterColor, Source={x:Static p:Settings.Default}, Mode=OneWay}" />
+                                                         Color="{Binding OuterColor, Source={x:Static p:Settings.Default}, Mode=OneWay}" />
                                     </Setter.Value>
                                 </Setter>
                             </MultiDataTrigger.Setters>
@@ -126,7 +126,7 @@
 
                 <local:OutlinedTextBlock.Fill>
                     <SolidColorBrush Opacity="{Binding TextOpacity, Source={x:Static p:Settings.Default}, Mode=OneWay}"
-                                     Color="{Binding EffectiveTextColor, Source={x:Static p:Settings.Default}, Mode=OneWay}" />
+                                     Color="{Binding TextColor, Source={x:Static p:Settings.Default}, Mode=OneWay}" />
                 </local:OutlinedTextBlock.Fill>
 
                 <local:OutlinedTextBlock.Style>
@@ -141,7 +141,7 @@
                                     <Setter Property="Stroke">
                                         <Setter.Value>
                                             <SolidColorBrush Opacity="{Binding BackgroundOpacity, Source={x:Static p:Settings.Default}, Mode=OneWay}"
-                                                             Color="{Binding EffectiveOuterColor, Source={x:Static p:Settings.Default}, Mode=OneWay}" />
+                                                             Color="{Binding OuterColor, Source={x:Static p:Settings.Default}, Mode=OneWay}" />
                                         </Setter.Value>
                                     </Setter>
 
diff --git a/DesktopClock/Properties/Settings.cs b/DesktopClock/Properties/Settings.cs
index b729e60..3153a2c 100644
--- a/DesktopClock/Properties/Settings.cs
+++ b/DesktopClock/Properties/Settings.cs
@@ -1,10 +1,9 @@
 using System;
 using System.ComponentModel;
 using System.IO;
-using System.Windows;
 using System.Windows.Media;
-using Microsoft.Win32;
 using Newtonsoft.Json;
+using DesktopClock.Utilities;
 using WpfWindowPlacement;
 
 namespace DesktopClock.Properties;
@@ -12,11 +11,6 @@ namespace DesktopClock.Properties;
 public sealed class Settings : INotifyPropertyChanged, IDisposable
 {
     private readonly FileSystemWatcher _watcher;
-    private bool _followSystemTheme;
-    private bool _systemThemeIsLight = true;
-    private Color _systemAccentColor = DefaultAccentColor;
-    private Color _textColor = Color.FromRgb(33, 33, 33);
-    private Color _outerColor = Color.FromRgb(247, 247, 247);
 
     private static readonly Lazy<Settings> _default = new(LoadAndAttemptSave);
 
@@ -32,12 +26,6 @@ public sealed class Settings : INotifyPropertyChanged, IDisposable
     public static readonly double MaxSizeLog = 6.5;
 
     public static readonly double MinSizeLog = 2.7;
-    private static readonly Color DefaultAccentColor = Color.FromRgb(0, 120, 215);
-    private static readonly Color LightThemeOuterColor = Color.FromRgb(247, 247, 247);
-    private static readonly Color DarkThemeOuterColor = Color.FromRgb(32, 32, 32);
-    private const string PersonalizeKeyPath = @"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize";
-    private const string AppsUseLightThemeValueName = "AppsUseLightTheme";
-
     static Settings()
     {
         // Settings file path from the same directory as the executable.
@@ -54,10 +42,6 @@ private Settings()
             EnableRaisingEvents = true,
         };
         _watcher.Changed += FileChanged;
-
-        RefreshSystemThemeColors(notifyIfFollowing: false);
-        SystemEvents.UserPreferenceChanged += SystemEvents_UserPreferenceChanged;
-        SystemParameters.StaticPropertyChanged += SystemParameters_StaticPropertyChanged;
     }
 
 #pragma warning disable CS0067 // The event 'Settings.PropertyChanged' is never used. Handled by Fody.
@@ -138,19 +122,7 @@ private Settings()
     /// <summary>
     /// Text color for the clock's text.
     /// </summary>
-    public Color TextColor
-    {
-        get => _textColor;
-        set
-        {
-            if (_textColor.Equals(value))
-                return;
-
-            _textColor = value;
-            NotifyPropertyChanged(nameof(TextColor));
-            NotifyEffectiveThemeChanged();
-        }
-    }
+    public Color TextColor { get; set; } = Color.FromRgb(33, 33, 33);
 
     /// <summary>
     /// Opacity of the text.
@@ -160,51 +132,7 @@ public Color TextColor
     /// <summary>
     /// The outer color, for either the background or the outline.
     /// </summary>
-    public Color OuterColor
-    {
-        get => _outerColor;
-        set
-        {
-            if (_outerColor.Equals(value))
-                return;
-
-            _outerColor = value;
-            NotifyPropertyChanged(nameof(OuterColor));
-            NotifyEffectiveThemeChanged();
-        }
-    }
-
-    /// <summary>
-    /// Follow the system theme and accent color.
-    /// </summary>
-    public bool FollowSystemTheme
-    {
-        get => _followSystemTheme;
-        set
-        {
-            if (_followSystemTheme == value)
-                return;
-
-            _followSystemTheme = value;
-            NotifyPropertyChanged(nameof(FollowSystemTheme));
-            RefreshSystemThemeColors(notifyIfFollowing: false);
-            NotifyEffectiveThemeChanged();
-        }
-    }
-
-    /// <summary>
-    /// Effective text color based on theme-following preference.
-    /// </summary>
-    [JsonIgnore]
-    public Color EffectiveTextColor => FollowSystemTheme ? _systemAccentColor : TextColor;
-
-    /// <summary>
-    /// Effective outer color based on theme-following preference.
-    /// </summary>
-    [JsonIgnore]
-    public Color EffectiveOuterColor => FollowSystemTheme
-        ? (_systemThemeIsLight ? LightThemeOuterColor : DarkThemeOuterColor)
-        : OuterColor;
+    public Color OuterColor { get; set; } = Color.FromRgb(247, 247, 247);
 
     /// <summary>
     /// Shows a solid background instead of an outline.
@@ -421,6 +349,11 @@ private static Settings LoadAndAttemptSave()
     {
         var settings = LoadFromFile();
 
+        if (!File.Exists(FilePath))
+        {
+            settings.ApplySystemThemeDefaultsIfAvailable();
+        }
+
         CanBeSaved = settings.Save();
 
         return settings;
@@ -454,82 +387,13 @@ public void ScaleHeight(double steps)
         Height = (int)exp;
     }
 
-    private void SystemEvents_UserPreferenceChanged(object sender, UserPreferenceChangedEventArgs e)
+    private void ApplySystemThemeDefaultsIfAvailable()
     {
-        if (!FollowSystemTheme)
+        if (!SystemThemeService.TryGetThemeDefaults(out var textColor, out var outerColor))
             return;
 
-        if (e.Category == UserPreferenceCategory.General ||
-            e.Category == UserPreferenceCategory.Color ||
-            e.Category == UserPreferenceCategory.VisualStyle)
-        {
-            RefreshSystemThemeColors(notifyIfFollowing: true);
-        }
-    }
-
-    private void SystemParameters_StaticPropertyChanged(object sender, PropertyChangedEventArgs e)
-    {
-        if (!FollowSystemTheme)
-            return;
-
-        if (e.PropertyName == nameof(SystemParameters.WindowGlassColor))
-        {
-            RefreshSystemThemeColors(notifyIfFollowing: true);
-        }
-    }
-
-    private void RefreshSystemThemeColors(bool notifyIfFollowing)
-    {
-        var dispatcher = Application.Current?.Dispatcher;
-        if (dispatcher != null && !dispatcher.CheckAccess())
-        {
-            dispatcher.BeginInvoke(new Action(() => RefreshSystemThemeColors(notifyIfFollowing)));
-            return;
-        }
-
-        var isLightTheme = GetSystemThemeIsLight();
-        var accentColor = GetSystemAccentColor();
-        var themeChanged = isLightTheme != _systemThemeIsLight;
-        var accentChanged = !_systemAccentColor.Equals(accentColor);
-
-        _systemThemeIsLight = isLightTheme;
-        _systemAccentColor = accentColor;
-
-        if (notifyIfFollowing && (themeChanged || accentChanged) && FollowSystemTheme)
-        {
-            NotifyEffectiveThemeChanged();
-        }
-    }
-
-    private static bool GetSystemThemeIsLight()
-    {
-        var value = Registry.GetValue(PersonalizeKeyPath, AppsUseLightThemeValueName, 1);
-        return value switch
-        {
-            int intValue => intValue > 0,
-            byte byteValue => byteValue > 0,
-            _ => true,
-        };
-    }
-
-    private static Color GetSystemAccentColor()
-    {
-        var accent = SystemParameters.WindowGlassColor;
-        if (accent.A == 0)
-            return DefaultAccentColor;
-
-        return Color.FromArgb(255, accent.R, accent.G, accent.B);
-    }
-
-    private void NotifyEffectiveThemeChanged()
-    {
-        NotifyPropertyChanged(nameof(EffectiveTextColor));
-        NotifyPropertyChanged(nameof(EffectiveOuterColor));
-    }
-
-    private void NotifyPropertyChanged(string propertyName)
-    {
-        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        TextColor = textColor;
+        OuterColor = outerColor;
     }
 
     public void Dispose()
diff --git a/DesktopClock/SettingsWindow.xaml b/DesktopClock/SettingsWindow.xaml
index ed472bc..81766b2 100644
--- a/DesktopClock/SettingsWindow.xaml
+++ b/DesktopClock/SettingsWindow.xaml
@@ -44,16 +44,6 @@
             <Setter Property="Margin" Value="0,0,0,4" />
         </Style>
 
-        <Style x:Key="DisableWhenFollowingSystemTheme"
-               TargetType="StackPanel">
-            <Setter Property="IsEnabled" Value="True" />
-            <Style.Triggers>
-                <DataTrigger Binding="{Binding Settings.FollowSystemTheme}" Value="True">
-                    <Setter Property="IsEnabled" Value="False" />
-                </DataTrigger>
-            </Style.Triggers>
-        </Style>
-
         <Style x:Key="LabelTextBlock"
                TargetType="TextBlock">
             <Setter Property="FontWeight" Value="SemiBold" />
@@ -160,11 +150,6 @@
             <ScrollViewer VerticalScrollBarVisibility="Auto"
                           Padding="0">
                 <StackPanel>
-                    <CheckBox Content="Follow system theme and accent color"
-                              IsChecked="{Binding Settings.FollowSystemTheme, Mode=TwoWay}" />
-                    <TextBlock Text="Use Windows light/dark mode and your accent color for the clock."
-                               Style="{StaticResource DescriptionTextBlock}" />
-
                     <TextBlock Text="Font Family:"
                                Style="{StaticResource LabelTextBlock}" />
                     <ComboBox ItemsSource="{Binding FontFamilies}"
@@ -193,47 +178,45 @@
                     <TextBlock Text="Change text to uppercase or lowercase."
                                Style="{StaticResource DescriptionTextBlock}" />
 
-                    <StackPanel Style="{StaticResource DisableWhenFollowingSystemTheme}">
-                        <TextBlock Text="Text Color:"
-                                   Style="{StaticResource LabelTextBlock}" />
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="4" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-
-                            <TextBox Text="{Binding Settings.TextColor, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                     Grid.Column="0" />
-                            <Button Content="Pick..."
-                                    Click="PickTextColor"
-                                    Grid.Column="2" />
-                        </Grid>
-                        <TextBlock Text="Change the color of the text (hex code or name)."
-                                   Style="{StaticResource DescriptionTextBlock}" />
-
-                        <TextBlock Text="Text Opacity:"
-                                   Style="{StaticResource LabelTextBlock}" />
-                        <Grid Margin="0,0,0,4">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="30" />
-                            </Grid.ColumnDefinitions>
-                            <Slider Value="{Binding Settings.TextOpacity, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                    Minimum="0"
-                                    Maximum="1"
-                                    TickFrequency="0.01"
-                                    IsSnapToTickEnabled="True"
-                                    Grid.Column="0"
-                                    Margin="0" />
-                            <TextBlock Text="{Binding Settings.TextOpacity, StringFormat=0.00}"
-                                       VerticalAlignment="Center"
-                                       HorizontalAlignment="Right"
-                                       Grid.Column="1" />
-                        </Grid>
-                        <TextBlock Text="Adjust how transparent the text is."
-                                   Style="{StaticResource DescriptionTextBlock}" />
-                    </StackPanel>
+                    <TextBlock Text="Text Color:"
+                               Style="{StaticResource LabelTextBlock}" />
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="4" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <TextBox Text="{Binding Settings.TextColor, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                 Grid.Column="0" />
+                        <Button Content="Pick..."
+                                Click="PickTextColor"
+                                Grid.Column="2" />
+                    </Grid>
+                    <TextBlock Text="Change the color of the text (hex code or name)."
+                               Style="{StaticResource DescriptionTextBlock}" />
+
+                    <TextBlock Text="Text Opacity:"
+                               Style="{StaticResource LabelTextBlock}" />
+                    <Grid Margin="0,0,0,4">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="30" />
+                        </Grid.ColumnDefinitions>
+                        <Slider Value="{Binding Settings.TextOpacity, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                Minimum="0"
+                                Maximum="1"
+                                TickFrequency="0.01"
+                                IsSnapToTickEnabled="True"
+                                Grid.Column="0"
+                                Margin="0" />
+                        <TextBlock Text="{Binding Settings.TextOpacity, StringFormat=0.00}"
+                                   VerticalAlignment="Center"
+                                   HorizontalAlignment="Right"
+                                   Grid.Column="1" />
+                    </Grid>
+                    <TextBlock Text="Adjust how transparent the text is."
+                               Style="{StaticResource DescriptionTextBlock}" />
                 </StackPanel>
             </ScrollViewer>
         </TabItem>
@@ -241,7 +224,7 @@
         <TabItem Header="_Background">
             <ScrollViewer VerticalScrollBarVisibility="Auto"
                           Padding="0">
-                <StackPanel Style="{StaticResource DisableWhenFollowingSystemTheme}">
+                <StackPanel>
                     <TextBlock Text="Background/Outline Color:"
                                Style="{StaticResource LabelTextBlock}" />
                     <Grid>
diff --git a/DesktopClock/Utilities/SystemThemeService.cs b/DesktopClock/Utilities/SystemThemeService.cs
new file mode 100644
index 0000000..4e480e1
--- /dev/null
+++ b/DesktopClock/Utilities/SystemThemeService.cs
@@ -0,0 +1,55 @@
+using System.Windows;
+using System.Windows.Media;
+using Microsoft.Win32;
+
+namespace DesktopClock.Utilities;
+
+public static class SystemThemeService
+{
+    private static readonly Color DefaultAccentColor = Color.FromRgb(0, 120, 215);
+    private static readonly Color LightThemeOuterColor = Color.FromRgb(247, 247, 247);
+    private static readonly Color DarkThemeOuterColor = Color.FromRgb(32, 32, 32);
+    private const string PersonalizeKeyPath = @"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize";
+    private const string AppsUseLightThemeValueName = "AppsUseLightTheme";
+
+    public static bool TryGetThemeDefaults(out Color textColor, out Color outerColor)
+    {
+        textColor = default;
+        outerColor = default;
+
+        if (!TryGetSystemThemeIsLight(out var isLightTheme))
+            return false;
+
+        textColor = GetSystemAccentColor();
+        outerColor = isLightTheme ? LightThemeOuterColor : DarkThemeOuterColor;
+        return true;
+    }
+
+    private static bool TryGetSystemThemeIsLight(out bool isLightTheme)
+    {
+        var value = Registry.GetValue(PersonalizeKeyPath, AppsUseLightThemeValueName, null);
+        if (value is null)
+        {
+            isLightTheme = true;
+            return false;
+        }
+
+        isLightTheme = value switch
+        {
+            int intValue => intValue > 0,
+            byte byteValue => byteValue > 0,
+            _ => true,
+        };
+
+        return true;
+    }
+
+    private static Color GetSystemAccentColor()
+    {
+        var accent = SystemParameters.WindowGlassColor;
+        if (accent.A == 0)
+            return DefaultAccentColor;
+
+        return Color.FromArgb(255, accent.R, accent.G, accent.B);
+    }
+}

From 6cadb0b4af32797b365142bd075fef86725d452b Mon Sep 17 00:00:00 2001
From: Daniel Chalmers <daniel.chalmers@outlook.com>
Date: Sun, 28 Dec 2025 11:31:56 -0600
Subject: [PATCH 3/5] fix color initialization

---
 DesktopClock/Utilities/SystemThemeService.cs | 109 ++++++++++++++++---
 1 file changed, 94 insertions(+), 15 deletions(-)

diff --git a/DesktopClock/Utilities/SystemThemeService.cs b/DesktopClock/Utilities/SystemThemeService.cs
index 4e480e1..b1fdf67 100644
--- a/DesktopClock/Utilities/SystemThemeService.cs
+++ b/DesktopClock/Utilities/SystemThemeService.cs
@@ -1,3 +1,4 @@
+using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Media;
 using Microsoft.Win32;
@@ -9,8 +10,11 @@ public static class SystemThemeService
     private static readonly Color DefaultAccentColor = Color.FromRgb(0, 120, 215);
     private static readonly Color LightThemeOuterColor = Color.FromRgb(247, 247, 247);
     private static readonly Color DarkThemeOuterColor = Color.FromRgb(32, 32, 32);
-    private const string PersonalizeKeyPath = @"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize";
+    private const string PersonalizeKeyPath = @"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize";
+    private const string DwmKeyPath = @"Software\Microsoft\Windows\DWM";
     private const string AppsUseLightThemeValueName = "AppsUseLightTheme";
+    private const string SystemUsesLightThemeValueName = "SystemUsesLightTheme";
+    private const string ColorizationColorValueName = "ColorizationColor";
 
     public static bool TryGetThemeDefaults(out Color textColor, out Color outerColor)
     {
@@ -27,29 +31,104 @@ public static bool TryGetThemeDefaults(out Color textColor, out Color outerColor
 
     private static bool TryGetSystemThemeIsLight(out bool isLightTheme)
     {
-        var value = Registry.GetValue(PersonalizeKeyPath, AppsUseLightThemeValueName, null);
-        if (value is null)
+        if (TryGetRegistryDword(PersonalizeKeyPath, AppsUseLightThemeValueName, out var appsUseLightTheme))
         {
-            isLightTheme = true;
-            return false;
+            isLightTheme = appsUseLightTheme > 0;
+            return true;
         }
 
-        isLightTheme = value switch
+        if (TryGetRegistryDword(PersonalizeKeyPath, SystemUsesLightThemeValueName, out var systemUsesLightTheme))
         {
-            int intValue => intValue > 0,
-            byte byteValue => byteValue > 0,
-            _ => true,
-        };
+            isLightTheme = systemUsesLightTheme > 0;
+            return true;
+        }
 
-        return true;
+        isLightTheme = true;
+        return false;
     }
 
     private static Color GetSystemAccentColor()
     {
-        var accent = SystemParameters.WindowGlassColor;
-        if (accent.A == 0)
-            return DefaultAccentColor;
+        if (TryGetAccentColorFromDwm(out var accent) || TryGetAccentColorFromRegistry(out accent))
+            return accent;
+
+        accent = SystemParameters.WindowGlassColor;
+        if (accent.A != 0)
+            return Color.FromArgb(255, accent.R, accent.G, accent.B);
+
+        return DefaultAccentColor;
+    }
+
+    private static bool TryGetRegistryDword(string keyPath, string valueName, out int value)
+    {
+        value = default;
+
+        try
+        {
+            using var key = Registry.CurrentUser.OpenSubKey(keyPath);
+            if (key?.GetValue(valueName) is int intValue)
+            {
+                value = intValue;
+                return true;
+            }
+
+            if (key?.GetValue(valueName) is byte byteValue)
+            {
+                value = byteValue;
+                return true;
+            }
+
+            if (key?.GetValue(valueName) is uint uintValue)
+            {
+                value = unchecked((int)uintValue);
+                return true;
+            }
+        }
+        catch
+        {
+        }
+
+        return false;
+    }
+
+    private static bool TryGetAccentColorFromDwm(out Color color)
+    {
+        color = default;
+
+        try
+        {
+            var result = DwmGetColorizationColor(out var colorizationColor, out _);
+            if (result != 0)
+                return false;
+
+            color = ColorFromArgbUint(colorizationColor);
+            return true;
+        }
+        catch
+        {
+            return false;
+        }
+    }
+
+    private static bool TryGetAccentColorFromRegistry(out Color color)
+    {
+        color = default;
 
-        return Color.FromArgb(255, accent.R, accent.G, accent.B);
+        if (!TryGetRegistryDword(DwmKeyPath, ColorizationColorValueName, out var colorization))
+            return false;
+
+        color = ColorFromArgbUint(unchecked((uint)colorization));
+        return true;
     }
+
+    private static Color ColorFromArgbUint(uint color)
+    {
+        var r = (byte)((color >> 16) & 0xFF);
+        var g = (byte)((color >> 8) & 0xFF);
+        var b = (byte)(color & 0xFF);
+        return Color.FromArgb(255, r, g, b);
+    }
+
+    [DllImport("dwmapi.dll", PreserveSig = true)]
+    private static extern int DwmGetColorizationColor(out uint colorizationColor, out bool opaqueBlend);
 }

From d091c902fbabdab7fb019fb5c92eec3f80b3a7de Mon Sep 17 00:00:00 2001
From: Daniel Chalmers <daniel.chalmers@outlook.com>
Date: Sun, 28 Dec 2025 11:32:24 -0600
Subject: [PATCH 4/5] add docs

---
 DesktopClock/Utilities/SystemThemeService.cs | 38 ++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/DesktopClock/Utilities/SystemThemeService.cs b/DesktopClock/Utilities/SystemThemeService.cs
index b1fdf67..26203da 100644
--- a/DesktopClock/Utilities/SystemThemeService.cs
+++ b/DesktopClock/Utilities/SystemThemeService.cs
@@ -5,17 +5,29 @@
 
 namespace DesktopClock.Utilities;
 
+/// <summary>
+/// Reads Windows theme and accent color values to seed default UI colors.
+/// </summary>
 public static class SystemThemeService
 {
+    // Fallbacks match the app's existing default colors.
     private static readonly Color DefaultAccentColor = Color.FromRgb(0, 120, 215);
     private static readonly Color LightThemeOuterColor = Color.FromRgb(247, 247, 247);
     private static readonly Color DarkThemeOuterColor = Color.FromRgb(32, 32, 32);
+
+    // Theme and colorization values stored under HKCU.
     private const string PersonalizeKeyPath = @"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize";
     private const string DwmKeyPath = @"Software\Microsoft\Windows\DWM";
     private const string AppsUseLightThemeValueName = "AppsUseLightTheme";
     private const string SystemUsesLightThemeValueName = "SystemUsesLightTheme";
     private const string ColorizationColorValueName = "ColorizationColor";
 
+    /// <summary>
+    /// Tries to build default text/outer colors from the system theme and accent color.
+    /// </summary>
+    /// <remarks>
+    /// Returns <c>false</c> when the system theme cannot be read (older Windows or missing keys).
+    /// </remarks>
     public static bool TryGetThemeDefaults(out Color textColor, out Color outerColor)
     {
         textColor = default;
@@ -29,29 +41,40 @@ public static bool TryGetThemeDefaults(out Color textColor, out Color outerColor
         return true;
     }
 
+    /// <summary>
+    /// Reads the light/dark preference from the Windows personalize key.
+    /// </summary>
     private static bool TryGetSystemThemeIsLight(out bool isLightTheme)
     {
+        // AppsUseLightTheme is the primary indicator for Win10+ app theme.
         if (TryGetRegistryDword(PersonalizeKeyPath, AppsUseLightThemeValueName, out var appsUseLightTheme))
         {
             isLightTheme = appsUseLightTheme > 0;
             return true;
         }
 
+        // SystemUsesLightTheme is a fallback when AppsUseLightTheme is absent.
         if (TryGetRegistryDword(PersonalizeKeyPath, SystemUsesLightThemeValueName, out var systemUsesLightTheme))
         {
             isLightTheme = systemUsesLightTheme > 0;
             return true;
         }
 
+        // Unknown; caller treats this as "no system theme available".
         isLightTheme = true;
         return false;
     }
 
+    /// <summary>
+    /// Resolves the current accent color using DWM, registry, then system parameters.
+    /// </summary>
     private static Color GetSystemAccentColor()
     {
+        // Prefer DWM because it tracks the active colorization value.
         if (TryGetAccentColorFromDwm(out var accent) || TryGetAccentColorFromRegistry(out accent))
             return accent;
 
+        // SystemParameters is a safe fallback when DWM/registry are unavailable.
         accent = SystemParameters.WindowGlassColor;
         if (accent.A != 0)
             return Color.FromArgb(255, accent.R, accent.G, accent.B);
@@ -59,6 +82,9 @@ private static Color GetSystemAccentColor()
         return DefaultAccentColor;
     }
 
+    /// <summary>
+    /// Reads a DWORD value from HKCU, if present.
+    /// </summary>
     private static bool TryGetRegistryDword(string keyPath, string valueName, out int value)
     {
         value = default;
@@ -91,6 +117,9 @@ private static bool TryGetRegistryDword(string keyPath, string valueName, out in
         return false;
     }
 
+    /// <summary>
+    /// Uses DWM to fetch the current colorization color.
+    /// </summary>
     private static bool TryGetAccentColorFromDwm(out Color color)
     {
         color = default;
@@ -110,6 +139,9 @@ private static bool TryGetAccentColorFromDwm(out Color color)
         }
     }
 
+    /// <summary>
+    /// Reads the colorization color from the DWM registry key.
+    /// </summary>
     private static bool TryGetAccentColorFromRegistry(out Color color)
     {
         color = default;
@@ -121,6 +153,9 @@ private static bool TryGetAccentColorFromRegistry(out Color color)
         return true;
     }
 
+    /// <summary>
+    /// Converts a DWM colorization ARGB value into an opaque WPF color.
+    /// </summary>
     private static Color ColorFromArgbUint(uint color)
     {
         var r = (byte)((color >> 16) & 0xFF);
@@ -129,6 +164,9 @@ private static Color ColorFromArgbUint(uint color)
         return Color.FromArgb(255, r, g, b);
     }
 
+    /// <summary>
+    /// Win32 API for reading the current DWM colorization color.
+    /// </summary>
     [DllImport("dwmapi.dll", PreserveSig = true)]
     private static extern int DwmGetColorizationColor(out uint colorizationColor, out bool opaqueBlend);
 }

From 09ed84a906b977e7afdb97d9cde0f96dab0fb84d Mon Sep 17 00:00:00 2001
From: Daniel Chalmers <daniel.chalmers@outlook.com>
Date: Sun, 28 Dec 2025 11:33:20 -0600
Subject: [PATCH 5/5] dotnet format

---
 DesktopClock/Properties/Settings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DesktopClock/Properties/Settings.cs b/DesktopClock/Properties/Settings.cs
index 3153a2c..cf11630 100644
--- a/DesktopClock/Properties/Settings.cs
+++ b/DesktopClock/Properties/Settings.cs
@@ -2,8 +2,8 @@
 using System.ComponentModel;
 using System.IO;
 using System.Windows.Media;
-using Newtonsoft.Json;
 using DesktopClock.Utilities;
+using Newtonsoft.Json;
 using WpfWindowPlacement;
 
 namespace DesktopClock.Properties;