From 102083ef188422f4a5bfd94d122873934dc5ac48 Mon Sep 17 00:00:00 2001
From: BornToBeRoot <16019165+BornToBeRoot@users.noreply.github.com>
Date: Fri, 17 Oct 2025 19:00:21 +0200
Subject: [PATCH 1/3] Feature: Improve light theme readability

---
 .../Resources/Strings.Designer.cs             | 10 +++-
 .../Resources/Strings.resx                    |  3 ++
 .../Resources/Styles/TextBlockStyles.xaml     |  2 +-
 .../ViewModels/SettingsAppearanceViewModel.cs | 13 +++--
 .../Views/SettingsAppearanceView.xaml         | 54 +++++++++++--------
 5 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/Source/NETworkManager.Localization/Resources/Strings.Designer.cs b/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
index 2e8f0b1750..7474254302 100644
--- a/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
+++ b/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
@@ -1,7 +1,6 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -4678,6 +4677,15 @@ public static string HelpMessage_ThreadPoolAdditionalMinThreads {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Use custom themes to personalize the appearance of the application. You can edit or add theme in the &quot;Program Folder &gt; Themes&quot; directory. For more details, refer to the documentation..
+        /// </summary>
+        public static string HelpMessage_UseCustomThemes {
+            get {
+                return ResourceManager.GetString("HelpMessage_UseCustomThemes", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Hidden applications.
         /// </summary>
diff --git a/Source/NETworkManager.Localization/Resources/Strings.resx b/Source/NETworkManager.Localization/Resources/Strings.resx
index d88ec26a51..56be8078c4 100644
--- a/Source/NETworkManager.Localization/Resources/Strings.resx
+++ b/Source/NETworkManager.Localization/Resources/Strings.resx
@@ -3993,4 +3993,7 @@ Right-click for more options.</value>
   <data name="CollapseAll" xml:space="preserve">
     <value>Collapse all</value>
   </data>
+  <data name="HelpMessage_UseCustomThemes" xml:space="preserve">
+    <value>Use custom themes to personalize the appearance of the application. You can edit or add theme in the "Program Folder &gt; Themes" directory. For more details, refer to the documentation.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Source/NETworkManager/Resources/Styles/TextBlockStyles.xaml b/Source/NETworkManager/Resources/Styles/TextBlockStyles.xaml
index 886e024a66..a2b2fd109d 100644
--- a/Source/NETworkManager/Resources/Styles/TextBlockStyles.xaml
+++ b/Source/NETworkManager/Resources/Styles/TextBlockStyles.xaml
@@ -7,7 +7,7 @@
 
     <Style x:Key="HeaderTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DefaultTextBlock}">
         <Setter Property="FontFamily" Value="{StaticResource MahApps.Fonts.Family.Header}" />
-        <Setter Property="Foreground" Value="{StaticResource MahApps.Brushes.Gray5}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Gray5}" />
         <Setter Property="FontSize" Value="18" />
         <Setter Property="Margin" Value="0,0,0,10" />
     </Style>
diff --git a/Source/NETworkManager/ViewModels/SettingsAppearanceViewModel.cs b/Source/NETworkManager/ViewModels/SettingsAppearanceViewModel.cs
index 35a44b5f96..cd82cf16af 100644
--- a/Source/NETworkManager/ViewModels/SettingsAppearanceViewModel.cs
+++ b/Source/NETworkManager/ViewModels/SettingsAppearanceViewModel.cs
@@ -1,8 +1,8 @@
-using System.ComponentModel;
+using NETworkManager.Models.Appearance;
+using NETworkManager.Settings;
+using System.ComponentModel;
 using System.Linq;
 using System.Windows.Data;
-using NETworkManager.Models.Appearance;
-using NETworkManager.Settings;
 
 namespace NETworkManager.ViewModels;
 
@@ -26,7 +26,7 @@ public ThemeColorInfo SelectedTheme
 
             if (!_isLoading && !UseCustomTheme)
             {
-                AppearanceManager.ChangeTheme(value.Name);
+                AppearanceManager.ChangeTheme(value.Name, SelectedAccent.Name);
                 SettingsManager.Current.Appearance_Theme = value.Name;
             }
 
@@ -35,7 +35,6 @@ public ThemeColorInfo SelectedTheme
         }
     }
 
-
     public ICollectionView Accents { get; }
 
     private AccentColorInfo _selectedAccent;
@@ -50,7 +49,7 @@ public AccentColorInfo SelectedAccent
 
             if (!_isLoading && !UseCustomTheme)
             {
-                AppearanceManager.ChangeAccent(value.Name);
+                AppearanceManager.ChangeTheme(SelectedTheme.Name, value.Name);
                 SettingsManager.Current.Appearance_Accent = value.Name;
             }
 
@@ -95,7 +94,7 @@ public ThemeInfo SelectedCustomTheme
 
             if (!_isLoading && UseCustomTheme)
             {
-                AppearanceManager.ChangeTheme(value);
+                AppearanceManager.ChangeTheme(value.Name);
                 SettingsManager.Current.Appearance_CustomThemeName = value.Name;
             }
 
diff --git a/Source/NETworkManager/Views/SettingsAppearanceView.xaml b/Source/NETworkManager/Views/SettingsAppearanceView.xaml
index c39767c5a3..cb301b42ec 100644
--- a/Source/NETworkManager/Views/SettingsAppearanceView.xaml
+++ b/Source/NETworkManager/Views/SettingsAppearanceView.xaml
@@ -15,15 +15,15 @@
         <converters:BooleanReverseConverter x:Key="BooleanReverseConverter" />
     </UserControl.Resources>
     <StackPanel>
-        <TextBlock Text="{x:Static localization:Strings.Theme}" Style="{StaticResource HeaderTextBlock}" />
-        <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" ItemsSource="{Binding Themes}"
-                  SelectedItem="{Binding SelectedTheme}"
-                  IsEnabled="{Binding UseCustomTheme, Converter={StaticResource BooleanReverseConverter}}"
+        <TextBlock Text="{x:Static Member=localization:Strings.Theme}" Style="{StaticResource ResourceKey=HeaderTextBlock}" />
+        <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" ItemsSource="{Binding Path=Themes}"
+                  SelectedItem="{Binding Path=SelectedTheme}"
+                  IsEnabled="{Binding Path=UseCustomTheme, Converter={StaticResource ResourceKey=BooleanReverseConverter}}"
                   VerticalAlignment="Top" BorderThickness="0" SelectionMode="Single" Margin="0,0,0,20">
             <ListView.ItemTemplate>
                 <DataTemplate>
                     <Rectangle Width="48" Height="48" Margin="-1,2" Fill="{Binding Color}"
-                               ToolTip="{Binding Name, Converter={StaticResource ThemeToStringConverter}}" />
+                               ToolTip="{Binding Name, Converter={StaticResource ResourceKey=ThemeToStringConverter}}" />
                 </DataTemplate>
             </ListView.ItemTemplate>
             <ListView.ItemsPanel>
@@ -39,15 +39,15 @@
             </ListBox.Template>
             <!-- /BUGFIX-->
         </ListView>
-        <TextBlock Text="{x:Static localization:Strings.Accent}" Style="{StaticResource HeaderTextBlock}" />
-        <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" ItemsSource="{Binding Accents}"
-                  SelectedItem="{Binding SelectedAccent}"
-                  IsEnabled="{Binding UseCustomTheme, Converter={StaticResource BooleanReverseConverter}}"
+        <TextBlock Text="{x:Static localization:Strings.Accent}" Style="{StaticResource ResourceKey=HeaderTextBlock}" />
+        <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" ItemsSource="{Binding Path=Accents}"
+                  SelectedItem="{Binding Path=SelectedAccent}"
+                  IsEnabled="{Binding Path=UseCustomTheme, Converter={StaticResource ResourceKey=BooleanReverseConverter}}"
                   VerticalAlignment="Top" BorderThickness="0" SelectionMode="Single" Margin="0,0,0,20">
             <ListView.ItemTemplate>
                 <DataTemplate>
-                    <Rectangle Width="48" Height="48" Margin="-1,2" Fill="{Binding Color}"
-                               ToolTip="{Binding Name,Converter={StaticResource AccentToStringConverter}}" />
+                    <Rectangle Width="48" Height="48" Margin="-1,2" Fill="{Binding Path=Color}"
+                               ToolTip="{Binding Path=Name,Converter={StaticResource ResourceKey=AccentToStringConverter}}" />
                 </DataTemplate>
             </ListView.ItemTemplate>
             <ListView.ItemsPanel>
@@ -63,26 +63,34 @@
             </ListBox.Template>
             <!-- /BUGFIX-->
         </ListView>
-        <TextBlock Style="{StaticResource HeaderTextBlock}" Text="{x:Static localization:Strings.CustomThemes}" />
-        <mah:ToggleSwitch Header="{x:Static localization:Strings.UseCustomThemes}" IsOn="{Binding UseCustomTheme}"
-                          Margin="0,0,0,10" />
-        <ComboBox ItemsSource="{Binding CustomThemes}" SelectedItem="{Binding SelectedCustomTheme}"
-                  IsEnabled="{Binding UseCustomTheme}" Width="250" HorizontalAlignment="Left" Margin="0,0,0,20">
+        <TextBlock Style="{StaticResource ResourceKey=HeaderTextBlock}" Text="{x:Static Member=localization:Strings.CustomThemes}" />
+        <StackPanel Orientation="Horizontal" Margin="0,0,0,10">
+            <mah:ToggleSwitch Header="{x:Static Member=localization:Strings.UseCustomThemes}" IsOn="{Binding Path=UseCustomTheme}" />
+            <Rectangle Width="24" Height="24"
+                       ToolTip="{x:Static Member=localization:Strings.HelpMessage_UseCustomThemes}"
+                       Style="{StaticResource ResourceKey=HelpImageRectangle}" VerticalAlignment="Top" Margin="10,0,0,0">
+                <Rectangle.Resources>
+                    <Style TargetType="{x:Type TypeName=ToolTip}" BasedOn="{StaticResource ResourceKey=HelpToolTip}" />
+                </Rectangle.Resources>
+            </Rectangle>
+        </StackPanel>
+        <ComboBox ItemsSource="{Binding Path=CustomThemes}" SelectedItem="{Binding Path=SelectedCustomTheme}"
+                  IsEnabled="{Binding Path=UseCustomTheme}" Width="250" HorizontalAlignment="Left" Margin="0,0,0,20">
             <ComboBox.ItemTemplate>
                 <DataTemplate>
-                    <TextBlock Text="{Binding DisplayName}" d:DataContext="{d:DesignInstance appearance:ThemeInfo}" />
+                    <TextBlock Text="{Binding Path=DisplayName}" d:DataContext="{d:DesignInstance appearance:ThemeInfo}" />
                 </DataTemplate>
             </ComboBox.ItemTemplate>
         </ComboBox>
-        <TextBlock Style="{StaticResource HeaderTextBlock}" Text="{x:Static localization:Strings.PowerShell}" />
+        <TextBlock Style="{StaticResource ResourceKey=HeaderTextBlock}" Text="{x:Static Member=localization:Strings.PowerShell}" />
         <StackPanel Orientation="Horizontal">
-            <mah:ToggleSwitch Header="{x:Static localization:Strings.ApplyThemeToPowerShellConsole}"
-                              IsOn="{Binding PowerShellModifyGlobalProfile}" />
+            <mah:ToggleSwitch Header="{x:Static Member=localization:Strings.ApplyThemeToPowerShellConsole}"
+                              IsOn="{Binding Path=PowerShellModifyGlobalProfile}" />
             <Rectangle Width="24" Height="24"
-                       ToolTip="{x:Static localization:Strings.HelpMessage_ApplyThemeToPowerShellConsole}"
-                       Style="{StaticResource HelpImageRectangle}" VerticalAlignment="Top" Margin="10,0,0,0">
+                       ToolTip="{x:Static Member=localization:Strings.HelpMessage_ApplyThemeToPowerShellConsole}"
+                       Style="{StaticResource ResourceKey=HelpImageRectangle}" VerticalAlignment="Top" Margin="10,0,0,0">
                 <Rectangle.Resources>
-                    <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
+                    <Style TargetType="{x:Type TypeName=ToolTip}" BasedOn="{StaticResource ResourceKey=HelpToolTip}" />
                 </Rectangle.Resources>
             </Rectangle>
         </StackPanel>

From 4f7728190b0f988ab5543541dd38631000fa77b6 Mon Sep 17 00:00:00 2001
From: BornToBeRoot <16019165+BornToBeRoot@users.noreply.github.com>
Date: Fri, 17 Oct 2025 19:59:34 +0200
Subject: [PATCH 2/3] Feature: Improve light theme

---
 .../AppearanceManager.cs                      | 155 ++++++++++++------
 1 file changed, 109 insertions(+), 46 deletions(-)

diff --git a/Source/NETworkManager.Settings/AppearanceManager.cs b/Source/NETworkManager.Settings/AppearanceManager.cs
index 7d2ef686a9..5887c0c70e 100644
--- a/Source/NETworkManager.Settings/AppearanceManager.cs
+++ b/Source/NETworkManager.Settings/AppearanceManager.cs
@@ -1,13 +1,13 @@
-using System;
+using ControlzEx.Theming;
+using MahApps.Metro.Controls.Dialogs;
+using MahApps.Metro.Theming;
+using NETworkManager.Models.Appearance;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
-using ControlzEx.Theming;
-using MahApps.Metro.Controls.Dialogs;
-using MahApps.Metro.Theming;
-using NETworkManager.Models.Appearance;
 
 namespace NETworkManager.Settings;
 
@@ -16,6 +16,27 @@ namespace NETworkManager.Settings;
 /// </summary>
 public static class AppearanceManager
 {
+    #region Variables
+    /// <summary>
+    ///     Dictionary to override some brushes for the light theme.
+    /// </summary>
+    private static readonly ResourceDictionary LightThemeOverrideDictionary = new()
+    {
+        //["MahApps.Brushes.ThemeBackground"] = new SolidColorBrush(Color.FromRgb(248, 248, 255)),
+        //["MahApps.Brushes.Control.Background"] = new SolidColorBrush(Color.FromRgb(248, 248, 255)),
+        ["MahApps.Brushes.Gray3"] = new SolidColorBrush(Color.FromRgb(104, 104, 104)),
+        ["MahApps.Brushes.Gray5"] = new SolidColorBrush(Color.FromRgb(138, 138, 138)),
+        ["MahApps.Brushes.Gray8"] = new SolidColorBrush(Color.FromRgb(190, 190, 190)),
+    };
+
+    /// <summary>
+    ///     Dictionary to override some brushes for the dark theme.
+    /// </summary>
+    private static readonly ResourceDictionary DarkThemeOverrideDictionary = new()
+    {
+
+    };
+
     /// <summary>
     ///     Name of the folder inside the application directory where the custom themes are stored.
     /// </summary>
@@ -26,23 +47,40 @@ public static class AppearanceManager
     /// </summary>
     public static readonly MetroDialogSettings MetroDialog = new();
 
+    /// <summary>
+    ///     List who contains all MahApps.Metro themes.
+    /// </summary>
+    public static List<ThemeColorInfo> Themes { get; set; }
+
+    /// <summary>
+    ///     List who contains all MahApps.Metro custom themes.
+    /// </summary>
+    public static List<ThemeInfo> CustomThemes { get; private set; }
+
+    /// <summary>
+    ///     List who contains all MahApps.Metro accents.
+    /// </summary>
+    public static List<AccentColorInfo> Accents { get; set; }
+    #endregion
+
+    #region Constructor
     /// <summary>
     ///     Load the MahApps.Metro themes and accents when needed.
     /// </summary>
     static AppearanceManager()
     {
-        Themes = ThemeManager.Current.Themes
+        Themes = [.. ThemeManager.Current.Themes
             .GroupBy(x => x.BaseColorScheme)
             .Select(x => x.First())
             .Select(x => new ThemeColorInfo
-                { Name = x.BaseColorScheme, Color = x.Resources["MahApps.Brushes.ThemeBackground"] as Brush })
-            .ToList();
+            { Name = x.BaseColorScheme, Color = x.Resources["MahApps.Brushes.ThemeBackground"] as Brush })];
 
-        Accents = ThemeManager.Current.Themes
+        Accents = [.. ThemeManager.Current.Themes
             .GroupBy(x => x.ColorScheme)
             .OrderBy(x => x.Key)
-            .Select(x => new AccentColorInfo { Name = x.Key, Color = x.First().ShowcaseBrush })
-            .ToList();
+            .Select(x => new AccentColorInfo { Name = x.Key, Color = x.First().ShowcaseBrush })];
+
+        ThemeManager.Current.ThemeChanged += Current_ThemeChanged;
 
         LoadCustomThemes();
 
@@ -55,22 +93,9 @@ static AppearanceManager()
         MetroDialog.DialogButtonFontSize = 14;
         MetroDialog.DialogMessageFontSize = 14;
     }
+    #endregion
 
-    /// <summary>
-    ///     List who contains all MahApps.Metro themes.
-    /// </summary>
-    public static List<ThemeColorInfo> Themes { get; set; }
-
-    /// <summary>
-    ///     List who contains all MahApps.Metro custom themes.
-    /// </summary>
-    public static List<ThemeInfo> CustomThemes { get; private set; }
-
-    /// <summary>
-    ///     List who contains all MahApps.Metro accents.
-    /// </summary>
-    public static List<AccentColorInfo> Accents { get; set; }
-
+    #region Methods
     /// <summary>
     ///     Change the appearance based on the user settings. This method should be called once, when starting the application.
     /// </summary>
@@ -79,14 +104,13 @@ public static void Load()
         if (SettingsManager.Current.Appearance_UseCustomTheme && CustomThemes.Count > 0)
         {
             ChangeTheme(
-                CustomThemes.FirstOrDefault(x => x.Name == SettingsManager.Current.Appearance_CustomThemeName) ??
-                CustomThemes.First());
-        }
-        else
-        {
-            ChangeTheme(SettingsManager.Current.Appearance_Theme);
-            ChangeAccent(SettingsManager.Current.Appearance_Accent);
+                (CustomThemes.FirstOrDefault(x => x.Name == SettingsManager.Current.Appearance_CustomThemeName) ??
+                CustomThemes.First()).Name);
+
+            return;
         }
+
+        ChangeTheme(SettingsManager.Current.Appearance_Theme, SettingsManager.Current.Appearance_Accent);
     }
 
     /// <summary>
@@ -94,7 +118,7 @@ public static void Load()
     /// </summary>
     private static void LoadCustomThemes()
     {
-        List<ThemeInfo> customThemes = new();
+        List<ThemeInfo> customThemes = [];
 
         foreach (var file in Directory.GetFiles(Path.Combine(ConfigurationManager.Current.ExecutionPath,
                      ThemeFolderName)))
@@ -110,29 +134,68 @@ private static void LoadCustomThemes()
     }
 
     /// <summary>
-    ///     Method to change the application theme.
+    ///     Method to change the application theme (and accent).
     /// </summary>
-    /// <param name="name">Name of the MahApps theme base color.</param>
+    /// <param name="name">Theme name as "theme.accent" to apply.</param>
     public static void ChangeTheme(string name)
     {
-        ThemeManager.Current.ChangeThemeBaseColor(System.Windows.Application.Current, name);
+        ThemeManager.Current.ChangeTheme(System.Windows.Application.Current, name);
     }
 
     /// <summary>
-    ///     Method to change the application accent.
+    ///     Method to change the application theme (and accent).
     /// </summary>
-    /// <param name="name">Name of the MahApps theme accent color.</param>
-    public static void ChangeAccent(string name)
+    /// <param name="theme">Theme name to apply.</param>
+    /// <param name="accent">Accent name to apply.</param>
+    public static void ChangeTheme(string theme, string accent)
     {
-        ThemeManager.Current.ChangeThemeColorScheme(System.Windows.Application.Current, name);
+        ChangeTheme($"{theme}.{accent}");
     }
 
     /// <summary>
-    ///     Method to change the application theme based on the name in <see cref="ThemeInfo" />.
+    /// 
     /// </summary>
-    /// <param name="themeInfo">Theme as <see cref="ThemeInfo" /> to apply.</param>
-    public static void ChangeTheme(ThemeInfo themeInfo)
+    /// <param name="theme"></param>
+    private static void ApplyCustomThemeFixes(string theme)
+    {
+        // Don't apply on custom themes (only built-in light/dark themes)
+        if (CustomThemes.Any(x => x.Name.Equals(theme, StringComparison.OrdinalIgnoreCase)))
+            return;
+
+        // Get application resources
+        var appResources = System.Windows.Application.Current.Resources;
+
+        // Remove any existing theme overrides
+        appResources.MergedDictionaries.Remove(LightThemeOverrideDictionary);
+        appResources.MergedDictionaries.Remove(DarkThemeOverrideDictionary);
+
+
+        // Theme name is in format "theme.accent"
+        switch (theme.ToLowerInvariant().Split('.')[0])
+        {
+            case "light":
+                appResources.MergedDictionaries.Add(LightThemeOverrideDictionary);
+                break;
+
+            case "dark":
+                appResources.MergedDictionaries.Add(DarkThemeOverrideDictionary);
+                break;
+        }
+
+        // Refresh UI
+        foreach (Window window in System.Windows.Application.Current.Windows)
+        {
+            if (window.IsLoaded)
+                window.InvalidateVisual();
+        }
+    }
+
+    #endregion
+
+    #region Events
+    private static void Current_ThemeChanged(object sender, ThemeChangedEventArgs e)
     {
-        ThemeManager.Current.ChangeTheme(System.Windows.Application.Current, themeInfo.Name);
+        ApplyCustomThemeFixes(e.NewTheme.Name);
     }
-}
\ No newline at end of file
+    #endregion
+}

From 40b66b4ace0fe5f980e594b00c4177161a7134bf Mon Sep 17 00:00:00 2001
From: BornToBeRoot <16019165+BornToBeRoot@users.noreply.github.com>
Date: Fri, 17 Oct 2025 23:53:52 +0200
Subject: [PATCH 3/3] Docs: #3191

---
 Website/docs/changelog/next-release.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Website/docs/changelog/next-release.md b/Website/docs/changelog/next-release.md
index c53432865a..e3ef969175 100644
--- a/Website/docs/changelog/next-release.md
+++ b/Website/docs/changelog/next-release.md
@@ -26,6 +26,7 @@ Release date: **xx.xx.2025**
 
 ## Improvements
 
+- Improved light theme for enhanced readability and contrast. [#3191](https://github.com/BornToBeRoot/NETworkManager/pull/3191)
 - Redesigned the settings reset dialog for a clearer and more user-friendly experience. [#3138](https://github.com/BornToBeRoot/NETworkManager/pull/3138)
 
 **WiFi**