From 9394770c76cb416bc2d4dc8d769ae24634a2e5d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= <leo.peyronnet@outlook.fr>
Date: Sun, 10 Dec 2023 12:01:29 +0100
Subject: [PATCH] Added instant theme switching (#353)

---
 ColorPicker/App.xaml                         |  94 +++++-----
 ColorPicker/Classes/Global.cs                |   3 +-
 ColorPicker/MainWindow.xaml                  |  56 +++---
 ColorPicker/MainWindow.xaml.cs               |  22 +--
 ColorPicker/Pages/AiGenPage.xaml             | 186 +++++++++----------
 ColorPicker/Pages/AiGenPage.xaml.cs          |   2 +-
 ColorPicker/Pages/BookmarksPage.xaml         |  14 +-
 ColorPicker/Pages/BookmarksPage.xaml.cs      |   2 +-
 ColorPicker/Pages/ChromaticWheelPage.xaml    | 124 ++++++-------
 ColorPicker/Pages/ChromaticWheelPage.xaml.cs |   2 +-
 ColorPicker/Pages/ConverterPage.xaml         | 182 +++++++++---------
 ColorPicker/Pages/ConverterPage.xaml.cs      |   6 +-
 ColorPicker/Pages/FirstRun/FeaturesPage.xaml |  24 +--
 ColorPicker/Pages/FirstRun/JumpInPage.xaml   |   6 +-
 ColorPicker/Pages/FirstRun/SynethiaPage.xaml |  18 +-
 ColorPicker/Pages/FirstRun/ThemePage.xaml    |   6 +-
 ColorPicker/Pages/FirstRun/ThemePage.xaml.cs |   8 +-
 ColorPicker/Pages/FirstRun/WelcomePage.xaml  |  16 +-
 ColorPicker/Pages/GradientPage.xaml          | 118 ++++++------
 ColorPicker/Pages/GradientPage.xaml.cs       |   2 +-
 ColorPicker/Pages/HarmoniesPage.xaml         |  64 +++----
 ColorPicker/Pages/HarmoniesPage.xaml.cs      |  10 +-
 ColorPicker/Pages/HomePage.xaml              |   8 +-
 ColorPicker/Pages/PalettePage.xaml           |  70 +++----
 ColorPicker/Pages/PalettePage.xaml.cs        |   6 +-
 ColorPicker/Pages/SelectorPage.xaml          | 146 +++++++--------
 ColorPicker/Pages/SelectorPage.xaml.cs       |  18 +-
 ColorPicker/Pages/SettingsPage.xaml          | 166 ++++++++---------
 ColorPicker/Pages/SettingsPage.xaml.cs       |  35 +---
 ColorPicker/Pages/TextPage.xaml              | 112 +++++------
 ColorPicker/Pages/TextPage.xaml.cs           |   2 +-
 ColorPicker/UserControls/ActionCard.xaml     |   8 +-
 ColorPicker/UserControls/ColorItem.xaml      |  50 ++---
 ColorPicker/UserControls/ColorItem.xaml.cs   |   4 +-
 ColorPicker/UserControls/GradientItem.xaml   |  26 +--
 ColorPicker/UserControls/PageCard.xaml       |   6 +-
 ColorPicker/UserControls/PaletteItem.xaml    |  26 +--
 ColorPicker/UserControls/PaletteItem.xaml.cs |   8 +-
 ColorPicker/UserControls/TextItem.xaml       |  20 +-
 ColorPicker/Windows/ColorDetailsWindow.xaml  |  54 +++---
 ColorPicker/Windows/FirstRunWindow.xaml      |   8 +-
 ColorPicker/Windows/MiniPicker.xaml          |   8 +-
 42 files changed, 863 insertions(+), 883 deletions(-)

diff --git a/ColorPicker/App.xaml b/ColorPicker/App.xaml
index 5ef93dc3..ae5cf023 100644
--- a/ColorPicker/App.xaml
+++ b/ColorPicker/App.xaml
@@ -36,20 +36,20 @@
                                     <Setter TargetName="border" Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
                                 </Trigger>
                                 <Trigger Property="IsMouseOver" Value="true">
-                                    <Setter TargetName="border" Property="Background" Value="{Binding Source={StaticResource AccentColor}}" />
+                                    <Setter TargetName="border" Property="Background" Value="{DynamicResource AccentColor}" />
                                     <Setter TargetName="border" Property="BorderBrush" Value="Transparent" />
                                     <Setter TargetName="contentPresenter" Property="TextElement.Foreground" Value="White" />
 
                                 </Trigger>
                                 <Trigger Property="IsPressed" Value="true">
-                                    <Setter TargetName="border" Property="Background" Value="{Binding Source={StaticResource AccentColor}}" />
+                                    <Setter TargetName="border" Property="Background" Value="{DynamicResource AccentColor}" />
                                     <Setter TargetName="border" Property="BorderBrush" Value="Transparent" />
                                     <Setter TargetName="contentPresenter" Property="TextElement.Foreground" Value="White" />
                                 </Trigger>
                                 <Trigger Property="IsEnabled" Value="false">
                                     <Setter TargetName="border" Property="Background" Value="Transparent" />
                                     <Setter TargetName="border" Property="BorderBrush" Value="Transparent" />
-                                    <Setter TargetName="contentPresenter" Property="TextElement.Foreground" Value="{Binding Source={StaticResource Gray}}" />
+                                    <Setter TargetName="contentPresenter" Property="TextElement.Foreground" Value="{DynamicResource Gray}" />
                                 </Trigger>
                             </ControlTemplate.Triggers>
                         </ControlTemplate>
@@ -81,7 +81,7 @@
                                     <Setter TargetName="border" Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
                                 </Trigger>
                                 <Trigger Property="IsMouseOver" Value="true">
-                                    <Setter TargetName="border" Property="Background" Value="{Binding Source={StaticResource Background1}}" />
+                                    <Setter TargetName="border" Property="Background" Value="{DynamicResource Background1}" />
                                     <Setter TargetName="border" Property="BorderBrush" Value="Transparent" />
                                     <Setter TargetName="contentPresenter" Property="TextElement.Foreground" Value="White" />
 
@@ -94,7 +94,7 @@
                                 <Trigger Property="IsEnabled" Value="false">
                                     <Setter TargetName="border" Property="Background" Value="Transparent" />
                                     <Setter TargetName="border" Property="BorderBrush" Value="Transparent" />
-                                    <Setter TargetName="contentPresenter" Property="TextElement.Foreground" Value="{Binding Source={StaticResource Gray}}" />
+                                    <Setter TargetName="contentPresenter" Property="TextElement.Foreground" Value="{DynamicResource Gray}" />
                                 </Trigger>
                             </ControlTemplate.Triggers>
                         </ControlTemplate>
@@ -126,19 +126,19 @@
                                     <Setter TargetName="border" Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
                                 </Trigger>
                                 <Trigger Property="IsMouseOver" Value="true">
-                                    <Setter TargetName="border" Property="Background" Value="{Binding Source={StaticResource LightAccentColor}}" />
-                                    <Setter TargetName="border" Property="BorderBrush" Value="{Binding Source={StaticResource LightAccentColor}}" />
+                                    <Setter TargetName="border" Property="Background" Value="{DynamicResource LightAccentColor}" />
+                                    <Setter TargetName="border" Property="BorderBrush" Value="{DynamicResource LightAccentColor}" />
                                     <!--<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="White"/>-->
                                 </Trigger>
                                 <Trigger Property="IsPressed" Value="true">
-                                    <Setter TargetName="border" Property="Background" Value="{Binding Source={StaticResource LightAccentColor}}" />
-                                    <Setter TargetName="border" Property="BorderBrush" Value="{Binding Source={StaticResource LightAccentColor}}" />
+                                    <Setter TargetName="border" Property="Background" Value="{DynamicResource LightAccentColor}" />
+                                    <Setter TargetName="border" Property="BorderBrush" Value="{DynamicResource LightAccentColor}" />
                                     <!--<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="White"/>-->
                                 </Trigger>
                                 <Trigger Property="IsEnabled" Value="false">
                                     <Setter TargetName="border" Property="Background" Value="Transparent" />
                                     <Setter TargetName="border" Property="BorderBrush" Value="Transparent" />
-                                    <Setter TargetName="contentPresenter" Property="TextElement.Foreground" Value="{Binding Source={StaticResource Gray}}" />
+                                    <Setter TargetName="contentPresenter" Property="TextElement.Foreground" Value="{DynamicResource Gray}" />
                                 </Trigger>
                             </ControlTemplate.Triggers>
                         </ControlTemplate>
@@ -171,19 +171,19 @@
                                     <Setter TargetName="border" Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
                                 </Trigger>
                                 <Trigger Property="IsMouseOver" Value="true">
-                                    <Setter TargetName="border" Property="Background" Value="{Binding Source={StaticResource Background2}}" />
-                                    <Setter TargetName="border" Property="BorderBrush" Value="{Binding Source={StaticResource Background2}}" />
+                                    <Setter TargetName="border" Property="Background" Value="{DynamicResource Background2}" />
+                                    <Setter TargetName="border" Property="BorderBrush" Value="{DynamicResource Background2}" />
                                     <!--<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="White"/>-->
                                 </Trigger>
                                 <Trigger Property="IsPressed" Value="true">
-                                    <Setter TargetName="border" Property="Background" Value="{Binding Source={StaticResource Background2}}" />
-                                    <Setter TargetName="border" Property="BorderBrush" Value="{Binding Source={StaticResource Background2}}" />
+                                    <Setter TargetName="border" Property="Background" Value="{DynamicResource Background2}" />
+                                    <Setter TargetName="border" Property="BorderBrush" Value="{DynamicResource Background2}" />
                                     <!--<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="White"/>-->
                                 </Trigger>
                                 <Trigger Property="IsEnabled" Value="false">
                                     <Setter TargetName="border" Property="Background" Value="Transparent" />
                                     <Setter TargetName="border" Property="BorderBrush" Value="Transparent" />
-                                    <Setter TargetName="contentPresenter" Property="TextElement.Foreground" Value="{Binding Source={StaticResource Gray}}" />
+                                    <Setter TargetName="contentPresenter" Property="TextElement.Foreground" Value="{DynamicResource Gray}" />
                                 </Trigger>
                             </ControlTemplate.Triggers>
                         </ControlTemplate>
@@ -221,15 +221,15 @@
                                 <Ellipse
                                     Grid.Row="0"
                                     Grid.RowSpan="2"
-                                    Fill="{Binding Source={StaticResource Gray}}" />
+                                    Fill="{DynamicResource Gray}" />
                                 <Rectangle
                                     Grid.Row="1"
                                     Grid.RowSpan="3"
-                                    Fill="{Binding Source={StaticResource Gray}}" />
+                                    Fill="{DynamicResource Gray}" />
                                 <Ellipse
                                     Grid.Row="3"
                                     Grid.RowSpan="2"
-                                    Fill="{Binding Source={StaticResource Gray}}" />
+                                    Fill="{DynamicResource Gray}" />
                             </Grid>
                         </ControlTemplate>
                     </Setter.Value>
@@ -378,13 +378,13 @@
             </Style>
             <SolidColorBrush x:Key="Expander.Static.Circle.Stroke" Color="Transparent" />
             <SolidColorBrush x:Key="Expander.Static.Circle.Fill" Color="Transparent" />
-            <SolidColorBrush x:Key="Expander.Static.Arrow.Stroke" Color="{Binding Source={StaticResource DarkGray}}" />
+            <SolidColorBrush x:Key="Expander.Static.Arrow.Stroke" Color="{DynamicResource DarkGrayColor}" />
             <SolidColorBrush x:Key="Expander.MouseOver.Circle.Stroke" Color="Transparent" />
             <SolidColorBrush x:Key="Expander.MouseOver.Circle.Fill" Color="Transparent" />
-            <SolidColorBrush x:Key="Expander.MouseOver.Arrow.Stroke" Color="{Binding Source={StaticResource Foreground1}}" />
+            <SolidColorBrush x:Key="Expander.MouseOver.Arrow.Stroke" Color="{DynamicResource Foreground}" />
             <SolidColorBrush x:Key="Expander.Pressed.Circle.Stroke" Color="Transparent" />
             <SolidColorBrush x:Key="Expander.Pressed.Circle.Fill" Color="Transparent" />
-            <SolidColorBrush x:Key="Expander.Pressed.Arrow.Stroke" Color="{Binding Source={StaticResource Foreground1}}" />
+            <SolidColorBrush x:Key="Expander.Pressed.Arrow.Stroke" Color="{DynamicResource Foreground}" />
             <SolidColorBrush x:Key="Expander.Disabled.Circle.Stroke" Color="Transparent" />
             <SolidColorBrush x:Key="Expander.Disabled.Circle.Fill" Color="Transparent" />
             <SolidColorBrush x:Key="Expander.Disabled.Arrow.Stroke" Color="#FF707070" />
@@ -1165,39 +1165,39 @@
                 <GradientStop Offset="0.0" Color="Transparent" />
                 <GradientStop Offset="1.0" Color="Transparent" />
             </LinearGradientBrush>
-            <SolidColorBrush x:Key="ComboBox.Static.Border" Color="{Binding Source={StaticResource AccentColor}}" />
-            <SolidColorBrush x:Key="ComboBox.Static.Glyph" Color="{Binding Source={StaticResource AccentColor}}" />
+            <SolidColorBrush x:Key="ComboBox.Static.Border" Color="{DynamicResource Accent}" />
+            <SolidColorBrush x:Key="ComboBox.Static.Glyph" Color="{DynamicResource Accent}" />
             <SolidColorBrush x:Key="ComboBox.Static.Editable.Background" Color="Transparent" />
             <SolidColorBrush x:Key="ComboBox.Static.Editable.Border" Color="#FFABADB3" />
             <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Background" Color="Transparent" />
             <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Border" Color="Transparent" />
             <SolidColorBrush x:Key="TextBox.Static.Background" Color="Transparent" />
             <LinearGradientBrush x:Key="ComboBox.MouseOver.Background" StartPoint="0,0" EndPoint="0,1">
-                <GradientStop Offset="0.0" Color="{Binding Source={StaticResource AccentColor}}" />
-                <GradientStop Offset="1.0" Color="{Binding Source={StaticResource AccentColor}}" />
+                <GradientStop Offset="0.0" Color="{DynamicResource Accent}" />
+                <GradientStop Offset="1.0" Color="{DynamicResource Accent}" />
             </LinearGradientBrush>
-            <SolidColorBrush x:Key="ComboBox.MouseOver.Border" Color="{Binding Source={StaticResource LightAccentColor}}" />
+            <SolidColorBrush x:Key="ComboBox.MouseOver.Border" Color="{DynamicResource LightAccent}" />
             <SolidColorBrush x:Key="ComboBox.MouseOver.Glyph" Color="#fff" />
             <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Background" Color="Transparent" />
-            <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Border" Color="{Binding Source={StaticResource LightAccentColor}}" />
+            <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Border" Color="{DynamicResource LightAccent}" />
             <LinearGradientBrush x:Key="ComboBox.MouseOver.Editable.Button.Background" StartPoint="0,0" EndPoint="0,1">
-                <GradientStop Offset="0.0" Color="{Binding Source={StaticResource LightAccentColor}}" />
-                <GradientStop Offset="1.0" Color="{Binding Source={StaticResource LightAccentColor}}" />
+                <GradientStop Offset="0.0" Color="{DynamicResource LightAccent}" />
+                <GradientStop Offset="1.0" Color="{DynamicResource LightAccent}" />
             </LinearGradientBrush>
-            <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Button.Border" Color="{Binding Source={StaticResource LightAccentColor}}" />
+            <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Button.Border" Color="{DynamicResource LightAccent}" />
             <LinearGradientBrush x:Key="ComboBox.Pressed.Background" StartPoint="0,0" EndPoint="0,1">
-                <GradientStop Offset="0.0" Color="{Binding Source={StaticResource AccentColor}}" />
-                <GradientStop Offset="1.0" Color="{Binding Source={StaticResource AccentColor}}" />
+                <GradientStop Offset="0.0" Color="{DynamicResource Accent}" />
+                <GradientStop Offset="1.0" Color="{DynamicResource Accent}" />
             </LinearGradientBrush>
-            <SolidColorBrush x:Key="ComboBox.Pressed.Border" Color="{Binding Source={StaticResource AccentColor}}" />
+            <SolidColorBrush x:Key="ComboBox.Pressed.Border" Color="{DynamicResource Accent}" />
             <SolidColorBrush x:Key="ComboBox.Pressed.Glyph" Color="#fff" />
             <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Background" Color="Transparent" />
-            <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Border" Color="{Binding Source={StaticResource AccentColor}}" />
+            <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Border" Color="{DynamicResource Accent}" />
             <LinearGradientBrush x:Key="ComboBox.Pressed.Editable.Button.Background" StartPoint="0,0" EndPoint="0,1">
-                <GradientStop Offset="0.0" Color="{Binding Source={StaticResource AccentColor}}" />
-                <GradientStop Offset="1.0" Color="{Binding Source={StaticResource AccentColor}}" />
+                <GradientStop Offset="0.0" Color="{DynamicResource Accent}" />
+                <GradientStop Offset="1.0" Color="{DynamicResource Accent}" />
             </LinearGradientBrush>
-            <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Button.Border" Color="{Binding Source={StaticResource AccentColor}}" />
+            <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Button.Border" Color="{DynamicResource Accent}" />
             <SolidColorBrush x:Key="ComboBox.Disabled.Background" Color="Transparent" />
             <SolidColorBrush x:Key="ComboBox.Disabled.Border" Color="#FFD9D9D9" />
             <SolidColorBrush x:Key="ComboBox.Disabled.Glyph" Color="#FFBFBFBF" />
@@ -1343,7 +1343,7 @@
                             Color="Transparent">
                             <Border
                                 x:Name="dropDownBorder"
-                                Background="{Binding Source={StaticResource Background1}}"
+                                Background="{DynamicResource Background1}"
                                 BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
                                 BorderThickness="1"
                                 CornerRadius="5">
@@ -1431,7 +1431,7 @@
                             Color="Transparent">
                             <Border
                                 x:Name="dropDownBorder"
-                                Background="{Binding Source={StaticResource Background1}}"
+                                Background="{DynamicResource Background1}"
                                 BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
                                 BorderThickness="1"
                                 CornerRadius="5">
@@ -1508,7 +1508,7 @@
             </ControlTemplate>
             <Style x:Key="ComboBoxStyle1" TargetType="{x:Type ComboBox}">
                 <Setter Property="Background" Value="Transparent" />
-                <Setter Property="BorderBrush" Value="{Binding Source={StaticResource AccentColor}}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource AccentColor}" />
                 <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
                 <Setter Property="BorderThickness" Value="1" />
                 <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
@@ -1549,10 +1549,10 @@
             <SolidColorBrush x:Key="OptionMark.Static.Border" Color="#FF707070" />
             <SolidColorBrush x:Key="OptionMark.Static.Glyph" Color="White" />
             <SolidColorBrush x:Key="OptionMark.MouseOver.Background" Color="Transparent" />
-            <SolidColorBrush x:Key="OptionMark.MouseOver.Border" Color="{Binding Source={StaticResource AccentColor}}" />
+            <SolidColorBrush x:Key="OptionMark.MouseOver.Border" Color="{DynamicResource Accent}" />
             <SolidColorBrush x:Key="OptionMark.MouseOver.Glyph" Color="White" />
             <SolidColorBrush x:Key="OptionMark.Pressed.Background" Color="Transparent" />
-            <SolidColorBrush x:Key="OptionMark.Pressed.Border" Color="{Binding Source={StaticResource AccentColor}}" />
+            <SolidColorBrush x:Key="OptionMark.Pressed.Border" Color="{DynamicResource Accent}" />
             <SolidColorBrush x:Key="OptionMark.Pressed.Glyph" Color="WhiteSmoke" />
             <SolidColorBrush x:Key="OptionMark.Disabled.Background" Color="#FFE6E6E6" />
             <SolidColorBrush x:Key="OptionMark.Disabled.Border" Color="#FFBCBCBC" />
@@ -1581,7 +1581,7 @@
                                     Margin="1"
                                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    BorderBrush="{Binding Source={StaticResource AccentColor}}"
+                                    BorderBrush="{DynamicResource AccentColor}"
                                     BorderThickness="{TemplateBinding BorderThickness}"
                                     CornerRadius="3">
                                     <Grid x:Name="markGrid">
@@ -1637,7 +1637,7 @@
                                 <Trigger Property="IsChecked" Value="true">
                                     <Setter TargetName="optionMark" Property="Opacity" Value="1" />
                                     <Setter TargetName="indeterminateMark" Property="Opacity" Value="0" />
-                                    <Setter TargetName="checkBoxBorder" Property="Background" Value="{Binding Source={StaticResource AccentColor}}" />
+                                    <Setter TargetName="checkBoxBorder" Property="Background" Value="{DynamicResource AccentColor}" />
                                 </Trigger>
                                 <Trigger Property="IsChecked" Value="{x:Null}">
                                     <Setter TargetName="optionMark" Property="Opacity" Value="0" />
@@ -1652,7 +1652,7 @@
             <Style x:Key="MenuStyle" TargetType="MenuItem">
                 <Setter Property="BorderThickness" Value="0" />
                 <Setter Property="OverridesDefaultStyle" Value="True" />
-                <Setter Property="Foreground" Value="{Binding Source={StaticResource Background1}}" />
+                <Setter Property="Foreground" Value="{DynamicResource Background1}" />
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="MenuItem">
@@ -1666,7 +1666,7 @@
                             </Border>
                             <ControlTemplate.Triggers>
                                 <Trigger Property="IsMouseOver" Value="True">
-                                    <Setter TargetName="Border" Property="Background" Value="{Binding Source={StaticResource Background2}}" />
+                                    <Setter TargetName="Border" Property="Background" Value="{DynamicResource Background2}" />
                                 </Trigger>
                             </ControlTemplate.Triggers>
                         </ControlTemplate>
@@ -1681,7 +1681,7 @@
                             <Border
                                 Margin="10"
                                 Padding="5"
-                                Background="{Binding Source={StaticResource Background1}}"
+                                Background="{DynamicResource Background1}"
                                 CornerRadius="5">
                                 <ScrollViewer
                                     Uid="ScrollViewer_9"
diff --git a/ColorPicker/Classes/Global.cs b/ColorPicker/Classes/Global.cs
index 307a9163..ceeeec81 100644
--- a/ColorPicker/Classes/Global.cs
+++ b/ColorPicker/Classes/Global.cs
@@ -24,6 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using ColorHelper;
 using ColorPicker.Enums;
 using ColorPicker.Pages;
+using ColorPicker.Properties;
 using Microsoft.Win32;
 using PeyrSharp.Enums;
 using PeyrSharp.Env;
@@ -161,7 +162,7 @@ public static System.Drawing.Color GenerateRandomColorDrawing()
 		int r = random.Next(0, 255); int g = random.Next(0, 255); int b = random.Next(0, 255); // Generate random values
 		return System.Drawing.Color.FromArgb(r, g, b);
 	}
-	public static Color GetColorFromResource(string resourceName) => (Color)System.Windows.Media.ColorConverter.ConvertFromString(Application.Current.Resources[resourceName].ToString());
+	public static SolidColorBrush GetColorFromResource(string resource) => (SolidColorBrush)Application.Current.Resources[resource];
 
 	public static double GetLuminance(int r, int g, int b)
 	{
diff --git a/ColorPicker/MainWindow.xaml b/ColorPicker/MainWindow.xaml
index 43c19286..655c76da 100644
--- a/ColorPicker/MainWindow.xaml
+++ b/ColorPicker/MainWindow.xaml
@@ -14,7 +14,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     FontFamily="/Fonts/#Hauora"
-    Foreground="{Binding Source={StaticResource Foreground1}}"
+    Foreground="{DynamicResource Foreground1}"
     Icon="Images/CPM.png"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
@@ -54,10 +54,10 @@
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="true">
-                                <Setter TargetName="border" Property="Background" Value="{Binding Source={StaticResource WindowButtonsHover1}}" />
+                                <Setter TargetName="border" Property="Background" Value="{DynamicResource WindowButtonsHover1}" />
                             </Trigger>
                             <Trigger Property="IsPressed" Value="true">
-                                <Setter TargetName="border" Property="Background" Value="{Binding Source={StaticResource WindowButtonsPressed1}}" />
+                                <Setter TargetName="border" Property="Background" Value="{DynamicResource WindowButtonsPressed1}" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -116,11 +116,9 @@
         Name="WindowBorder"
         Margin="10"
         d:Background="#fff"
+        Background="{DynamicResource BackgroundImg}"
         BorderThickness="0"
         CornerRadius="5">
-        <Border.Background>
-            <ImageBrush ImageSource="{Binding Source={StaticResource BackgroundImg}}" />
-        </Border.Background>
         <Grid VerticalAlignment="Stretch">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
@@ -141,14 +139,14 @@
                         Grid.Column="1"
                         Padding="5 2"
                         VerticalAlignment="Center"
-                        Background="{Binding Source={StaticResource CardBackground}}"
+                        Background="{DynamicResource CardBackground}"
                         CornerRadius="10">
                         <TextBlock
                             x:Name="VersionTxt"
                             d:Text="5.4.0.2308"
                             FontSize="10"
                             FontWeight="SemiBold"
-                            Foreground="{Binding Source={StaticResource DarkGray}}" />
+                            Foreground="{DynamicResource DarkGray}" />
                     </Border>
                     <Button
                         x:Name="PinBtn"
@@ -160,7 +158,7 @@
                         Content="&#xF602;"
                         FontFamily="/Fonts/#FluentSystemIcons-Regular"
                         FontSize="14"
-                        Foreground="{Binding Source={StaticResource Foreground1}}"
+                        Foreground="{DynamicResource Foreground1}"
                         RenderOptions.EdgeMode="Aliased"
                         Style="{StaticResource TitleBarButtonStyle}" />
                     <Button
@@ -173,7 +171,7 @@
                         Content="&#xFC75;"
                         FontFamily="/Fonts/#FluentSystemIcons-Regular"
                         FontSize="14"
-                        Foreground="{Binding Source={StaticResource Foreground1}}"
+                        Foreground="{DynamicResource Foreground1}"
                         RenderOptions.EdgeMode="Aliased"
                         Style="{StaticResource TitleBarButtonStyle}" />
                     <Button
@@ -186,7 +184,7 @@
                         Content="&#xFA40;"
                         FontFamily="/Fonts/#FluentSystemIcons-Regular"
                         FontSize="14"
-                        Foreground="{Binding Source={StaticResource Foreground1}}"
+                        Foreground="{DynamicResource Foreground1}"
                         RenderOptions.EdgeMode="Aliased"
                         Style="{StaticResource TitleBarButtonStyle}" />
                     <Button
@@ -199,7 +197,7 @@
                         Content="&#xF36B;"
                         FontFamily="/Fonts/#FluentSystemIcons-Regular"
                         FontSize="14"
-                        Foreground="{Binding Source={StaticResource Foreground1}}"
+                        Foreground="{DynamicResource Foreground1}"
                         RenderOptions.EdgeMode="Aliased"
                         Style="{StaticResource TitleBarCloseButtonStyle}" />
                 </Grid>
@@ -267,7 +265,7 @@
                                             VerticalAlignment="Center"
                                             FontFamily="/Fonts/#FluentSystemIcons-Filled"
                                             FontSize="18"
-                                            Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}"
+                                            Foreground="{DynamicResource WindowButtonsHoverForeground1}"
                                             Text="&#xF488;" />
                                     </Border>
                                     <TextBlock
@@ -276,7 +274,7 @@
                                         VerticalAlignment="Center"
                                         FontSize="14"
                                         FontWeight="Bold"
-                                        Foreground="{Binding Source={StaticResource Foreground1}}"
+                                        Foreground="{DynamicResource Foreground1}"
                                         Text="{x:Static lang:Resources.Home}" />
                                 </Grid>
 
@@ -325,7 +323,7 @@
                                             VerticalAlignment="Center"
                                             FontFamily="/Fonts/#FluentSystemIcons-Filled"
                                             FontSize="18"
-                                            Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}"
+                                            Foreground="{DynamicResource WindowButtonsHoverForeground1}"
                                             RenderTransformOrigin="0.5,0.5"
                                             Text="&#xF1F6;" />
                                     </Border>
@@ -335,7 +333,7 @@
                                         VerticalAlignment="Center"
                                         FontSize="14"
                                         FontWeight="Bold"
-                                        Foreground="{Binding Source={StaticResource Foreground1}}"
+                                        Foreground="{DynamicResource Foreground1}"
                                         Text="{x:Static lang:Resources.Bookmarks}" />
                                 </Grid>
 
@@ -380,7 +378,7 @@
                                             x:Name="SettingsIconTxt"
                                             FontFamily="/Fonts/#FluentSystemIcons-Filled"
                                             FontSize="18"
-                                            Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}"
+                                            Foreground="{DynamicResource WindowButtonsHoverForeground1}"
                                             RenderTransformOrigin="0.5,0.5"
                                             Text="&#xF6B3;">
                                             <TextBlock.RenderTransform>
@@ -396,7 +394,7 @@
                                         VerticalAlignment="Center"
                                         FontSize="14"
                                         FontWeight="Bold"
-                                        Foreground="{Binding Source={StaticResource Foreground1}}"
+                                        Foreground="{DynamicResource Foreground1}"
                                         Text="{x:Static lang:Resources.Settings}" />
                                 </Grid>
 
@@ -436,7 +434,7 @@
                                     Background="Transparent"
                                     BorderThickness="0"
                                     Click="PickerBtn_Click"
-                                    Foreground="{Binding Source={StaticResource AccentColor}}"
+                                    Foreground="{DynamicResource AccentColor}"
                                     Style="{DynamicResource DefaultButton}">
                                     <Grid>
                                         <Grid.ColumnDefinitions>
@@ -501,7 +499,7 @@
                                         Content="{x:Static lang:Resources.Selector}"
                                         FontSize="10"
                                         FontWeight="ExtraBold"
-                                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                                        Foreground="{DynamicResource AccentColor}"
                                         Style="{DynamicResource DefaultButton}" />
                                     <Button
                                         x:Name="ChromaticPageBtn"
@@ -514,7 +512,7 @@
                                         Content="{x:Static lang:Resources.ChromaticWheel}"
                                         FontSize="10"
                                         FontWeight="ExtraBold"
-                                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                                        Foreground="{DynamicResource AccentColor}"
                                         Style="{DynamicResource DefaultButton}" />
                                 </StackPanel>
                                 <Button
@@ -526,7 +524,7 @@
                                     Background="Transparent"
                                     BorderThickness="0"
                                     Click="ColorToolsBtn_Click"
-                                    Foreground="{Binding Source={StaticResource AccentColor}}"
+                                    Foreground="{DynamicResource AccentColor}"
                                     Style="{DynamicResource DefaultButton}">
                                     <Grid>
                                         <Grid.ColumnDefinitions>
@@ -591,7 +589,7 @@
                                         Content="{x:Static lang:Resources.Converter}"
                                         FontSize="10"
                                         FontWeight="ExtraBold"
-                                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                                        Foreground="{DynamicResource AccentColor}"
                                         Style="{DynamicResource DefaultButton}" />
                                     <Button
                                         x:Name="TextPageBtn"
@@ -604,7 +602,7 @@
                                         Content="{x:Static lang:Resources.TextTool}"
                                         FontSize="10"
                                         FontWeight="ExtraBold"
-                                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                                        Foreground="{DynamicResource AccentColor}"
                                         Style="{DynamicResource DefaultButton}" />
                                 </StackPanel>
                                 <Button
@@ -616,7 +614,7 @@
                                     Background="Transparent"
                                     BorderThickness="0"
                                     Click="CreationBtn_Click"
-                                    Foreground="{Binding Source={StaticResource AccentColor}}"
+                                    Foreground="{DynamicResource AccentColor}"
                                     Style="{DynamicResource DefaultButton}">
                                     <Grid>
                                         <Grid.ColumnDefinitions>
@@ -687,7 +685,7 @@
                                         Content="{x:Static lang:Resources.Palette}"
                                         FontSize="10"
                                         FontWeight="ExtraBold"
-                                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                                        Foreground="{DynamicResource AccentColor}"
                                         Style="{DynamicResource DefaultButton}" />
                                     <Button
                                         x:Name="HarmoniesPageBtn"
@@ -700,7 +698,7 @@
                                         Content="{x:Static lang:Resources.Harmonies}"
                                         FontSize="10"
                                         FontWeight="ExtraBold"
-                                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                                        Foreground="{DynamicResource AccentColor}"
                                         Style="{DynamicResource DefaultButton}" />
                                     <Button
                                         x:Name="GradientPageBtn"
@@ -713,7 +711,7 @@
                                         Content="{x:Static lang:Resources.Gradient}"
                                         FontSize="10"
                                         FontWeight="ExtraBold"
-                                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                                        Foreground="{DynamicResource AccentColor}"
                                         Style="{DynamicResource DefaultButton}" />
                                     <Button
                                         x:Name="AiCreationPageBtn"
@@ -726,7 +724,7 @@
                                         Content="{x:Static lang:Resources.AIGeneration}"
                                         FontSize="10"
                                         FontWeight="ExtraBold"
-                                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                                        Foreground="{DynamicResource AccentColor}"
                                         Style="{DynamicResource DefaultButton}" />
                                 </StackPanel>
                             </StackPanel>
diff --git a/ColorPicker/MainWindow.xaml.cs b/ColorPicker/MainWindow.xaml.cs
index 35200827..e38cfed2 100644
--- a/ColorPicker/MainWindow.xaml.cs
+++ b/ColorPicker/MainWindow.xaml.cs
@@ -360,12 +360,12 @@ private void CheckButton(Button button, bool isSpecial = false)
 	{
 		if (isSpecial)
 		{
-			button.Background = new SolidColorBrush(Global.GetColorFromResource("Background1"));
+			button.Background = Global.GetColorFromResource("Background1");
 		}
 		else
 		{
-			button.Background = new SolidColorBrush(Global.GetColorFromResource("AccentColor"));
-			button.Foreground = new SolidColorBrush(Global.GetColorFromResource("WindowButtonsHoverForeground1"));
+			button.Background = Global.GetColorFromResource("AccentColor");
+			button.Foreground = Global.GetColorFromResource("WindowButtonsHoverForeground1");
 		}
 	}
 
@@ -385,14 +385,14 @@ private void UnCheckAllButton()
 		AiCreationPageBtn.Background = new SolidColorBrush(Colors.Transparent);
 		HarmoniesPageBtn.Background = new SolidColorBrush(Colors.Transparent);
 
-		SelectorPageBtn.Foreground = new SolidColorBrush(Global.GetColorFromResource("AccentColor"));
-		ChromaticPageBtn.Foreground = new SolidColorBrush(Global.GetColorFromResource("AccentColor"));
-		ConverterPageBtn.Foreground = new SolidColorBrush(Global.GetColorFromResource("AccentColor"));
-		TextPageBtn.Foreground = new SolidColorBrush(Global.GetColorFromResource("AccentColor"));
-		PalettePageBtn.Foreground = new SolidColorBrush(Global.GetColorFromResource("AccentColor"));
-		GradientPageBtn.Foreground = new SolidColorBrush(Global.GetColorFromResource("AccentColor"));
-		AiCreationPageBtn.Foreground = new SolidColorBrush(Global.GetColorFromResource("AccentColor"));
-		HarmoniesPageBtn.Foreground = new SolidColorBrush(Global.GetColorFromResource("AccentColor"));
+		SelectorPageBtn.Foreground = Global.GetColorFromResource("AccentColor");
+		ChromaticPageBtn.Foreground = Global.GetColorFromResource("AccentColor");
+		ConverterPageBtn.Foreground = Global.GetColorFromResource("AccentColor");
+		TextPageBtn.Foreground = Global.GetColorFromResource("AccentColor");
+		PalettePageBtn.Foreground = Global.GetColorFromResource("AccentColor");
+		GradientPageBtn.Foreground = Global.GetColorFromResource("AccentColor");
+		AiCreationPageBtn.Foreground = Global.GetColorFromResource("AccentColor");
+		HarmoniesPageBtn.Foreground = Global.GetColorFromResource("AccentColor");
 	}
 
 	private void ColorToolsBtn_Click(object sender, RoutedEventArgs e)
diff --git a/ColorPicker/Pages/AiGenPage.xaml b/ColorPicker/Pages/AiGenPage.xaml
index e854f606..e84a6f4c 100644
--- a/ColorPicker/Pages/AiGenPage.xaml
+++ b/ColorPicker/Pages/AiGenPage.xaml
@@ -10,7 +10,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     FontFamily="..\Fonts\#Hauora"
-    Foreground="{Binding Source={StaticResource Foreground1}}"
+    Foreground="{DynamicResource Foreground1}"
     mc:Ignorable="d">
 
     <Grid>
@@ -30,7 +30,7 @@
                 VerticalAlignment="Center"
                 FontFamily="../Fonts/#FluentSystemIcons-Regular"
                 FontSize="16"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Text="&#xF4DB;" />
             <TextBlock
                 x:Name="TitleTxt"
@@ -56,7 +56,7 @@
                 Background="Transparent"
                 BorderThickness="0"
                 Click="ColorBtn_Click"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Style="{DynamicResource DefaultButton}">
                 <Grid>
                     <Grid.ColumnDefinitions>
@@ -87,7 +87,7 @@
                 Background="Transparent"
                 BorderThickness="0"
                 Click="PaletteBtn_Click"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Style="{DynamicResource DefaultButton}">
                 <Grid>
                     <Grid.ColumnDefinitions>
@@ -114,18 +114,18 @@
                 Grid.Column="3"
                 Padding="5"
                 VerticalAlignment="Top"
-                Background="{Binding Source={StaticResource Background3}}"
+                Background="{DynamicResource Background3}"
                 Click="BookmarkBtn_Click"
                 Content="&#xF1F6;"
                 FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                Foreground="{Binding Source={StaticResource Foreground1}}"
+                Foreground="{DynamicResource Foreground1}"
                 Style="{DynamicResource DefaultButton}">
                 <Button.ToolTip>
                     <ToolTip
                         x:Name="BookmarkToolTip"
-                        Background="{Binding Source={StaticResource Background1}}"
+                        Background="{DynamicResource Background1}"
                         Content="{x:Static lang:Resources.AddBookmark}"
-                        Foreground="{Binding Source={StaticResource Foreground1}}" />
+                        Foreground="{DynamicResource Foreground1}" />
                 </Button.ToolTip>
             </Button>
         </Grid>
@@ -160,14 +160,14 @@
                 <Border
                     Width="250"
                     HorizontalAlignment="Center"
-                    Background="{Binding Source={StaticResource CardBackground}}"
+                    Background="{DynamicResource CardBackground}"
                     CornerRadius="5">
                     <Border.Effect>
                         <DropShadowEffect
                             BlurRadius="15"
                             Opacity="0.2"
                             ShadowDepth="0"
-                            Color="{Binding Source={StaticResource AccentColor}}" />
+                            Color="{DynamicResource Accent}" />
                     </Border.Effect>
                     <TextBox
                         x:Name="PromptTxt"
@@ -177,35 +177,35 @@
                         Background="Transparent"
                         BorderThickness="0"
                         FontWeight="Bold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         TextAlignment="Center" />
                 </Border>
                 <Button
                     x:Name="GenerateBtn"
                     Margin="5 0"
                     Padding="5 0"
-                    Background="{Binding Source={StaticResource AccentColor}}"
+                    Background="{DynamicResource AccentColor}"
                     BorderThickness="0"
                     Click="GenerateBtn_Click"
                     Content="{x:Static lang:Resources.Generate}"
                     FontWeight="Bold"
-                    Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}"
+                    Foreground="{DynamicResource WindowButtonsHoverForeground1}"
                     Style="{DynamicResource PrimaryButton}" />
                 <Button
                     x:Name="IdeaBtn"
                     Grid.Column="2"
                     Padding="5"
-                    Background="{Binding Source={StaticResource Background3}}"
+                    Background="{DynamicResource Background3}"
                     Click="IdeaBtn_Click"
                     Content="&#xF4DB;"
                     FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                    Foreground="{Binding Source={StaticResource Foreground1}}"
+                    Foreground="{DynamicResource Foreground1}"
                     Style="{DynamicResource DefaultButton}">
                     <Button.ToolTip>
                         <ToolTip
-                            Background="{Binding Source={StaticResource Background1}}"
+                            Background="{DynamicResource Background1}"
                             Content="{x:Static lang:Resources.GetIdeas}"
-                            Foreground="{Binding Source={StaticResource Foreground1}}" />
+                            Foreground="{DynamicResource Foreground1}" />
                     </Button.ToolTip>
                 </Button>
             </StackPanel>
@@ -244,7 +244,7 @@
                     <Border.Effect>
                         <DropShadowEffect
                             x:Name="C1Shadow"
-                            d:Color="{Binding Source={StaticResource AccentColor}}"
+                            d:Color="{DynamicResource Accent}"
                             BlurRadius="15"
                             Opacity="0.2"
                             ShadowDepth="0" />
@@ -262,7 +262,7 @@
                     <Border.Effect>
                         <DropShadowEffect
                             x:Name="C2Shadow"
-                            d:Color="{Binding Source={StaticResource AccentColor}}"
+                            d:Color="{DynamicResource Accent}"
                             BlurRadius="15"
                             Opacity="0.2"
                             ShadowDepth="0" />
@@ -280,7 +280,7 @@
                     <Border.Effect>
                         <DropShadowEffect
                             x:Name="C3Shadow"
-                            d:Color="{Binding Source={StaticResource AccentColor}}"
+                            d:Color="{DynamicResource Accent}"
                             BlurRadius="15"
                             Opacity="0.2"
                             ShadowDepth="0" />
@@ -298,7 +298,7 @@
                     <Border.Effect>
                         <DropShadowEffect
                             x:Name="C4Shadow"
-                            d:Color="{Binding Source={StaticResource AccentColor}}"
+                            d:Color="{DynamicResource Accent}"
                             BlurRadius="15"
                             Opacity="0.2"
                             ShadowDepth="0" />
@@ -316,7 +316,7 @@
                     <Border.Effect>
                         <DropShadowEffect
                             x:Name="C5Shadow"
-                            d:Color="{Binding Source={StaticResource AccentColor}}"
+                            d:Color="{DynamicResource Accent}"
                             BlurRadius="15"
                             Opacity="0.2"
                             ShadowDepth="0" />
@@ -328,14 +328,14 @@
                 <Border
                     Width="250"
                     HorizontalAlignment="Center"
-                    Background="{Binding Source={StaticResource CardBackground}}"
+                    Background="{DynamicResource CardBackground}"
                     CornerRadius="5">
                     <Border.Effect>
                         <DropShadowEffect
                             BlurRadius="15"
                             Opacity="0.2"
                             ShadowDepth="0"
-                            Color="{Binding Source={StaticResource AccentColor}}" />
+                            Color="{DynamicResource Accent}" />
                     </Border.Effect>
                     <TextBox
                         x:Name="PalettePromptTxt"
@@ -345,35 +345,35 @@
                         Background="Transparent"
                         BorderThickness="0"
                         FontWeight="Bold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         TextAlignment="Center" />
                 </Border>
                 <Button
                     x:Name="PaletteGenerateBtn"
                     Margin="5 0"
                     Padding="5 0"
-                    Background="{Binding Source={StaticResource AccentColor}}"
+                    Background="{DynamicResource AccentColor}"
                     BorderThickness="0"
                     Click="PaletteGenerateBtn_Click"
                     Content="{x:Static lang:Resources.Generate}"
                     FontWeight="Bold"
-                    Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}"
+                    Foreground="{DynamicResource WindowButtonsHoverForeground1}"
                     Style="{DynamicResource PrimaryButton}" />
                 <Button
                     x:Name="IdeaPaletteBtn"
                     Grid.Column="2"
                     Padding="5"
-                    Background="{Binding Source={StaticResource Background3}}"
+                    Background="{DynamicResource Background3}"
                     Click="IdeaPaletteBtn_Click"
                     Content="&#xF4DB;"
                     FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                    Foreground="{Binding Source={StaticResource Foreground1}}"
+                    Foreground="{DynamicResource Foreground1}"
                     Style="{DynamicResource DefaultButton}">
                     <Button.ToolTip>
                         <ToolTip
-                            Background="{Binding Source={StaticResource Background1}}"
+                            Background="{DynamicResource Background1}"
                             Content="{x:Static lang:Resources.GetIdeas}"
-                            Foreground="{Binding Source={StaticResource Foreground1}}" />
+                            Foreground="{DynamicResource Foreground1}" />
                     </Button.ToolTip>
                 </Button>
             </StackPanel>
@@ -401,14 +401,14 @@
                     Width="250"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
-                    Background="{Binding Source={StaticResource CardBackground}}"
+                    Background="{DynamicResource CardBackground}"
                     CornerRadius="5">
                     <Border.Effect>
                         <DropShadowEffect
                             BlurRadius="15"
                             Opacity="0.2"
                             ShadowDepth="0"
-                            Color="{Binding Source={StaticResource AccentColor}}" />
+                            Color="{DynamicResource Accent}" />
                     </Border.Effect>
                     <PasswordBox
                         x:Name="ApiKeyTxt"
@@ -417,18 +417,18 @@
                         Background="Transparent"
                         BorderThickness="0"
                         FontWeight="Bold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}" />
+                        Foreground="{DynamicResource DarkGray}" />
                 </Border>
                 <Button
                     x:Name="ApiApplyBtn"
                     Margin="10 0 0 0"
                     Padding="10 5 10 5"
                     VerticalAlignment="Center"
-                    Background="{Binding Source={StaticResource AccentColor}}"
+                    Background="{DynamicResource AccentColor}"
                     Click="ApiApplyBtn_Click"
                     Cursor="Hand"
                     FontWeight="ExtraBold"
-                    Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}"
+                    Foreground="{DynamicResource WindowButtonsHoverForeground1}"
                     Style="{StaticResource PrimaryButton}">
                     <TextBlock
                         Margin="0 0 0 0"
@@ -439,9 +439,9 @@
 
                     <Button.ToolTip>
                         <ToolTip
-                            Background="{Binding Source={StaticResource Background1}}"
+                            Background="{DynamicResource Background1}"
                             Content="{x:Static lang:Resources.Apply}"
-                            Foreground="{Binding Source={StaticResource Foreground1}}" />
+                            Foreground="{DynamicResource Foreground1}" />
                     </Button.ToolTip>
                 </Button>
             </StackPanel>
@@ -456,7 +456,7 @@
                 VerticalAlignment="Center"
                 FontFamily="../Fonts/#FluentSystemIcons-Regular"
                 FontSize="16"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Text="&#xF4A4;" />
             <TextBlock
                 Margin="5 0 0 0"
@@ -477,7 +477,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -496,7 +496,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.RGB}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -505,17 +505,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyRgbBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyRGB}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -534,7 +534,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -553,7 +553,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.HEX}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -562,17 +562,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyHexBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyHEX}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -591,7 +591,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -610,7 +610,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.HSV}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -619,17 +619,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyHsvBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyHSV}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -648,7 +648,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -667,7 +667,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.HSL}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -676,17 +676,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyHslBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyHSV}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -705,7 +705,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -724,7 +724,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.CMYK}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -733,17 +733,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyCmykBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyCMYK}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -762,7 +762,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -781,7 +781,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.DEC}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -790,17 +790,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyDecBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyDEC}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -819,7 +819,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -838,7 +838,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.XYZ}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -847,17 +847,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyXyzBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyXYZ}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -876,7 +876,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -895,7 +895,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.YIQ}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -904,17 +904,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyYiqBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyYIQ}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -933,7 +933,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -952,7 +952,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.YUV}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -961,17 +961,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyYuvBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyYUV}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
diff --git a/ColorPicker/Pages/AiGenPage.xaml.cs b/ColorPicker/Pages/AiGenPage.xaml.cs
index 1ac0e2b0..15cb16f4 100644
--- a/ColorPicker/Pages/AiGenPage.xaml.cs
+++ b/ColorPicker/Pages/AiGenPage.xaml.cs
@@ -202,7 +202,7 @@ private async void GenerateBtn_Click(object sender, RoutedEventArgs e)
 		catch { }
 	}
 
-	private void CheckButton(Button button) => button.Background = new SolidColorBrush { Color = Global.GetColorFromResource("LightAccentColor") };
+	private void CheckButton(Button button) => button.Background = Global.GetColorFromResource("LightAccentColor");
 
 	private void UnCheckAllButtons()
 	{
diff --git a/ColorPicker/Pages/BookmarksPage.xaml b/ColorPicker/Pages/BookmarksPage.xaml
index 2cb87782..fa62eb87 100644
--- a/ColorPicker/Pages/BookmarksPage.xaml
+++ b/ColorPicker/Pages/BookmarksPage.xaml
@@ -11,7 +11,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     FontFamily="../Fonts/#Hauora"
-    Foreground="{Binding Source={StaticResource Foreground1}}"
+    Foreground="{DynamicResource Foreground1}"
     mc:Ignorable="d">
 
     <Grid>
@@ -29,7 +29,7 @@
                 VerticalAlignment="Center"
                 FontFamily="../Fonts/#FluentSystemIcons-Regular"
                 FontSize="16"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Text="&#xF1F6;" />
             <TextBlock
                 x:Name="TitleTxt"
@@ -52,7 +52,7 @@
                 Background="Transparent"
                 BorderThickness="0"
                 Click="ColorsBtn_Click"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Style="{DynamicResource DefaultButton}">
                 <Grid>
                     <Grid.ColumnDefinitions>
@@ -82,7 +82,7 @@
                 Background="Transparent"
                 BorderThickness="0"
                 Click="PaletteBtn_Click"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Style="{DynamicResource DefaultButton}">
                 <Grid>
                     <Grid.ColumnDefinitions>
@@ -112,7 +112,7 @@
                 Background="Transparent"
                 BorderThickness="0"
                 Click="GradientsBtn_Click"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Style="{DynamicResource DefaultButton}">
                 <Grid>
                     <Grid.ColumnDefinitions>
@@ -142,7 +142,7 @@
                 Background="Transparent"
                 BorderThickness="0"
                 Click="TextBtn_Click"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Style="{DynamicResource DefaultButton}">
                 <Grid>
                     <Grid.ColumnDefinitions>
@@ -176,7 +176,7 @@
             Background="Transparent"
             BorderThickness="0"
             Click="EmptyHistoryBtn_Click"
-            Foreground="{Binding Source={StaticResource Red}}"
+            Foreground="{DynamicResource Red}"
             Style="{DynamicResource StandardButton}">
             <Grid>
                 <Grid.ColumnDefinitions>
diff --git a/ColorPicker/Pages/BookmarksPage.xaml.cs b/ColorPicker/Pages/BookmarksPage.xaml.cs
index a301b036..65fb8f34 100644
--- a/ColorPicker/Pages/BookmarksPage.xaml.cs
+++ b/ColorPicker/Pages/BookmarksPage.xaml.cs
@@ -139,7 +139,7 @@ private void UnCheckAllButtons()
 			TextBookmarks.Visibility = Visibility.Collapsed;
 		}
 
-		private void CheckButton(Button button) => button.Background = new SolidColorBrush { Color = Global.GetColorFromResource("LightAccentColor") };
+		private void CheckButton(Button button) => button.Background = Global.GetColorFromResource("LightAccentColor");
 
 		private void TextBtn_Click(object sender, RoutedEventArgs e)
 		{
diff --git a/ColorPicker/Pages/ChromaticWheelPage.xaml b/ColorPicker/Pages/ChromaticWheelPage.xaml
index 256ef4e7..1eb3ff2a 100644
--- a/ColorPicker/Pages/ChromaticWheelPage.xaml
+++ b/ColorPicker/Pages/ChromaticWheelPage.xaml
@@ -10,7 +10,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     FontFamily="..\Fonts\#Hauora"
-    Foreground="{Binding Source={StaticResource Foreground1}}"
+    Foreground="{DynamicResource Foreground1}"
     mc:Ignorable="d">
 
     <Grid>
@@ -35,7 +35,7 @@
                 VerticalAlignment="Center"
                 FontFamily="../Fonts/#FluentSystemIcons-Regular"
                 FontSize="16"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Text="&#xF5FB;" />
             <TextBlock
                 x:Name="TitleTxt"
@@ -59,7 +59,7 @@
                 Background="Transparent"
                 BorderThickness="0"
                 Click="CircleBtn_Click"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Style="{DynamicResource DefaultButton}">
                 <Grid>
                     <Grid.ColumnDefinitions>
@@ -89,7 +89,7 @@
                 Background="Transparent"
                 BorderThickness="0"
                 Click="DiscBtn_Click"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Style="{DynamicResource DefaultButton}">
                 <Grid>
                     <Grid.ColumnDefinitions>
@@ -119,7 +119,7 @@
                 Background="Transparent"
                 BorderThickness="0"
                 Click="ShadesBtn_Click"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Style="{DynamicResource DefaultButton}">
                 <Grid>
                     <Grid.ColumnDefinitions>
@@ -160,7 +160,7 @@
             Padding="5"
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
-            Background="{Binding Source={StaticResource CardBackground}}"
+            Background="{DynamicResource CardBackground}"
             CornerRadius="50 0 0 50"
             Cursor="Hand"
             MouseLeftButtonUp="PreviewBorder_MouseLeftButtonUp"
@@ -170,7 +170,7 @@
                     BlurRadius="15"
                     Opacity="0.2"
                     ShadowDepth="0"
-                    Color="{Binding Source={StaticResource AccentColor}}" />
+                    Color="{DynamicResource Accent}" />
             </Border.Effect>
             <Border
                 x:Name="ColorBorder"
@@ -192,7 +192,7 @@
                 VerticalAlignment="Center"
                 FontFamily="../Fonts/#FluentSystemIcons-Regular"
                 FontSize="16"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Text="&#xF4A4;" />
             <TextBlock
                 Margin="5 0 0 0"
@@ -213,7 +213,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -232,7 +232,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.RGB}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -241,17 +241,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyRgbBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyRGB}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -270,7 +270,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -289,7 +289,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.HEX}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -298,17 +298,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyHexBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyHEX}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -327,7 +327,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -346,7 +346,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.HSV}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -355,17 +355,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyHsvBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyHSV}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -384,7 +384,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -403,7 +403,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.HSL}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -412,17 +412,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyHslBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyHSV}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -441,7 +441,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -460,7 +460,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.CMYK}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -469,17 +469,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyCmykBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyCMYK}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -497,7 +497,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -516,7 +516,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.DEC}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -525,17 +525,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyDecBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyDEC}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -553,7 +553,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -572,7 +572,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.XYZ}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -581,17 +581,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyXyzBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyXYZ}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -610,7 +610,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -629,7 +629,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.YIQ}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -638,17 +638,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyYiqBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyYIQ}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -667,7 +667,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -686,7 +686,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.YUV}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -695,17 +695,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyYuvBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyYUV}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
diff --git a/ColorPicker/Pages/ChromaticWheelPage.xaml.cs b/ColorPicker/Pages/ChromaticWheelPage.xaml.cs
index 3763f139..0fd39488 100644
--- a/ColorPicker/Pages/ChromaticWheelPage.xaml.cs
+++ b/ColorPicker/Pages/ChromaticWheelPage.xaml.cs
@@ -126,7 +126,7 @@ private void UnCheckAllButtons()
 		ShadesBtn.Background = new SolidColorBrush { Color = Colors.Transparent };
 	}
 
-	private void CheckButton(Button button) => button.Background = new SolidColorBrush { Color = Global.GetColorFromResource("LightAccentColor") };
+	private void CheckButton(Button button) => button.Background = Global.GetColorFromResource("LightAccentColor");
 
 	private void CopyYiqBtn_Click(object sender, RoutedEventArgs e)
 	{
diff --git a/ColorPicker/Pages/ConverterPage.xaml b/ColorPicker/Pages/ConverterPage.xaml
index a9ea43ae..410e1507 100644
--- a/ColorPicker/Pages/ConverterPage.xaml
+++ b/ColorPicker/Pages/ConverterPage.xaml
@@ -10,7 +10,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     FontFamily="..\Fonts\#Hauora"
-    Foreground="{Binding Source={StaticResource Foreground1}}"
+    Foreground="{DynamicResource Foreground1}"
     mc:Ignorable="d">
 
     <Grid>
@@ -26,7 +26,7 @@
                 VerticalAlignment="Center"
                 FontFamily="../Fonts/#FluentSystemIcons-Regular"
                 FontSize="16"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Text="&#xF18E;" />
             <TextBlock
                 x:Name="TitleTxt"
@@ -42,14 +42,14 @@
             Padding="10"
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
-            Background="{Binding Source={StaticResource CardBackground}}"
+            Background="{DynamicResource CardBackground}"
             CornerRadius="10">
             <Border.Effect>
                 <DropShadowEffect
                     BlurRadius="15"
                     Opacity="0.2"
                     ShadowDepth="0"
-                    Color="{Binding Source={StaticResource AccentColor}}" />
+                    Color="{DynamicResource Accent}" />
             </Border.Effect>
 
             <Grid>
@@ -78,7 +78,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.RGB}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                     <Button
                         x:Name="HexBtn"
@@ -90,7 +90,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.HEX}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                     <Button
                         x:Name="HsvBtn"
@@ -102,7 +102,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.HSV}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                     <Button
                         x:Name="HslBtn"
@@ -114,7 +114,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.HSL}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                     <Button
                         x:Name="CmykBtn"
@@ -126,7 +126,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.CMYK}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                     <Button
                         x:Name="DecBtn"
@@ -138,7 +138,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.DEC}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                     <Button
                         x:Name="XyzBtn"
@@ -150,7 +150,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.XYZ}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                     <Button
                         x:Name="YiqBtn"
@@ -162,7 +162,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.YIQ}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                     <Button
                         x:Name="YuvBtn"
@@ -174,7 +174,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.YUV}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                 </StackPanel>
 
@@ -202,7 +202,7 @@
                         x:Name="B1"
                         Width="50"
                         HorizontalAlignment="Center"
-                        Background="{Binding Source={StaticResource CardBackground}}"
+                        Background="{DynamicResource CardBackground}"
                         CornerRadius="5"
                         Visibility="Collapsed">
                         <Border.Effect>
@@ -210,7 +210,7 @@
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
                         </Border.Effect>
                         <Grid>
                             <TextBox
@@ -223,7 +223,7 @@
                                 CommandManager.CanExecute="Txt1_CanExecute"
                                 CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                 FontWeight="Bold"
-                                Foreground="{Binding Source={StaticResource DarkGray}}"
+                                Foreground="{DynamicResource DarkGray}"
                                 TextAlignment="Center"
                                 TextChanged="Txt1_TextChanged" />
                         </Grid>
@@ -238,7 +238,7 @@
                         x:Name="B2"
                         Width="50"
                         HorizontalAlignment="Center"
-                        Background="{Binding Source={StaticResource CardBackground}}"
+                        Background="{DynamicResource CardBackground}"
                         CornerRadius="5"
                         Visibility="Collapsed">
                         <Border.Effect>
@@ -246,7 +246,7 @@
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
                         </Border.Effect>
                         <Grid>
                             <TextBox
@@ -259,7 +259,7 @@
                                 CommandManager.CanExecute="Txt1_CanExecute"
                                 CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                 FontWeight="Bold"
-                                Foreground="{Binding Source={StaticResource DarkGray}}"
+                                Foreground="{DynamicResource DarkGray}"
                                 TextAlignment="Center"
                                 TextChanged="Txt1_TextChanged" />
                         </Grid>
@@ -274,7 +274,7 @@
                         x:Name="B3"
                         Width="50"
                         HorizontalAlignment="Center"
-                        Background="{Binding Source={StaticResource CardBackground}}"
+                        Background="{DynamicResource CardBackground}"
                         CornerRadius="5"
                         Visibility="Collapsed">
                         <Border.Effect>
@@ -282,7 +282,7 @@
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
                         </Border.Effect>
                         <Grid>
                             <TextBox
@@ -295,7 +295,7 @@
                                 CommandManager.CanExecute="Txt1_CanExecute"
                                 CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                 FontWeight="Bold"
-                                Foreground="{Binding Source={StaticResource DarkGray}}"
+                                Foreground="{DynamicResource DarkGray}"
                                 TextAlignment="Center"
                                 TextChanged="Txt1_TextChanged" />
                         </Grid>
@@ -310,7 +310,7 @@
                         x:Name="B4"
                         Width="50"
                         HorizontalAlignment="Center"
-                        Background="{Binding Source={StaticResource CardBackground}}"
+                        Background="{DynamicResource CardBackground}"
                         CornerRadius="5"
                         Visibility="Collapsed">
                         <Border.Effect>
@@ -318,7 +318,7 @@
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
                         </Border.Effect>
                         <Grid>
                             <TextBox
@@ -331,7 +331,7 @@
                                 CommandManager.CanExecute="Txt1_CanExecute"
                                 CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                 FontWeight="Bold"
-                                Foreground="{Binding Source={StaticResource DarkGray}}"
+                                Foreground="{DynamicResource DarkGray}"
                                 TextAlignment="Center"
                                 TextChanged="Txt1_TextChanged" />
                         </Grid>
@@ -346,7 +346,7 @@
                         x:Name="B5"
                         Width="100"
                         HorizontalAlignment="Center"
-                        Background="{Binding Source={StaticResource CardBackground}}"
+                        Background="{DynamicResource CardBackground}"
                         CornerRadius="5"
                         Visibility="Collapsed">
                         <Border.Effect>
@@ -354,7 +354,7 @@
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
                         </Border.Effect>
                         <Grid>
                             <TextBox
@@ -367,7 +367,7 @@
                                 CommandManager.CanExecute="Txt1_CanExecute"
                                 CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                 FontWeight="Bold"
-                                Foreground="{Binding Source={StaticResource DarkGray}}"
+                                Foreground="{DynamicResource DarkGray}"
                                 TextAlignment="Center"
                                 TextChanged="Txt1_TextChanged" />
                         </Grid>
@@ -396,17 +396,17 @@
                         Grid.Column="2"
                         Padding="5"
                         VerticalAlignment="Top"
-                        Background="{Binding Source={StaticResource Background3}}"
+                        Background="{DynamicResource Background3}"
                         Click="PaletteBtn_Click"
                         Content="&#xF2F6;"
                         FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                        Foreground="{Binding Source={StaticResource Foreground1}}"
+                        Foreground="{DynamicResource Foreground1}"
                         Style="{DynamicResource DefaultButton}">
                         <Button.ToolTip>
                             <ToolTip
-                                Background="{Binding Source={StaticResource Background1}}"
+                                Background="{DynamicResource Background1}"
                                 Content="{x:Static lang:Resources.GenerateColor}"
-                                Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                Foreground="{DynamicResource Foreground1}" />
                         </Button.ToolTip>
                     </Button>
                     <Button
@@ -414,18 +414,18 @@
                         Grid.Column="3"
                         Padding="5"
                         VerticalAlignment="Top"
-                        Background="{Binding Source={StaticResource Background3}}"
+                        Background="{DynamicResource Background3}"
                         Click="BookmarkBtn_Click"
                         Content="&#xF1F6;"
                         FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                        Foreground="{Binding Source={StaticResource Foreground1}}"
+                        Foreground="{DynamicResource Foreground1}"
                         Style="{DynamicResource DefaultButton}">
                         <Button.ToolTip>
                             <ToolTip
                                 x:Name="BookmarkToolTip"
-                                Background="{Binding Source={StaticResource Background1}}"
+                                Background="{DynamicResource Background1}"
                                 Content="{x:Static lang:Resources.AddBookmark}"
-                                Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                Foreground="{DynamicResource Foreground1}" />
                         </Button.ToolTip>
                     </Button>
                 </StackPanel>
@@ -440,7 +440,7 @@
                 VerticalAlignment="Center"
                 FontFamily="../Fonts/#FluentSystemIcons-Regular"
                 FontSize="16"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Text="&#xF4A4;" />
             <TextBlock
                 Margin="5 0 0 0"
@@ -460,7 +460,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -479,7 +479,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.RGB}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -488,17 +488,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyRgbBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyRGB}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -517,7 +517,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -536,7 +536,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.HEX}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -545,17 +545,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyHexBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyHEX}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -574,7 +574,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -593,7 +593,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.HSV}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -602,17 +602,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyHsvBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyHSV}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -631,7 +631,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -650,7 +650,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.HSL}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -659,17 +659,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyHslBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyHSV}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -688,7 +688,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -707,7 +707,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.CMYK}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -716,17 +716,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyCmykBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyCMYK}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -744,7 +744,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -763,7 +763,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.DEC}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -772,17 +772,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyDecBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyDEC}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -800,7 +800,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -819,7 +819,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.XYZ}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -828,17 +828,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyXyzBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyXYZ}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -857,7 +857,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -876,7 +876,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.YIQ}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -885,17 +885,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyYiqBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyYIQ}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -914,7 +914,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -933,7 +933,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.YUV}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -942,17 +942,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyYuvBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyYUV}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
diff --git a/ColorPicker/Pages/ConverterPage.xaml.cs b/ColorPicker/Pages/ConverterPage.xaml.cs
index 48170820..5bb12728 100644
--- a/ColorPicker/Pages/ConverterPage.xaml.cs
+++ b/ColorPicker/Pages/ConverterPage.xaml.cs
@@ -100,7 +100,7 @@ internal void RgbBtn_Click(object sender, RoutedEventArgs? e)
 		LoadInputUI();
 	}
 
-	private void CheckButton(Button button) => button.Background = new SolidColorBrush { Color = Global.GetColorFromResource("LightAccentColor") };
+	private void CheckButton(Button button) => button.Background = Global.GetColorFromResource("LightAccentColor");
 	internal ColorInfo ColorInfo { get; set; }
 
 	private RGB ConvertToRgb()
@@ -150,7 +150,7 @@ internal void LoadDetails(bool setColor = false)
 		// Show a success message to the user
 		ColorValidTxt.Text = Properties.Resources.ColorValid;
 		ColorValidIconTxt.Text = "\uF299";
-		ColorValidIconTxt.Foreground = new SolidColorBrush { Color = Global.GetColorFromResource("Green") };
+		ColorValidIconTxt.Foreground = Global.GetColorFromResource("Green");
 
 		// Load the bookmark icon
 		if (!Global.Bookmarks.ColorBookmarks.Contains(HexTxt.Text))
@@ -347,7 +347,7 @@ private void Txt1_TextChanged(object sender, TextChangedEventArgs e)
 			// Show an error message to the user
 			ColorValidTxt.Text = Properties.Resources.InvalidColor;
 			ColorValidIconTxt.Text = "\uF36E";
-			ColorValidIconTxt.Foreground = new SolidColorBrush { Color = Global.GetColorFromResource("Red") };
+			ColorValidIconTxt.Foreground = Global.GetColorFromResource("Red");
 		}
 	}
 
diff --git a/ColorPicker/Pages/FirstRun/FeaturesPage.xaml b/ColorPicker/Pages/FirstRun/FeaturesPage.xaml
index 209052f3..c9e66868 100644
--- a/ColorPicker/Pages/FirstRun/FeaturesPage.xaml
+++ b/ColorPicker/Pages/FirstRun/FeaturesPage.xaml
@@ -10,7 +10,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     FontFamily="../../Fonts/#Hauora"
-    Foreground="{Binding Source={StaticResource Foreground1}}"
+    Foreground="{DynamicResource Foreground1}"
     mc:Ignorable="d">
 
     <Page.Triggers>
@@ -72,14 +72,14 @@
                     Margin="80 5 5 5"
                     Padding="5"
                     HorizontalAlignment="Center"
-                    Background="{Binding Source={StaticResource CardBackground}}"
+                    Background="{DynamicResource CardBackground}"
                     CornerRadius="5">
                     <Border.Effect>
                         <DropShadowEffect
                             BlurRadius="15"
                             Opacity="0.2"
                             ShadowDepth="0"
-                            Color="{Binding Source={StaticResource AccentColor}}" />
+                            Color="{DynamicResource Accent}" />
                     </Border.Effect>
                     <Grid>
                         <Grid.ColumnDefinitions>
@@ -94,7 +94,7 @@
                         <TextBlock
                             FontFamily="../../Fonts/#FluentSystemIcons-Filled"
                             FontSize="24"
-                            Foreground="{Binding Source={StaticResource AccentColor}}"
+                            Foreground="{DynamicResource AccentColor}"
                             Text="&#xF9BC;" />
                         <TextBlock
                             Grid.Column="1"
@@ -118,14 +118,14 @@
                     Margin="80 5 5 5"
                     Padding="5"
                     HorizontalAlignment="Center"
-                    Background="{Binding Source={StaticResource CardBackground}}"
+                    Background="{DynamicResource CardBackground}"
                     CornerRadius="5">
                     <Border.Effect>
                         <DropShadowEffect
                             BlurRadius="15"
                             Opacity="0.2"
                             ShadowDepth="0"
-                            Color="{Binding Source={StaticResource AccentColor}}" />
+                            Color="{DynamicResource Accent}" />
                     </Border.Effect>
                     <Grid>
                         <Grid.ColumnDefinitions>
@@ -140,7 +140,7 @@
                         <TextBlock
                             FontFamily="../../Fonts/#FluentSystemIcons-Filled"
                             FontSize="24"
-                            Foreground="{Binding Source={StaticResource AccentColor}}"
+                            Foreground="{DynamicResource AccentColor}"
                             Text="&#xF18E;" />
                         <TextBlock
                             Grid.Column="1"
@@ -164,14 +164,14 @@
                     Margin="80 5 5 5"
                     Padding="5"
                     HorizontalAlignment="Center"
-                    Background="{Binding Source={StaticResource CardBackground}}"
+                    Background="{DynamicResource CardBackground}"
                     CornerRadius="5">
                     <Border.Effect>
                         <DropShadowEffect
                             BlurRadius="15"
                             Opacity="0.2"
                             ShadowDepth="0"
-                            Color="{Binding Source={StaticResource AccentColor}}" />
+                            Color="{DynamicResource Accent}" />
                     </Border.Effect>
                     <Grid>
                         <Grid.ColumnDefinitions>
@@ -186,7 +186,7 @@
                         <TextBlock
                             FontFamily="../../Fonts/#FluentSystemIcons-Filled"
                             FontSize="24"
-                            Foreground="{Binding Source={StaticResource AccentColor}}"
+                            Foreground="{DynamicResource AccentColor}"
                             Text="&#xFD3F;" />
                         <TextBlock
                             Grid.Column="1"
@@ -211,13 +211,13 @@
             Margin="5 10"
             Padding="10 5"
             HorizontalAlignment="Center"
-            Background="{Binding Source={StaticResource AccentColor}}"
+            Background="{DynamicResource AccentColor}"
             BorderThickness="0"
             Click="NextBtn_Click"
             Content="{x:Static lang:Resources.Next}"
             Cursor="Hand"
             FontWeight="ExtraBold"
-            Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}"
+            Foreground="{DynamicResource WindowButtonsHoverForeground1}"
             Style="{DynamicResource PrimaryButton}" />
 
     </Grid>
diff --git a/ColorPicker/Pages/FirstRun/JumpInPage.xaml b/ColorPicker/Pages/FirstRun/JumpInPage.xaml
index 541601c0..4cc98a90 100644
--- a/ColorPicker/Pages/FirstRun/JumpInPage.xaml
+++ b/ColorPicker/Pages/FirstRun/JumpInPage.xaml
@@ -10,7 +10,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     FontFamily="../../Fonts/#Hauora"
-    Foreground="{Binding Source={StaticResource Foreground1}}"
+    Foreground="{DynamicResource Foreground1}"
     mc:Ignorable="d">
     <Page.Triggers>
         <EventTrigger RoutedEvent="Loaded">
@@ -43,13 +43,13 @@
                 Margin="5 15"
                 Padding="10 5"
                 HorizontalAlignment="Center"
-                Background="{Binding Source={StaticResource AccentColor}}"
+                Background="{DynamicResource AccentColor}"
                 BorderThickness="0"
                 Click="NextBtn_Click"
                 Content="{x:Static lang:Resources.LetsGo}"
                 Cursor="Hand"
                 FontWeight="ExtraBold"
-                Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}"
+                Foreground="{DynamicResource WindowButtonsHoverForeground1}"
                 Style="{DynamicResource PrimaryButton}" />
 
         </StackPanel>
diff --git a/ColorPicker/Pages/FirstRun/SynethiaPage.xaml b/ColorPicker/Pages/FirstRun/SynethiaPage.xaml
index 741af974..88894a4e 100644
--- a/ColorPicker/Pages/FirstRun/SynethiaPage.xaml
+++ b/ColorPicker/Pages/FirstRun/SynethiaPage.xaml
@@ -10,7 +10,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     FontFamily="../../Fonts/#Hauora"
-    Foreground="{Binding Source={StaticResource Foreground1}}"
+    Foreground="{DynamicResource Foreground1}"
     mc:Ignorable="d">
 
     <Grid>
@@ -26,7 +26,7 @@
                 <TextBlock
                     FontFamily="../../Fonts/#FluentSystemIcons-Filled"
                     FontSize="24"
-                    Foreground="{Binding Source={StaticResource AccentColor}}"
+                    Foreground="{DynamicResource AccentColor}"
                     Text="&#xF5BF;" />
                 <TextBlock
                     Margin="10 0 0 0"
@@ -40,7 +40,7 @@
                 <TextBlock
                     FontFamily="../../Fonts/#FluentSystemIcons-Filled"
                     FontSize="24"
-                    Foreground="{Binding Source={StaticResource AccentColor}}"
+                    Foreground="{DynamicResource AccentColor}"
                     Text="&#xF35C;" />
                 <TextBlock
                     Margin="10 0 0 0"
@@ -54,7 +54,7 @@
                 <TextBlock
                     FontFamily="../../Fonts/#FluentSystemIcons-Filled"
                     FontSize="24"
-                    Foreground="{Binding Source={StaticResource AccentColor}}"
+                    Foreground="{DynamicResource AccentColor}"
                     Text="&#xF488;" />
                 <TextBlock
                     Margin="10 0 0 0"
@@ -68,7 +68,7 @@
                 <TextBlock
                     FontFamily="../../Fonts/#FluentSystemIcons-Filled"
                     FontSize="24"
-                    Foreground="{Binding Source={StaticResource AccentColor}}"
+                    Foreground="{DynamicResource AccentColor}"
                     Text="&#xF345;" />
                 <TextBlock
                     Margin="10 0 0 0"
@@ -83,25 +83,25 @@
                     x:Name="NextBtn"
                     Margin="5 10"
                     Padding="10 5"
-                    Background="{Binding Source={StaticResource AccentColor}}"
+                    Background="{DynamicResource AccentColor}"
                     BorderThickness="0"
                     Click="NextBtn_Click"
                     Content="{x:Static lang:Resources.Agree}"
                     Cursor="Hand"
                     FontWeight="ExtraBold"
-                    Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}"
+                    Foreground="{DynamicResource WindowButtonsHoverForeground1}"
                     Style="{DynamicResource PrimaryButton}" />
                 <Button
                     x:Name="DisagreeBtn"
                     Margin="5 10"
                     Padding="10 5"
-                    Background="{Binding Source={StaticResource LightAccentColor}}"
+                    Background="{DynamicResource LightAccentColor}"
                     BorderThickness="0"
                     Click="DisagreeBtn_Click"
                     Content="{x:Static lang:Resources.NoThanks}"
                     Cursor="Hand"
                     FontWeight="ExtraBold"
-                    Foreground="{Binding Source={StaticResource AccentColor}}"
+                    Foreground="{DynamicResource AccentColor}"
                     Style="{DynamicResource PrimaryButton}" />
             </StackPanel>
         </StackPanel>
diff --git a/ColorPicker/Pages/FirstRun/ThemePage.xaml b/ColorPicker/Pages/FirstRun/ThemePage.xaml
index d05ac87f..bff6800f 100644
--- a/ColorPicker/Pages/FirstRun/ThemePage.xaml
+++ b/ColorPicker/Pages/FirstRun/ThemePage.xaml
@@ -10,7 +10,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     FontFamily="../../Fonts/#Hauora"
-    Foreground="{Binding Source={StaticResource Foreground1}}"
+    Foreground="{DynamicResource Foreground1}"
     mc:Ignorable="d">
 
     <Grid>
@@ -126,13 +126,13 @@
             Margin="5 10"
             Padding="10 5"
             HorizontalAlignment="Center"
-            Background="{Binding Source={StaticResource AccentColor}}"
+            Background="{DynamicResource AccentColor}"
             BorderThickness="0"
             Click="NextBtn_Click"
             Content="{x:Static lang:Resources.Next}"
             Cursor="Hand"
             FontWeight="ExtraBold"
-            Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}"
+            Foreground="{DynamicResource WindowButtonsHoverForeground1}"
             Style="{DynamicResource PrimaryButton}" />
 
     </Grid>
diff --git a/ColorPicker/Pages/FirstRun/ThemePage.xaml.cs b/ColorPicker/Pages/FirstRun/ThemePage.xaml.cs
index dbb5b7b2..e61f8bd9 100644
--- a/ColorPicker/Pages/FirstRun/ThemePage.xaml.cs
+++ b/ColorPicker/Pages/FirstRun/ThemePage.xaml.cs
@@ -71,7 +71,7 @@ private void NextBtn_Click(object sender, RoutedEventArgs e)
 		Border ThemeSelectedBorder;
 		private void Border_MouseEnter(object sender, MouseEventArgs e)
 		{
-			((Border)sender).BorderBrush = new SolidColorBrush { Color = Global.GetColorFromResource("AccentColor") };
+			((Border)sender).BorderBrush = Global.GetColorFromResource("AccentColor");
 		}
 
 		private void Border_MouseLeave(object sender, MouseEventArgs e)
@@ -91,7 +91,7 @@ private void LightBorder_MouseLeftButtonUp(object sender, MouseButtonEventArgs e
 		{
 			ResetBorders();
 			ThemeSelectedBorder = (Border)sender;
-			((Border)sender).BorderBrush = new SolidColorBrush { Color = Global.GetColorFromResource("AccentColor") };
+			((Border)sender).BorderBrush = Global.GetColorFromResource("AccentColor");
 			Global.Settings.Theme = Themes.Light;
 			XmlSerializerManager.SaveToXml(Global.Settings, Global.SettingsPath);
 		}
@@ -100,7 +100,7 @@ private void DarkBorder_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
 		{
 			ResetBorders();
 			ThemeSelectedBorder = (Border)sender;
-			((Border)sender).BorderBrush = new SolidColorBrush { Color = Global.GetColorFromResource("AccentColor") };
+			((Border)sender).BorderBrush = Global.GetColorFromResource("AccentColor");
 			Global.Settings.Theme = Themes.Dark;
 			XmlSerializerManager.SaveToXml(Global.Settings, Global.SettingsPath);
 		}
@@ -109,7 +109,7 @@ private void SystemBorder_MouseLeftButtonUp(object sender, MouseButtonEventArgs
 		{
 			ResetBorders();
 			ThemeSelectedBorder = (Border)sender;
-			((Border)sender).BorderBrush = new SolidColorBrush { Color = Global.GetColorFromResource("AccentColor") };
+			((Border)sender).BorderBrush = Global.GetColorFromResource("AccentColor");
 			Global.Settings.Theme = Themes.System;
 			XmlSerializerManager.SaveToXml(Global.Settings, Global.SettingsPath);
 		}
diff --git a/ColorPicker/Pages/FirstRun/WelcomePage.xaml b/ColorPicker/Pages/FirstRun/WelcomePage.xaml
index 2c2749a3..aca22250 100644
--- a/ColorPicker/Pages/FirstRun/WelcomePage.xaml
+++ b/ColorPicker/Pages/FirstRun/WelcomePage.xaml
@@ -10,7 +10,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     FontFamily="../../Fonts/#Hauora"
-    Foreground="{Binding Source={StaticResource Foreground1}}"
+    Foreground="{DynamicResource Foreground1}"
     mc:Ignorable="d">
 
     <Page.Triggers>
@@ -39,7 +39,7 @@
                 <TextBlock
                     FontSize="32"
                     FontWeight="Bold"
-                    Foreground="{Binding Source={StaticResource AccentColor}}"
+                    Foreground="{DynamicResource AccentColor}"
                     Text="{x:Static lang:Resources.ColorPicker}" />
                 <TextBlock
                     Margin="5 0 0 0"
@@ -59,25 +59,25 @@
                     x:Name="NextBtn"
                     Margin="5 10"
                     Padding="10 5"
-                    Background="{Binding Source={StaticResource AccentColor}}"
+                    Background="{DynamicResource AccentColor}"
                     BorderThickness="0"
                     Click="NextBtn_Click"
                     Content="{x:Static lang:Resources.Next}"
                     Cursor="Hand"
                     FontWeight="ExtraBold"
-                    Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}"
+                    Foreground="{DynamicResource WindowButtonsHoverForeground1}"
                     Style="{DynamicResource PrimaryButton}" />
                 <Button
                     x:Name="SkipBtn"
                     Margin="5 10"
                     Padding="10 5"
-                    Background="{Binding Source={StaticResource LightAccentColor}}"
+                    Background="{DynamicResource LightAccentColor}"
                     BorderThickness="0"
                     Click="SkipBtn_Click"
                     Content="{x:Static lang:Resources.Skip}"
                     Cursor="Hand"
                     FontWeight="ExtraBold"
-                    Foreground="{Binding Source={StaticResource AccentColor}}"
+                    Foreground="{DynamicResource AccentColor}"
                     Style="{DynamicResource PrimaryButton}" />
             </StackPanel>
             <ComboBox
@@ -86,9 +86,9 @@
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
                 Background="Transparent"
-                BorderBrush="{Binding Source={StaticResource AccentColor}}"
+                BorderBrush="{DynamicResource AccentColor}"
                 BorderThickness="2"
-                Foreground="{Binding Source={StaticResource Foreground1}}"
+                Foreground="{DynamicResource Foreground1}"
                 SelectionChanged="LangComboBox_SelectionChanged"
                 Style="{DynamicResource ComboBoxStyle1}">
                 <ComboBoxItem Content="{x:Static lang:Resources.Default}" />
diff --git a/ColorPicker/Pages/GradientPage.xaml b/ColorPicker/Pages/GradientPage.xaml
index 7bd875ed..e9c07472 100644
--- a/ColorPicker/Pages/GradientPage.xaml
+++ b/ColorPicker/Pages/GradientPage.xaml
@@ -10,7 +10,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     FontFamily="..\Fonts\#Hauora"
-    Foreground="{Binding Source={StaticResource Foreground1}}"
+    Foreground="{DynamicResource Foreground1}"
     mc:Ignorable="d">
 
     <Grid>
@@ -32,7 +32,7 @@
                 VerticalAlignment="Center"
                 FontFamily="../Fonts/#FluentSystemIcons-Regular"
                 FontSize="16"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Text="&#xFD36;" />
             <TextBlock
                 x:Name="TitleTxt"
@@ -52,14 +52,14 @@
                 Grid.Row="1"
                 Margin="10"
                 Padding="5"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="10">
                 <Border.Effect>
                     <DropShadowEffect
                         BlurRadius="15"
                         Opacity="0.2"
                         ShadowDepth="0"
-                        Color="{Binding Source={StaticResource AccentColor}}" />
+                        Color="{DynamicResource Accent}" />
                 </Border.Effect>
 
                 <Grid>
@@ -89,7 +89,7 @@
                             Click="RgbBtn_Click"
                             Content="{x:Static lang:Resources.RGB}"
                             FontWeight="ExtraBold"
-                            Foreground="{Binding Source={StaticResource AccentColor}}"
+                            Foreground="{DynamicResource AccentColor}"
                             Style="{DynamicResource DefaultButton}" />
                         <Button
                             x:Name="HexBtn"
@@ -101,7 +101,7 @@
                             Click="RgbBtn_Click"
                             Content="{x:Static lang:Resources.HEX}"
                             FontWeight="ExtraBold"
-                            Foreground="{Binding Source={StaticResource AccentColor}}"
+                            Foreground="{DynamicResource AccentColor}"
                             Style="{DynamicResource DefaultButton}" />
                         <Button
                             x:Name="HsvBtn"
@@ -113,7 +113,7 @@
                             Click="RgbBtn_Click"
                             Content="{x:Static lang:Resources.HSV}"
                             FontWeight="ExtraBold"
-                            Foreground="{Binding Source={StaticResource AccentColor}}"
+                            Foreground="{DynamicResource AccentColor}"
                             Style="{DynamicResource DefaultButton}" />
                         <Button
                             x:Name="HslBtn"
@@ -125,7 +125,7 @@
                             Click="RgbBtn_Click"
                             Content="{x:Static lang:Resources.HSL}"
                             FontWeight="ExtraBold"
-                            Foreground="{Binding Source={StaticResource AccentColor}}"
+                            Foreground="{DynamicResource AccentColor}"
                             Style="{DynamicResource DefaultButton}" />
                         <Button
                             x:Name="CmykBtn"
@@ -137,7 +137,7 @@
                             Click="RgbBtn_Click"
                             Content="{x:Static lang:Resources.CMYK}"
                             FontWeight="ExtraBold"
-                            Foreground="{Binding Source={StaticResource AccentColor}}"
+                            Foreground="{DynamicResource AccentColor}"
                             Style="{DynamicResource DefaultButton}" />
                         <Button
                             x:Name="DecBtn"
@@ -149,7 +149,7 @@
                             Click="RgbBtn_Click"
                             Content="{x:Static lang:Resources.DEC}"
                             FontWeight="ExtraBold"
-                            Foreground="{Binding Source={StaticResource AccentColor}}"
+                            Foreground="{DynamicResource AccentColor}"
                             Style="{DynamicResource DefaultButton}" />
                         <Button
                             x:Name="XyzBtn"
@@ -161,7 +161,7 @@
                             Click="RgbBtn_Click"
                             Content="{x:Static lang:Resources.XYZ}"
                             FontWeight="ExtraBold"
-                            Foreground="{Binding Source={StaticResource AccentColor}}"
+                            Foreground="{DynamicResource AccentColor}"
                             Style="{DynamicResource DefaultButton}" />
                         <Button
                             x:Name="YiqBtn"
@@ -173,7 +173,7 @@
                             Click="RgbBtn_Click"
                             Content="{x:Static lang:Resources.YIQ}"
                             FontWeight="ExtraBold"
-                            Foreground="{Binding Source={StaticResource AccentColor}}"
+                            Foreground="{DynamicResource AccentColor}"
                             Style="{DynamicResource DefaultButton}" />
                         <Button
                             x:Name="YuvBtn"
@@ -185,7 +185,7 @@
                             Click="RgbBtn_Click"
                             Content="{x:Static lang:Resources.YUV}"
                             FontWeight="ExtraBold"
-                            Foreground="{Binding Source={StaticResource AccentColor}}"
+                            Foreground="{DynamicResource AccentColor}"
                             Style="{DynamicResource DefaultButton}" />
                     </StackPanel>
 
@@ -215,7 +215,7 @@
                             x:Name="B1"
                             Width="50"
                             HorizontalAlignment="Center"
-                            Background="{Binding Source={StaticResource CardBackground}}"
+                            Background="{DynamicResource CardBackground}"
                             CornerRadius="5"
                             Visibility="Collapsed">
                             <Border.Effect>
@@ -223,7 +223,7 @@
                                     BlurRadius="15"
                                     Opacity="0.2"
                                     ShadowDepth="0"
-                                    Color="{Binding Source={StaticResource AccentColor}}" />
+                                    Color="{DynamicResource Accent}" />
                             </Border.Effect>
                             <Grid>
                                 <TextBox
@@ -236,7 +236,7 @@
                                     CommandManager.CanExecute="Txt1_CanExecute"
                                     CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                     FontWeight="Bold"
-                                    Foreground="{Binding Source={StaticResource DarkGray}}"
+                                    Foreground="{DynamicResource DarkGray}"
                                     TextAlignment="Center"
                                     TextChanged="Txt1_TextChanged" />
                             </Grid>
@@ -251,7 +251,7 @@
                             x:Name="B2"
                             Width="50"
                             HorizontalAlignment="Center"
-                            Background="{Binding Source={StaticResource CardBackground}}"
+                            Background="{DynamicResource CardBackground}"
                             CornerRadius="5"
                             Visibility="Collapsed">
                             <Border.Effect>
@@ -259,7 +259,7 @@
                                     BlurRadius="15"
                                     Opacity="0.2"
                                     ShadowDepth="0"
-                                    Color="{Binding Source={StaticResource AccentColor}}" />
+                                    Color="{DynamicResource Accent}" />
                             </Border.Effect>
                             <Grid>
                                 <TextBox
@@ -272,7 +272,7 @@
                                     CommandManager.CanExecute="Txt1_CanExecute"
                                     CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                     FontWeight="Bold"
-                                    Foreground="{Binding Source={StaticResource DarkGray}}"
+                                    Foreground="{DynamicResource DarkGray}"
                                     TextAlignment="Center"
                                     TextChanged="Txt1_TextChanged" />
                             </Grid>
@@ -287,7 +287,7 @@
                             x:Name="B3"
                             Width="50"
                             HorizontalAlignment="Center"
-                            Background="{Binding Source={StaticResource CardBackground}}"
+                            Background="{DynamicResource CardBackground}"
                             CornerRadius="5"
                             Visibility="Collapsed">
                             <Border.Effect>
@@ -295,7 +295,7 @@
                                     BlurRadius="15"
                                     Opacity="0.2"
                                     ShadowDepth="0"
-                                    Color="{Binding Source={StaticResource AccentColor}}" />
+                                    Color="{DynamicResource Accent}" />
                             </Border.Effect>
                             <Grid>
                                 <TextBox
@@ -308,7 +308,7 @@
                                     CommandManager.CanExecute="Txt1_CanExecute"
                                     CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                     FontWeight="Bold"
-                                    Foreground="{Binding Source={StaticResource DarkGray}}"
+                                    Foreground="{DynamicResource DarkGray}"
                                     TextAlignment="Center"
                                     TextChanged="Txt1_TextChanged" />
                             </Grid>
@@ -323,7 +323,7 @@
                             x:Name="B4"
                             Width="50"
                             HorizontalAlignment="Center"
-                            Background="{Binding Source={StaticResource CardBackground}}"
+                            Background="{DynamicResource CardBackground}"
                             CornerRadius="5"
                             Visibility="Collapsed">
                             <Border.Effect>
@@ -331,7 +331,7 @@
                                     BlurRadius="15"
                                     Opacity="0.2"
                                     ShadowDepth="0"
-                                    Color="{Binding Source={StaticResource AccentColor}}" />
+                                    Color="{DynamicResource Accent}" />
                             </Border.Effect>
                             <Grid>
                                 <TextBox
@@ -344,7 +344,7 @@
                                     CommandManager.CanExecute="Txt1_CanExecute"
                                     CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                     FontWeight="Bold"
-                                    Foreground="{Binding Source={StaticResource DarkGray}}"
+                                    Foreground="{DynamicResource DarkGray}"
                                     TextAlignment="Center"
                                     TextChanged="Txt1_TextChanged" />
                             </Grid>
@@ -359,7 +359,7 @@
                             x:Name="B5"
                             Width="100"
                             HorizontalAlignment="Center"
-                            Background="{Binding Source={StaticResource CardBackground}}"
+                            Background="{DynamicResource CardBackground}"
                             CornerRadius="5"
                             Visibility="Collapsed">
                             <Border.Effect>
@@ -367,7 +367,7 @@
                                     BlurRadius="15"
                                     Opacity="0.2"
                                     ShadowDepth="0"
-                                    Color="{Binding Source={StaticResource AccentColor}}" />
+                                    Color="{DynamicResource Accent}" />
                             </Border.Effect>
                             <Grid>
                                 <TextBox
@@ -380,7 +380,7 @@
                                     CommandManager.CanExecute="Txt1_CanExecute"
                                     CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                     FontWeight="Bold"
-                                    Foreground="{Binding Source={StaticResource DarkGray}}"
+                                    Foreground="{DynamicResource DarkGray}"
                                     TextAlignment="Center"
                                     TextChanged="Txt1_TextChanged" />
                             </Grid>
@@ -394,11 +394,11 @@
                         Padding="5"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
-                        Background="{Binding Source={StaticResource Background3}}"
+                        Background="{DynamicResource Background3}"
                         Click="SelectColorBtn_Click"
                         Content="{x:Static lang:Resources.Apply}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource Foreground1}}"
+                        Foreground="{DynamicResource Foreground1}"
                         Style="{DynamicResource DefaultButton}" />
 
                 </Grid>
@@ -411,14 +411,14 @@
             Grid.ColumnSpan="2"
             Margin="10"
             Padding="10"
-            Background="{Binding Source={StaticResource CardBackground}}"
+            Background="{DynamicResource CardBackground}"
             CornerRadius="5">
             <Border.Effect>
                 <DropShadowEffect
                     BlurRadius="15"
                     Opacity="0.2"
                     ShadowDepth="0"
-                    Color="{Binding Source={StaticResource AccentColor}}" />
+                    Color="{DynamicResource Accent}" />
             </Border.Effect>
 
             <Grid>
@@ -436,7 +436,7 @@
                         x:Name="ForegroundBorder"
                         Width="30"
                         Height="30"
-                        Background="{Binding Source={StaticResource Foreground1}}"
+                        Background="{DynamicResource Foreground1}"
                         BorderThickness="0"
                         CornerRadius="20"
                         Cursor="Hand"
@@ -447,7 +447,7 @@
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
                         </Border.Effect>
                     </Border>
                     <TextBlock
@@ -458,7 +458,7 @@
                         x:Name="BackgroundBorder"
                         Width="30"
                         Height="30"
-                        Background="{Binding Source={StaticResource Background1}}"
+                        Background="{DynamicResource Background1}"
                         BorderThickness="0"
                         CornerRadius="20"
                         Cursor="Hand"
@@ -469,7 +469,7 @@
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
                         </Border.Effect>
                     </Border>
                     <TextBlock
@@ -480,14 +480,14 @@
                         x:Name="B"
                         Width="50"
                         HorizontalAlignment="Center"
-                        Background="{Binding Source={StaticResource CardBackground}}"
+                        Background="{DynamicResource CardBackground}"
                         CornerRadius="5">
                         <Border.Effect>
                             <DropShadowEffect
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
                         </Border.Effect>
                         <TextBox
                             x:Name="RotateAngleTxt"
@@ -496,7 +496,7 @@
                             Background="Transparent"
                             BorderThickness="0"
                             FontWeight="Bold"
-                            Foreground="{Binding Source={StaticResource DarkGray}}"
+                            Foreground="{DynamicResource DarkGray}"
                             PreviewTextInput="RotateAngleTxt_PreviewTextInput"
                             Text="0"
                             TextAlignment="Center"
@@ -508,17 +508,17 @@
                         x:Name="GenerateGradientBtn"
                         Padding="5"
                         VerticalAlignment="Center"
-                        Background="{Binding Source={StaticResource Background3}}"
+                        Background="{DynamicResource Background3}"
                         Click="GenerateGradientBtn_Click"
                         Content="&#xF191;"
                         FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                        Foreground="{Binding Source={StaticResource Foreground1}}"
+                        Foreground="{DynamicResource Foreground1}"
                         Style="{DynamicResource DefaultButton}">
                         <Button.ToolTip>
                             <ToolTip
-                                Background="{Binding Source={StaticResource Background1}}"
+                                Background="{DynamicResource Background1}"
                                 Content="{x:Static lang:Resources.GenerateGradient}"
-                                Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                Foreground="{DynamicResource Foreground1}" />
                         </Button.ToolTip>
                     </Button>
                     <Button
@@ -526,18 +526,18 @@
                         Margin="5 0 0 0"
                         Padding="5"
                         VerticalAlignment="Center"
-                        Background="{Binding Source={StaticResource Background3}}"
+                        Background="{DynamicResource Background3}"
                         Click="BookmarkBtn_Click"
                         Content="&#xF1F6;"
                         FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                        Foreground="{Binding Source={StaticResource Foreground1}}"
+                        Foreground="{DynamicResource Foreground1}"
                         Style="{DynamicResource DefaultButton}">
                         <Button.ToolTip>
                             <ToolTip
                                 x:Name="BookmarkToolTip"
-                                Background="{Binding Source={StaticResource Background1}}"
+                                Background="{DynamicResource Background1}"
                                 Content="{x:Static lang:Resources.AddBookmark}"
-                                Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                Foreground="{DynamicResource Foreground1}" />
                         </Button.ToolTip>
                     </Button>
                 </StackPanel>
@@ -554,7 +554,7 @@
                     BlurRadius="15"
                     Opacity="0.2"
                     ShadowDepth="0"
-                    Color="{Binding Source={StaticResource AccentColor}}" />
+                    Color="{DynamicResource Accent}" />
             </Border.Effect>
         </Border>
 
@@ -564,14 +564,14 @@
             Grid.ColumnSpan="2"
             Margin="10"
             Padding="10"
-            Background="{Binding Source={StaticResource CardBackground}}"
+            Background="{DynamicResource CardBackground}"
             CornerRadius="5">
             <Border.Effect>
                 <DropShadowEffect
                     BlurRadius="15"
                     Opacity="0.2"
                     ShadowDepth="0"
-                    Color="{Binding Source={StaticResource AccentColor}}" />
+                    Color="{DynamicResource Accent}" />
             </Border.Effect>
 
             <Grid>
@@ -588,7 +588,7 @@
                         VerticalAlignment="Center"
                         FontFamily="../Fonts/#FluentSystemIcons-Regular"
                         FontSize="16"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Text="&#xF8B9;" />
                     <TextBlock
                         Margin="5 0 0 0"
@@ -612,15 +612,15 @@
                             Margin="10 0"
                             Padding="5"
                             VerticalAlignment="Center"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyCssBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}" />
 
                     </StackPanel>
-                    <Border Background="{Binding Source={StaticResource Background2}}" CornerRadius="5">
+                    <Border Background="{DynamicResource Background2}" CornerRadius="5">
                         <TextBox
                             x:Name="CssCodeTxt"
                             Width="210"
@@ -629,7 +629,7 @@
                             Background="Transparent"
                             BorderThickness="0"
                             FontWeight="Bold"
-                            Foreground="{Binding Source={StaticResource DarkGray}}"
+                            Foreground="{DynamicResource DarkGray}"
                             IsReadOnly="True"
                             TextWrapping="WrapWithOverflow" />
                     </Border>
@@ -647,15 +647,15 @@
                             Margin="10 0"
                             Padding="5"
                             VerticalAlignment="Center"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyXamlBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}" />
 
                     </StackPanel>
-                    <Border Background="{Binding Source={StaticResource Background2}}" CornerRadius="5">
+                    <Border Background="{DynamicResource Background2}" CornerRadius="5">
                         <TextBox
                             x:Name="XamlCodeTxt"
                             Width="210"
@@ -664,7 +664,7 @@
                             Background="Transparent"
                             BorderThickness="0"
                             FontWeight="Bold"
-                            Foreground="{Binding Source={StaticResource DarkGray}}"
+                            Foreground="{DynamicResource DarkGray}"
                             IsReadOnly="True"
                             TextWrapping="WrapWithOverflow" />
                     </Border>
diff --git a/ColorPicker/Pages/GradientPage.xaml.cs b/ColorPicker/Pages/GradientPage.xaml.cs
index fd42ede5..7636a3b9 100644
--- a/ColorPicker/Pages/GradientPage.xaml.cs
+++ b/ColorPicker/Pages/GradientPage.xaml.cs
@@ -221,7 +221,7 @@ internal void RgbBtn_Click(object sender, RoutedEventArgs? e)
 		LoadInputUI();
 	}
 
-	private void CheckButton(Button button) => button.Background = new SolidColorBrush { Color = Global.GetColorFromResource("LightAccentColor") };
+	private void CheckButton(Button button) => button.Background = Global.GetColorFromResource("LightAccentColor");
 
 	private void HideAllInput()
 	{
diff --git a/ColorPicker/Pages/HarmoniesPage.xaml b/ColorPicker/Pages/HarmoniesPage.xaml
index aa91f48e..f1ce55ed 100644
--- a/ColorPicker/Pages/HarmoniesPage.xaml
+++ b/ColorPicker/Pages/HarmoniesPage.xaml
@@ -10,7 +10,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     FontFamily="..\Fonts\#Hauora"
-    Foreground="{Binding Source={StaticResource Foreground1}}"
+    Foreground="{DynamicResource Foreground1}"
     mc:Ignorable="d">
 
     <Grid>
@@ -24,7 +24,7 @@
                 VerticalAlignment="Center"
                 FontFamily="../Fonts/#FluentSystemIcons-Regular"
                 FontSize="16"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Text="&#xFD06;" />
             <TextBlock
                 x:Name="TitleTxt"
@@ -38,14 +38,14 @@
             Grid.Row="1"
             Margin="10"
             Padding="5"
-            Background="{Binding Source={StaticResource CardBackground}}"
+            Background="{DynamicResource CardBackground}"
             CornerRadius="10">
             <Border.Effect>
                 <DropShadowEffect
                     BlurRadius="15"
                     Opacity="0.2"
                     ShadowDepth="0"
-                    Color="{Binding Source={StaticResource AccentColor}}" />
+                    Color="{DynamicResource Accent}" />
             </Border.Effect>
 
             <Grid>
@@ -74,7 +74,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.RGB}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                     <Button
                         x:Name="HexBtn"
@@ -86,7 +86,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.HEX}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                     <Button
                         x:Name="HsvBtn"
@@ -98,7 +98,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.HSV}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                     <Button
                         x:Name="HslBtn"
@@ -110,7 +110,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.HSL}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                     <Button
                         x:Name="CmykBtn"
@@ -122,7 +122,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.CMYK}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                     <Button
                         x:Name="DecBtn"
@@ -134,7 +134,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.DEC}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                     <Button
                         x:Name="XyzBtn"
@@ -146,7 +146,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.XYZ}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                     <Button
                         x:Name="YiqBtn"
@@ -158,7 +158,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.YIQ}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                     <Button
                         x:Name="YuvBtn"
@@ -170,7 +170,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.YUV}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                 </StackPanel>
 
@@ -200,7 +200,7 @@
                         x:Name="B1"
                         Width="50"
                         HorizontalAlignment="Center"
-                        Background="{Binding Source={StaticResource CardBackground}}"
+                        Background="{DynamicResource CardBackground}"
                         CornerRadius="5"
                         Visibility="Collapsed">
                         <Border.Effect>
@@ -208,7 +208,7 @@
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
                         </Border.Effect>
                         <Grid>
                             <TextBox
@@ -221,7 +221,7 @@
                                 CommandManager.CanExecute="Txt1_CanExecute"
                                 CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                 FontWeight="Bold"
-                                Foreground="{Binding Source={StaticResource DarkGray}}"
+                                Foreground="{DynamicResource DarkGray}"
                                 TextAlignment="Center"
                                 TextChanged="Txt1_TextChanged" />
                         </Grid>
@@ -236,7 +236,7 @@
                         x:Name="B2"
                         Width="50"
                         HorizontalAlignment="Center"
-                        Background="{Binding Source={StaticResource CardBackground}}"
+                        Background="{DynamicResource CardBackground}"
                         CornerRadius="5"
                         Visibility="Collapsed">
                         <Border.Effect>
@@ -244,7 +244,7 @@
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
                         </Border.Effect>
                         <Grid>
                             <TextBox
@@ -257,7 +257,7 @@
                                 CommandManager.CanExecute="Txt1_CanExecute"
                                 CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                 FontWeight="Bold"
-                                Foreground="{Binding Source={StaticResource DarkGray}}"
+                                Foreground="{DynamicResource DarkGray}"
                                 TextAlignment="Center"
                                 TextChanged="Txt1_TextChanged" />
                         </Grid>
@@ -272,7 +272,7 @@
                         x:Name="B3"
                         Width="50"
                         HorizontalAlignment="Center"
-                        Background="{Binding Source={StaticResource CardBackground}}"
+                        Background="{DynamicResource CardBackground}"
                         CornerRadius="5"
                         Visibility="Collapsed">
                         <Border.Effect>
@@ -280,7 +280,7 @@
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
                         </Border.Effect>
                         <Grid>
                             <TextBox
@@ -293,7 +293,7 @@
                                 CommandManager.CanExecute="Txt1_CanExecute"
                                 CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                 FontWeight="Bold"
-                                Foreground="{Binding Source={StaticResource DarkGray}}"
+                                Foreground="{DynamicResource DarkGray}"
                                 TextAlignment="Center"
                                 TextChanged="Txt1_TextChanged" />
                         </Grid>
@@ -308,7 +308,7 @@
                         x:Name="B4"
                         Width="50"
                         HorizontalAlignment="Center"
-                        Background="{Binding Source={StaticResource CardBackground}}"
+                        Background="{DynamicResource CardBackground}"
                         CornerRadius="5"
                         Visibility="Collapsed">
                         <Border.Effect>
@@ -316,7 +316,7 @@
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
                         </Border.Effect>
                         <Grid>
                             <TextBox
@@ -329,7 +329,7 @@
                                 CommandManager.CanExecute="Txt1_CanExecute"
                                 CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                 FontWeight="Bold"
-                                Foreground="{Binding Source={StaticResource DarkGray}}"
+                                Foreground="{DynamicResource DarkGray}"
                                 TextAlignment="Center"
                                 TextChanged="Txt1_TextChanged" />
                         </Grid>
@@ -344,7 +344,7 @@
                         x:Name="B5"
                         Width="100"
                         HorizontalAlignment="Center"
-                        Background="{Binding Source={StaticResource CardBackground}}"
+                        Background="{DynamicResource CardBackground}"
                         CornerRadius="5"
                         Visibility="Collapsed">
                         <Border.Effect>
@@ -352,7 +352,7 @@
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
                         </Border.Effect>
                         <Grid>
                             <TextBox
@@ -365,7 +365,7 @@
                                 CommandManager.CanExecute="Txt1_CanExecute"
                                 CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                 FontWeight="Bold"
-                                Foreground="{Binding Source={StaticResource DarkGray}}"
+                                Foreground="{DynamicResource DarkGray}"
                                 TextAlignment="Center"
                                 TextChanged="Txt1_TextChanged" />
                         </Grid>
@@ -376,18 +376,18 @@
                     Grid.Column="3"
                     Padding="5"
                     VerticalAlignment="Top"
-                    Background="{Binding Source={StaticResource Background3}}"
+                    Background="{DynamicResource Background3}"
                     Click="BookmarkBtn_Click"
                     Content="&#xF1F6;"
                     FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                    Foreground="{Binding Source={StaticResource Foreground1}}"
+                    Foreground="{DynamicResource Foreground1}"
                     Style="{DynamicResource DefaultButton}">
                     <Button.ToolTip>
                         <ToolTip
                             x:Name="BookmarkToolTip"
-                            Background="{Binding Source={StaticResource Background1}}"
+                            Background="{DynamicResource Background1}"
                             Content="{x:Static lang:Resources.AddBookmark}"
-                            Foreground="{Binding Source={StaticResource Foreground1}}" />
+                            Foreground="{DynamicResource Foreground1}" />
                     </Button.ToolTip>
                 </Button>
             </Grid>
diff --git a/ColorPicker/Pages/HarmoniesPage.xaml.cs b/ColorPicker/Pages/HarmoniesPage.xaml.cs
index 70013321..61c4d76d 100644
--- a/ColorPicker/Pages/HarmoniesPage.xaml.cs
+++ b/ColorPicker/Pages/HarmoniesPage.xaml.cs
@@ -137,8 +137,8 @@ internal void InitHarmonies()
 					},
 					ToolTip = new ToolTip()
 					{
-						Background = new SolidColorBrush { Color = Global.GetColorFromResource("Background1") },
-						Foreground = new SolidColorBrush { Color = Global.GetColorFromResource("Foreground1") },
+						Background = Global.GetColorFromResource("Background1"),
+						Foreground = Global.GetColorFromResource("Foreground1"),
 						Content = new ColorInfo(new(analogousColors[i].R, analogousColors[i].G, analogousColors[i].B)).ToString()
 					},
 				};
@@ -170,8 +170,8 @@ internal void InitHarmonies()
 					},
 					ToolTip = new ToolTip()
 					{
-						Background = new SolidColorBrush { Color = Global.GetColorFromResource("Background1") },
-						Foreground = new SolidColorBrush { Color = Global.GetColorFromResource("Foreground1") },
+						Background = Global.GetColorFromResource("Background1"),
+						Foreground = Global.GetColorFromResource("Foreground1"),
 						Content = new ColorInfo(new(monoColors[i].R, monoColors[i].G, monoColors[i].B)).ToString()
 					},
 				};
@@ -247,7 +247,7 @@ internal void RgbBtn_Click(object sender, RoutedEventArgs? e)
 			Global.SynethiaConfig.PagesInfo[7].InteractionCount++;
 		}
 
-		private void CheckButton(Button button) => button.Background = new SolidColorBrush { Color = Global.GetColorFromResource("LightAccentColor") };
+		private void CheckButton(Button button) => button.Background = Global.GetColorFromResource("LightAccentColor");
 
 		private void HideAllInput()
 		{
diff --git a/ColorPicker/Pages/HomePage.xaml b/ColorPicker/Pages/HomePage.xaml
index be095ade..810826b9 100644
--- a/ColorPicker/Pages/HomePage.xaml
+++ b/ColorPicker/Pages/HomePage.xaml
@@ -11,7 +11,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     FontFamily="../Fonts/#Hauora"
-    Foreground="{Binding Source={StaticResource Foreground1}}"
+    Foreground="{DynamicResource Foreground1}"
     mc:Ignorable="d">
 
     <Grid>
@@ -33,7 +33,7 @@
                 VerticalAlignment="Center"
                 FontFamily="../Fonts/#FluentSystemIcons-Regular"
                 FontSize="16"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Text="&#xF484;" />
             <TextBlock
                 Margin="5 0 0 0"
@@ -57,7 +57,7 @@
                     VerticalAlignment="Center"
                     FontFamily="../Fonts/#FluentSystemIcons-Regular"
                     FontSize="16"
-                    Foreground="{Binding Source={StaticResource AccentColor}}"
+                    Foreground="{DynamicResource AccentColor}"
                     Text="&#xF4DB;" />
                 <TextBlock
                     Margin="5 0 0 0"
@@ -85,7 +85,7 @@
                 VerticalAlignment="Center"
                 FontFamily="../Fonts/#FluentSystemIcons-Regular"
                 FontSize="16"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Text="&#xF311;" />
             <TextBlock
                 Margin="5 0 0 0"
diff --git a/ColorPicker/Pages/PalettePage.xaml b/ColorPicker/Pages/PalettePage.xaml
index 666a1e53..268b8778 100644
--- a/ColorPicker/Pages/PalettePage.xaml
+++ b/ColorPicker/Pages/PalettePage.xaml
@@ -10,7 +10,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     FontFamily="..\Fonts\#Hauora"
-    Foreground="{Binding Source={StaticResource Foreground1}}"
+    Foreground="{DynamicResource Foreground1}"
     mc:Ignorable="d">
 
     <Grid>
@@ -28,7 +28,7 @@
                 VerticalAlignment="Center"
                 FontFamily="../Fonts/#FluentSystemIcons-Regular"
                 FontSize="16"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Text="&#xF2F6;" />
             <TextBlock
                 x:Name="TitleTxt"
@@ -43,14 +43,14 @@
             Grid.Row="1"
             Margin="10"
             Padding="5"
-            Background="{Binding Source={StaticResource CardBackground}}"
+            Background="{DynamicResource CardBackground}"
             CornerRadius="10">
             <Border.Effect>
                 <DropShadowEffect
                     BlurRadius="15"
                     Opacity="0.2"
                     ShadowDepth="0"
-                    Color="{Binding Source={StaticResource AccentColor}}" />
+                    Color="{DynamicResource Accent}" />
             </Border.Effect>
 
             <Grid>
@@ -79,7 +79,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.RGB}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                     <Button
                         x:Name="HexBtn"
@@ -91,7 +91,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.HEX}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                     <Button
                         x:Name="HsvBtn"
@@ -103,7 +103,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.HSV}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                     <Button
                         x:Name="HslBtn"
@@ -115,7 +115,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.HSL}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                     <Button
                         x:Name="CmykBtn"
@@ -127,7 +127,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.CMYK}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                     <Button
                         x:Name="DecBtn"
@@ -139,7 +139,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.DEC}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                     <Button
                         x:Name="XyzBtn"
@@ -151,7 +151,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.XYZ}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                     <Button
                         x:Name="YiqBtn"
@@ -163,7 +163,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.YIQ}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                     <Button
                         x:Name="YuvBtn"
@@ -175,7 +175,7 @@
                         Click="RgbBtn_Click"
                         Content="{x:Static lang:Resources.YUV}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource DefaultButton}" />
                 </StackPanel>
 
@@ -205,7 +205,7 @@
                         x:Name="B1"
                         Width="50"
                         HorizontalAlignment="Center"
-                        Background="{Binding Source={StaticResource CardBackground}}"
+                        Background="{DynamicResource CardBackground}"
                         CornerRadius="5"
                         Visibility="Collapsed">
                         <Border.Effect>
@@ -213,7 +213,7 @@
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
                         </Border.Effect>
                         <Grid>
                             <TextBox
@@ -226,7 +226,7 @@
                                 CommandManager.CanExecute="Txt1_CanExecute"
                                 CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                 FontWeight="Bold"
-                                Foreground="{Binding Source={StaticResource DarkGray}}"
+                                Foreground="{DynamicResource DarkGray}"
                                 TextAlignment="Center"
                                 TextChanged="Txt1_TextChanged" />
                         </Grid>
@@ -241,7 +241,7 @@
                         x:Name="B2"
                         Width="50"
                         HorizontalAlignment="Center"
-                        Background="{Binding Source={StaticResource CardBackground}}"
+                        Background="{DynamicResource CardBackground}"
                         CornerRadius="5"
                         Visibility="Collapsed">
                         <Border.Effect>
@@ -249,7 +249,7 @@
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
                         </Border.Effect>
                         <Grid>
                             <TextBox
@@ -262,7 +262,7 @@
                                 CommandManager.CanExecute="Txt1_CanExecute"
                                 CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                 FontWeight="Bold"
-                                Foreground="{Binding Source={StaticResource DarkGray}}"
+                                Foreground="{DynamicResource DarkGray}"
                                 TextAlignment="Center"
                                 TextChanged="Txt1_TextChanged" />
                         </Grid>
@@ -277,7 +277,7 @@
                         x:Name="B3"
                         Width="50"
                         HorizontalAlignment="Center"
-                        Background="{Binding Source={StaticResource CardBackground}}"
+                        Background="{DynamicResource CardBackground}"
                         CornerRadius="5"
                         Visibility="Collapsed">
                         <Border.Effect>
@@ -285,7 +285,7 @@
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
                         </Border.Effect>
                         <Grid>
                             <TextBox
@@ -298,7 +298,7 @@
                                 CommandManager.CanExecute="Txt1_CanExecute"
                                 CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                 FontWeight="Bold"
-                                Foreground="{Binding Source={StaticResource DarkGray}}"
+                                Foreground="{DynamicResource DarkGray}"
                                 TextAlignment="Center"
                                 TextChanged="Txt1_TextChanged" />
                         </Grid>
@@ -313,7 +313,7 @@
                         x:Name="B4"
                         Width="50"
                         HorizontalAlignment="Center"
-                        Background="{Binding Source={StaticResource CardBackground}}"
+                        Background="{DynamicResource CardBackground}"
                         CornerRadius="5"
                         Visibility="Collapsed">
                         <Border.Effect>
@@ -321,7 +321,7 @@
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
                         </Border.Effect>
                         <Grid>
                             <TextBox
@@ -334,7 +334,7 @@
                                 CommandManager.CanExecute="Txt1_CanExecute"
                                 CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                 FontWeight="Bold"
-                                Foreground="{Binding Source={StaticResource DarkGray}}"
+                                Foreground="{DynamicResource DarkGray}"
                                 TextAlignment="Center"
                                 TextChanged="Txt1_TextChanged" />
                         </Grid>
@@ -349,7 +349,7 @@
                         x:Name="B5"
                         Width="100"
                         HorizontalAlignment="Center"
-                        Background="{Binding Source={StaticResource CardBackground}}"
+                        Background="{DynamicResource CardBackground}"
                         CornerRadius="5"
                         Visibility="Collapsed">
                         <Border.Effect>
@@ -357,7 +357,7 @@
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
                         </Border.Effect>
                         <Grid>
                             <TextBox
@@ -370,7 +370,7 @@
                                 CommandManager.CanExecute="Txt1_CanExecute"
                                 CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                 FontWeight="Bold"
-                                Foreground="{Binding Source={StaticResource DarkGray}}"
+                                Foreground="{DynamicResource DarkGray}"
                                 TextAlignment="Center"
                                 TextChanged="Txt1_TextChanged" />
                         </Grid>
@@ -381,18 +381,18 @@
                     Grid.Column="3"
                     Padding="5"
                     VerticalAlignment="Top"
-                    Background="{Binding Source={StaticResource Background3}}"
+                    Background="{DynamicResource Background3}"
                     Click="BookmarkBtn_Click"
                     Content="&#xF1F6;"
                     FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                    Foreground="{Binding Source={StaticResource Foreground1}}"
+                    Foreground="{DynamicResource Foreground1}"
                     Style="{DynamicResource DefaultButton}">
                     <Button.ToolTip>
                         <ToolTip
                             x:Name="BookmarkToolTip"
-                            Background="{Binding Source={StaticResource Background1}}"
+                            Background="{DynamicResource Background1}"
                             Content="{x:Static lang:Resources.AddBookmark}"
-                            Foreground="{Binding Source={StaticResource Foreground1}}" />
+                            Foreground="{DynamicResource Foreground1}" />
                     </Button.ToolTip>
                 </Button>
 
@@ -416,7 +416,7 @@
                     VerticalAlignment="Center"
                     FontFamily="../Fonts/#FluentSystemIcons-Regular"
                     FontSize="16"
-                    Foreground="{Binding Source={StaticResource AccentColor}}"
+                    Foreground="{DynamicResource AccentColor}"
                     Text="&#xF2F8;" />
                 <TextBlock
                     Margin="5 0 0 0"
@@ -440,7 +440,7 @@
                     VerticalAlignment="Center"
                     FontFamily="../Fonts/#FluentSystemIcons-Regular"
                     FontSize="16"
-                    Foreground="{Binding Source={StaticResource AccentColor}}"
+                    Foreground="{DynamicResource AccentColor}"
                     Text="&#xF4D7;" />
                 <TextBlock
                     Margin="5 0 0 0"
@@ -464,7 +464,7 @@
                     VerticalAlignment="Center"
                     FontFamily="../Fonts/#FluentSystemIcons-Regular"
                     FontSize="16"
-                    Foreground="{Binding Source={StaticResource AccentColor}}"
+                    Foreground="{DynamicResource AccentColor}"
                     Text="&#xF2BE;" />
                 <TextBlock
                     Margin="5 0 0 0"
diff --git a/ColorPicker/Pages/PalettePage.xaml.cs b/ColorPicker/Pages/PalettePage.xaml.cs
index a7402c3f..57cf9bcf 100644
--- a/ColorPicker/Pages/PalettePage.xaml.cs
+++ b/ColorPicker/Pages/PalettePage.xaml.cs
@@ -128,7 +128,7 @@ internal void RgbBtn_Click(object sender, RoutedEventArgs? e)
 		LoadInputUI();
 	}
 
-	private void CheckButton(Button button) => button.Background = new SolidColorBrush { Color = Global.GetColorFromResource("LightAccentColor") };
+	private void CheckButton(Button button) => button.Background = Global.GetColorFromResource("LightAccentColor");
 
 	private void HideAllInput()
 	{
@@ -296,8 +296,8 @@ internal void InitPaletteUI(bool setColor = false)
 					},
 					ToolTip = new ToolTip()
 					{
-						Background = new SolidColorBrush { Color = Global.GetColorFromResource("Background1") },
-						Foreground = new SolidColorBrush { Color = Global.GetColorFromResource("Foreground1") },
+						Background = Global.GetColorFromResource("Background1"),
+						Foreground = Global.GetColorFromResource("Foreground1"),
 						Content = new ColorInfo(new(shades[i].R, shades[i].G, shades[i].B)).ToString()
 					},
 				};
diff --git a/ColorPicker/Pages/SelectorPage.xaml b/ColorPicker/Pages/SelectorPage.xaml
index 51af399a..9e5e8aa4 100644
--- a/ColorPicker/Pages/SelectorPage.xaml
+++ b/ColorPicker/Pages/SelectorPage.xaml
@@ -11,7 +11,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     FontFamily="../Fonts/#Hauora"
-    Foreground="{Binding Source={StaticResource Foreground1}}"
+    Foreground="{DynamicResource Foreground1}"
     mc:Ignorable="d">
 
     <Grid>
@@ -28,7 +28,7 @@
                 VerticalAlignment="Center"
                 FontFamily="../Fonts/#FluentSystemIcons-Regular"
                 FontSize="16"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Text="&#xF9AB;" />
             <TextBlock
                 x:Name="TitleTxt"
@@ -50,14 +50,14 @@
             Padding="10"
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
-            Background="{Binding Source={StaticResource CardBackground}}"
+            Background="{DynamicResource CardBackground}"
             CornerRadius="10">
             <Border.Effect>
                 <DropShadowEffect
                     BlurRadius="15"
                     Opacity="0.2"
                     ShadowDepth="0"
-                    Color="{Binding Source={StaticResource AccentColor}}" />
+                    Color="{DynamicResource Accent}" />
             </Border.Effect>
             <Grid>
                 <Grid.ColumnDefinitions>
@@ -166,17 +166,17 @@
                         Margin="10 0 0 0"
                         Padding="5"
                         VerticalAlignment="Top"
-                        Background="{Binding Source={StaticResource Background3}}"
+                        Background="{DynamicResource Background3}"
                         Click="SelectBtn_Click"
                         Content="&#xFD3F;"
                         FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                        Foreground="{Binding Source={StaticResource Foreground1}}"
+                        Foreground="{DynamicResource Foreground1}"
                         Style="{DynamicResource DefaultButton}">
                         <Button.ToolTip>
                             <ToolTip
-                                Background="{Binding Source={StaticResource Background1}}"
+                                Background="{DynamicResource Background1}"
                                 Content="{x:Static lang:Resources.SelectColor}"
-                                Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                Foreground="{DynamicResource Foreground1}" />
                         </Button.ToolTip>
                     </Button>
                     <Button
@@ -184,17 +184,17 @@
                         Grid.Column="2"
                         Padding="5"
                         VerticalAlignment="Top"
-                        Background="{Binding Source={StaticResource Background3}}"
+                        Background="{DynamicResource Background3}"
                         Click="PaletteBtn_Click"
                         Content="&#xF2F6;"
                         FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                        Foreground="{Binding Source={StaticResource Foreground1}}"
+                        Foreground="{DynamicResource Foreground1}"
                         Style="{DynamicResource DefaultButton}">
                         <Button.ToolTip>
                             <ToolTip
-                                Background="{Binding Source={StaticResource Background1}}"
+                                Background="{DynamicResource Background1}"
                                 Content="{x:Static lang:Resources.GenerateColor}"
-                                Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                Foreground="{DynamicResource Foreground1}" />
                         </Button.ToolTip>
                     </Button>
                     <Button
@@ -202,18 +202,18 @@
                         Grid.Column="2"
                         Padding="5"
                         VerticalAlignment="Top"
-                        Background="{Binding Source={StaticResource Background3}}"
+                        Background="{DynamicResource Background3}"
                         Click="BookmarkBtn_Click"
                         Content="&#xF1F6;"
                         FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                        Foreground="{Binding Source={StaticResource Foreground1}}"
+                        Foreground="{DynamicResource Foreground1}"
                         Style="{DynamicResource DefaultButton}">
                         <Button.ToolTip>
                             <ToolTip
                                 x:Name="BookmarkToolTip"
-                                Background="{Binding Source={StaticResource Background1}}"
+                                Background="{DynamicResource Background1}"
                                 Content="{x:Static lang:Resources.AddBookmark}"
-                                Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                Foreground="{DynamicResource Foreground1}" />
                         </Button.ToolTip>
                     </Button>
                     <ComboBox
@@ -224,10 +224,10 @@
                         HorizontalAlignment="Left"
                         VerticalAlignment="Top"
                         Background="Transparent"
-                        BorderBrush="{Binding Source={StaticResource AccentColor}}"
+                        BorderBrush="{DynamicResource AccentColor}"
                         BorderThickness="2"
                         FontSize="10"
-                        Foreground="{Binding Source={StaticResource Foreground1}}"
+                        Foreground="{DynamicResource Foreground1}"
                         SelectionChanged="ColorTypeComboBox_SelectionChanged"
                         Style="{DynamicResource ComboBoxStyle1}">
                         <ComboBoxItem Content="{x:Static lang:Resources.RGB}" />
@@ -246,7 +246,7 @@
                 VerticalAlignment="Center"
                 FontFamily="../Fonts/#FluentSystemIcons-Regular"
                 FontSize="16"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Text="&#xF4A4;" />
             <TextBlock
                 Margin="5 0 0 0"
@@ -266,7 +266,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -285,7 +285,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.RGB}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -294,17 +294,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyRgbBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyRGB}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -323,7 +323,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -342,7 +342,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.HEX}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -351,17 +351,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyHexBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyHEX}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -380,7 +380,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -399,7 +399,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.HSV}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -408,17 +408,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyHsvBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyHSV}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -437,7 +437,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -456,7 +456,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.HSL}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -465,17 +465,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyHslBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyHSV}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -494,7 +494,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -513,7 +513,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.CMYK}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -522,17 +522,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyCmykBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyCMYK}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -550,7 +550,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -569,7 +569,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.DEC}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -578,17 +578,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyDecBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyDEC}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -606,7 +606,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -625,7 +625,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.XYZ}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -634,17 +634,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyXyzBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyXYZ}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -663,7 +663,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -682,7 +682,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.YIQ}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -691,17 +691,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyYiqBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyYIQ}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
@@ -720,7 +720,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -739,7 +739,7 @@
 
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.YUV}" />
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <Button
@@ -748,17 +748,17 @@
                             Margin="0 3 3 3"
                             Padding="5"
                             VerticalAlignment="Top"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="CopyYuvBtn_Click"
                             Content="&#xF32C;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.CopyYUV}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
 
diff --git a/ColorPicker/Pages/SelectorPage.xaml.cs b/ColorPicker/Pages/SelectorPage.xaml.cs
index 5d39eeee..76495530 100644
--- a/ColorPicker/Pages/SelectorPage.xaml.cs
+++ b/ColorPicker/Pages/SelectorPage.xaml.cs
@@ -374,9 +374,9 @@ private void LoadSliders()
 		switch (ColorTypeComboBox.SelectedIndex)
 		{
 			case 1:
-				RedSlider.Foreground = new SolidColorBrush { Color = Global.GetColorFromResource("AccentColor") };
-				GreenSlider.Foreground = new SolidColorBrush { Color = Global.GetColorFromResource("AccentColor") };
-				BlueSlider.Foreground = new SolidColorBrush { Color = Global.GetColorFromResource("AccentColor") };
+				RedSlider.Foreground = Global.GetColorFromResource("AccentColor");
+				GreenSlider.Foreground = Global.GetColorFromResource("AccentColor");
+				BlueSlider.Foreground = Global.GetColorFromResource("AccentColor");
 
 				RedSlider.Maximum = 360;
 				GreenSlider.Maximum = 100;
@@ -387,9 +387,9 @@ private void LoadSliders()
 				BlueSlider.Value = current.HSV.V;
 				break;
 			case 2:
-				RedSlider.Foreground = new SolidColorBrush { Color = Global.GetColorFromResource("AccentColor") };
-				GreenSlider.Foreground = new SolidColorBrush { Color = Global.GetColorFromResource("AccentColor") };
-				BlueSlider.Foreground = new SolidColorBrush { Color = Global.GetColorFromResource("AccentColor") };
+				RedSlider.Foreground = Global.GetColorFromResource("AccentColor");
+				GreenSlider.Foreground = Global.GetColorFromResource("AccentColor");
+				BlueSlider.Foreground = Global.GetColorFromResource("AccentColor");
 
 				RedSlider.Maximum = 360;
 				GreenSlider.Maximum = 100;
@@ -401,9 +401,9 @@ private void LoadSliders()
 				break;
 
 			default: // RGB
-				RedSlider.Foreground = new SolidColorBrush { Color = Global.GetColorFromResource("SliderRed") };
-				GreenSlider.Foreground = new SolidColorBrush { Color = Global.GetColorFromResource("SliderGreen") };
-				BlueSlider.Foreground = new SolidColorBrush { Color = Global.GetColorFromResource("SliderBlue") };
+				RedSlider.Foreground = Global.GetColorFromResource("SliderRed");
+				GreenSlider.Foreground = Global.GetColorFromResource("SliderGreen");
+				BlueSlider.Foreground = Global.GetColorFromResource("SliderBlue");
 
 				RedSlider.Maximum = 255;
 				GreenSlider.Maximum = 255;
diff --git a/ColorPicker/Pages/SettingsPage.xaml b/ColorPicker/Pages/SettingsPage.xaml
index 63da0241..8e5b93a8 100644
--- a/ColorPicker/Pages/SettingsPage.xaml
+++ b/ColorPicker/Pages/SettingsPage.xaml
@@ -11,7 +11,7 @@
     d:DesignHeight="1450"
     d:DesignWidth="800"
     FontFamily="../Fonts/#Hauora"
-    Foreground="{Binding Source={StaticResource Foreground1}}"
+    Foreground="{DynamicResource Foreground1}"
     mc:Ignorable="d">
 
     <Grid>
@@ -30,7 +30,7 @@
                 VerticalAlignment="Center"
                 FontFamily="../Fonts/#FluentSystemIcons-Regular"
                 FontSize="16"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Text="&#xF6AA;" />
             <TextBlock
                 Margin="5 0 0 0"
@@ -45,21 +45,21 @@
             Margin="5"
             Padding="20"
             HorizontalAlignment="Center"
-            Background="{Binding Source={StaticResource CardBackground}}"
+            Background="{DynamicResource CardBackground}"
             CornerRadius="5">
             <Border.Effect>
                 <DropShadowEffect
                     BlurRadius="15"
                     Opacity="0.5"
                     ShadowDepth="0"
-                    Color="{Binding Source={StaticResource LightAccentColor}}" />
+                    Color="{DynamicResource LightAccent}" />
             </Border.Effect>
             <StackPanel>
                 <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                     <TextBlock
                         FontSize="32"
                         FontWeight="Bold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Text="{x:Static lang:Resources.ColorPicker}" />
                     <TextBlock
                         Margin="5 0 0 0"
@@ -88,25 +88,25 @@
                         Padding="5 2"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
-                        Background="{Binding Source={StaticResource AccentColor}}"
+                        Background="{DynamicResource AccentColor}"
                         BorderThickness="0"
                         Click="CheckUpdateBtn_Click"
                         Content="{x:Static lang:Resources.CheckUpdate}"
                         Cursor="Hand"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}"
+                        Foreground="{DynamicResource WindowButtonsHoverForeground1}"
                         Style="{DynamicResource PrimaryButton}" />
                     <Button
                         x:Name="SeeLicensesBtn"
                         Margin="5"
                         Padding="3"
                         VerticalAlignment="Center"
-                        Background="{Binding Source={StaticResource Background3}}"
+                        Background="{DynamicResource Background3}"
                         Click="SeeLicensesBtn_Click"
                         Content="&#xF4A4;"
                         FontFamily="..\Fonts\#FluentSystemIcons-Regular"
                         FontSize="14"
-                        Foreground="{Binding Source={StaticResource Foreground1}}"
+                        Foreground="{DynamicResource Foreground1}"
                         Style="{DynamicResource DefaultButton}" />
                 </StackPanel>
             </StackPanel>
@@ -114,7 +114,7 @@
         <StackPanel Grid.Row="2">
             <Border
                 Margin="10 10 10 0"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Grid>
                     <Grid.ColumnDefinitions>
@@ -152,9 +152,9 @@
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             Background="Transparent"
-                            BorderBrush="{Binding Source={StaticResource AccentColor}}"
+                            BorderBrush="{DynamicResource AccentColor}"
                             BorderThickness="2"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             SelectionChanged="LangComboBox_SelectionChanged"
                             Style="{DynamicResource ComboBoxStyle1}">
                             <ComboBoxItem Content="{x:Static lang:Resources.Default}" />
@@ -166,11 +166,11 @@
                             x:Name="LangApplyBtn"
                             Padding="10 5 10 5"
                             VerticalAlignment="Center"
-                            Background="{Binding Source={StaticResource AccentColor}}"
+                            Background="{DynamicResource AccentColor}"
                             Click="LangApplyBtn_Click"
                             Cursor="Hand"
                             FontWeight="ExtraBold"
-                            Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}"
+                            Foreground="{DynamicResource WindowButtonsHoverForeground1}"
                             Style="{StaticResource PrimaryButton}"
                             Visibility="Hidden">
                             <TextBlock
@@ -182,9 +182,9 @@
 
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.Apply}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
                     </StackPanel>
@@ -192,8 +192,8 @@
             </Border>
             <Expander
                 Margin="10 10 10 0"
-                Background="{Binding Source={StaticResource CardBackground}}"
-                Foreground="{Binding Source={StaticResource Foreground1}}"
+                Background="{DynamicResource CardBackground}"
+                Foreground="{DynamicResource Foreground1}"
                 Style="{DynamicResource ExpanderStyle1}">
                 <Expander.Header>
                     <StackPanel Margin="10 15" Orientation="Horizontal">
@@ -307,8 +307,8 @@
             </Expander>
             <Expander
                 Margin="10 10 10 0"
-                Background="{Binding Source={StaticResource CardBackground}}"
-                Foreground="{Binding Source={StaticResource Foreground1}}"
+                Background="{DynamicResource CardBackground}"
+                Foreground="{DynamicResource Foreground1}"
                 Style="{DynamicResource ExpanderStyle1}">
                 <Expander.Header>
                     <StackPanel Margin="10 15" Orientation="Horizontal">
@@ -345,9 +345,9 @@
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         Background="Transparent"
-                        BorderBrush="{Binding Source={StaticResource AccentColor}}"
+                        BorderBrush="{DynamicResource AccentColor}"
                         BorderThickness="2"
-                        Foreground="{Binding Source={StaticResource Foreground1}}"
+                        Foreground="{DynamicResource Foreground1}"
                         SelectionChanged="ColorTypeComboBox_SelectionChanged"
                         Style="{DynamicResource ComboBoxStyle1}">
                         <ComboBoxItem Content="{x:Static lang:Resources.RGB}" />
@@ -364,8 +364,8 @@
             </Expander>
             <Expander
                 Margin="10 10 10 0"
-                Background="{Binding Source={StaticResource CardBackground}}"
-                Foreground="{Binding Source={StaticResource Foreground1}}"
+                Background="{DynamicResource CardBackground}"
+                Foreground="{DynamicResource Foreground1}"
                 Style="{DynamicResource ExpanderStyle1}">
                 <Expander.Header>
                     <StackPanel Margin="10 15" Orientation="Horizontal">
@@ -403,9 +403,9 @@
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             Background="Transparent"
-                            BorderBrush="{Binding Source={StaticResource AccentColor}}"
+                            BorderBrush="{DynamicResource AccentColor}"
                             BorderThickness="2"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             SelectionChanged="PageComboBox_SelectionChanged"
                             Style="{DynamicResource ComboBoxStyle1}">
                             <ComboBoxItem Content="{x:Static lang:Resources.Home}" />
@@ -427,15 +427,15 @@
                         BorderThickness="2"
                         Checked="UpdateOnStartChk_Checked"
                         Content="{x:Static lang:Resources.CheckUpdatesOnStart}"
-                        Foreground="{Binding Source={StaticResource Foreground1}}"
+                        Foreground="{DynamicResource Foreground1}"
                         Style="{DynamicResource CheckBoxStyle1}"
                         Unchecked="UpdateOnStartChk_Checked" />
                 </StackPanel>
             </Expander>
             <Expander
                 Margin="10 10 10 0"
-                Background="{Binding Source={StaticResource CardBackground}}"
-                Foreground="{Binding Source={StaticResource Foreground1}}"
+                Background="{DynamicResource CardBackground}"
+                Foreground="{DynamicResource Foreground1}"
                 Style="{DynamicResource ExpanderStyle1}">
                 <Expander.Header>
                     <StackPanel Margin="10 15" Orientation="Horizontal">
@@ -468,7 +468,7 @@
                         BorderThickness="2"
                         Checked="UseKeyboardShortcutsChk_Checked"
                         Content="{x:Static lang:Resources.UseKeyboardShortcuts}"
-                        Foreground="{Binding Source={StaticResource Foreground1}}"
+                        Foreground="{DynamicResource Foreground1}"
                         Style="{DynamicResource CheckBoxStyle1}"
                         Unchecked="UseKeyboardShortcutsChk_Checked" />
                     <TextBlock Margin="10 0 0 0" Text="{x:Static lang:Resources.StartSelection}" />
@@ -477,7 +477,7 @@
                             Margin="10 5 0 5"
                             Padding="5"
                             HorizontalAlignment="Left"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             CornerRadius="5">
                             <TextBlock
                                 x:Name="SelectShortcutTxt"
@@ -489,18 +489,18 @@
                             Margin="5"
                             Padding="5"
                             VerticalAlignment="Center"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="EditSelectShortcutBtn_Click"
                             Content="&#xF3DE;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
                             FontSize="14"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.EditShortcut}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
                         <Button
@@ -508,18 +508,18 @@
                             Margin="0 5 5 5"
                             Padding="5"
                             VerticalAlignment="Center"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="ResetSelectShortcutBtn_Click"
                             Content="&#xF19A;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
                             FontSize="14"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.ResetKeyboardShortcuts}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
                         <TextBlock
@@ -534,7 +534,7 @@
                             Margin="10 5 0 5"
                             Padding="5"
                             HorizontalAlignment="Left"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             CornerRadius="5">
                             <TextBlock
                                 x:Name="CopyShortcutTxt"
@@ -546,18 +546,18 @@
                             Margin="5"
                             Padding="5"
                             VerticalAlignment="Center"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="EditCopyShortcutBtn_Click"
                             Content="&#xF3DE;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
                             FontSize="14"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.EditShortcut}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
                         <Button
@@ -565,18 +565,18 @@
                             Margin="0 5 5 5"
                             Padding="5"
                             VerticalAlignment="Center"
-                            Background="{Binding Source={StaticResource Background3}}"
+                            Background="{DynamicResource Background3}"
                             Click="ResetCopyShortcutBtn_Click"
                             Content="&#xF19A;"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
                             FontSize="14"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource DefaultButton}">
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.ResetKeyboardShortcuts}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
                         <TextBlock
@@ -594,8 +594,8 @@
             </Expander>
             <Expander
                 Margin="10 10 10 0"
-                Background="{Binding Source={StaticResource CardBackground}}"
-                Foreground="{Binding Source={StaticResource Foreground1}}"
+                Background="{DynamicResource CardBackground}"
+                Foreground="{DynamicResource Foreground1}"
                 Style="{DynamicResource ExpanderStyle1}">
                 <Expander.Header>
                     <StackPanel Margin="10 15" Orientation="Horizontal">
@@ -629,14 +629,14 @@
                         <Border
                             Width="250"
                             HorizontalAlignment="Center"
-                            Background="{Binding Source={StaticResource CardBackground}}"
+                            Background="{DynamicResource CardBackground}"
                             CornerRadius="5">
                             <Border.Effect>
                                 <DropShadowEffect
                                     BlurRadius="15"
                                     Opacity="0.2"
                                     ShadowDepth="0"
-                                    Color="{Binding Source={StaticResource AccentColor}}" />
+                                    Color="{DynamicResource Accent}" />
                             </Border.Effect>
                             <PasswordBox
                                 x:Name="ApiKeyTxt"
@@ -645,7 +645,7 @@
                                 Background="Transparent"
                                 BorderThickness="0"
                                 FontWeight="Bold"
-                                Foreground="{Binding Source={StaticResource DarkGray}}"
+                                Foreground="{DynamicResource DarkGray}"
                                 PasswordChanged="ApiKeyTxt_PasswordChanged" />
                         </Border>
                         <Button
@@ -653,11 +653,11 @@
                             Margin="10 0 0 0"
                             Padding="10 5 10 5"
                             VerticalAlignment="Center"
-                            Background="{Binding Source={StaticResource AccentColor}}"
+                            Background="{DynamicResource AccentColor}"
                             Click="ApiApplyBtn_Click"
                             Cursor="Hand"
                             FontWeight="ExtraBold"
-                            Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}"
+                            Foreground="{DynamicResource WindowButtonsHoverForeground1}"
                             Style="{StaticResource PrimaryButton}"
                             Visibility="Hidden">
                             <TextBlock
@@ -669,9 +669,9 @@
 
                             <Button.ToolTip>
                                 <ToolTip
-                                    Background="{Binding Source={StaticResource Background1}}"
+                                    Background="{DynamicResource Background1}"
                                     Content="{x:Static lang:Resources.Apply}"
-                                    Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                    Foreground="{DynamicResource Foreground1}" />
                             </Button.ToolTip>
                         </Button>
                     </StackPanel>
@@ -687,9 +687,9 @@
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             Background="Transparent"
-                            BorderBrush="{Binding Source={StaticResource AccentColor}}"
+                            BorderBrush="{DynamicResource AccentColor}"
                             BorderThickness="2"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             SelectionChanged="ModelComboBox_SelectionChanged"
                             Style="{DynamicResource ComboBoxStyle1}" />
                         <Button
@@ -697,20 +697,20 @@
                             Margin="0 0 10 0"
                             Padding="5"
                             VerticalAlignment="Center"
-                            Background="{Binding Source={StaticResource AccentColor}}"
+                            Background="{DynamicResource AccentColor}"
                             Click="RefreshModelsBtn_Click"
                             Content="&#xF140;"
                             Cursor="Hand"
                             FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                            Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}"
+                            Foreground="{DynamicResource WindowButtonsHoverForeground1}"
                             Style="{StaticResource PrimaryButton}" />
                     </StackPanel>
                 </StackPanel>
             </Expander>
             <Expander
                 Margin="10 10 10 0"
-                Background="{Binding Source={StaticResource CardBackground}}"
-                Foreground="{Binding Source={StaticResource Foreground1}}"
+                Background="{DynamicResource CardBackground}"
+                Foreground="{DynamicResource Foreground1}"
                 Style="{DynamicResource ExpanderStyle1}">
                 <Expander.Header>
                     <StackPanel Margin="10 15" Orientation="Horizontal">
@@ -741,13 +741,13 @@
                         Margin="0 0 10 0"
                         VerticalAlignment="Center"
                         Text="{x:Static lang:Resources.Font}" />
-                    <Border Background="{Binding Source={StaticResource CardBackground}}" CornerRadius="5">
+                    <Border Background="{DynamicResource CardBackground}" CornerRadius="5">
                         <Border.Effect>
                             <DropShadowEffect
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
 
                         </Border.Effect>
                         <ComboBox
@@ -759,9 +759,9 @@
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             Background="Transparent"
-                            BorderBrush="{Binding Source={StaticResource AccentColor}}"
+                            BorderBrush="{DynamicResource AccentColor}"
                             BorderThickness="0"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             IsEditable="True"
                             SelectionChanged="FontComboBox_SelectionChanged"
                             Style="{DynamicResource ComboBoxStyle1}" />
@@ -774,14 +774,14 @@
                         x:Name="B2"
                         Width="50"
                         HorizontalAlignment="Center"
-                        Background="{Binding Source={StaticResource CardBackground}}"
+                        Background="{DynamicResource CardBackground}"
                         CornerRadius="5">
                         <Border.Effect>
                             <DropShadowEffect
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
                         </Border.Effect>
                         <TextBox
                             x:Name="FontSizeTxt"
@@ -790,7 +790,7 @@
                             Background="Transparent"
                             BorderThickness="0"
                             FontWeight="Bold"
-                            Foreground="{Binding Source={StaticResource DarkGray}}"
+                            Foreground="{DynamicResource DarkGray}"
                             PreviewTextInput="FontSizeTxt_PreviewTextInput"
                             TextAlignment="Center"
                             TextChanged="FontSizeTxt_TextChanged" />
@@ -803,7 +803,7 @@
                         x:Name="ForegroundBorder"
                         Width="30"
                         Height="30"
-                        Background="{Binding Source={StaticResource Foreground1}}"
+                        Background="{DynamicResource Foreground1}"
                         BorderThickness="0"
                         CornerRadius="20"
                         Cursor="Hand"
@@ -813,7 +813,7 @@
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
                         </Border.Effect>
                     </Border>
                     <TextBlock
@@ -824,7 +824,7 @@
                         x:Name="BackgroundBorder"
                         Width="30"
                         Height="30"
-                        Background="{Binding Source={StaticResource Background1}}"
+                        Background="{DynamicResource Background1}"
                         BorderThickness="0"
                         CornerRadius="20"
                         Cursor="Hand"
@@ -834,7 +834,7 @@
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
                         </Border.Effect>
                     </Border>
                 </StackPanel>
@@ -842,8 +842,8 @@
             </Expander>
             <Expander
                 Margin="10 10 10 0"
-                Background="{Binding Source={StaticResource CardBackground}}"
-                Foreground="{Binding Source={StaticResource Foreground1}}"
+                Background="{DynamicResource CardBackground}"
+                Foreground="{DynamicResource Foreground1}"
                 Style="{DynamicResource ExpanderStyle1}">
                 <Expander.Header>
                     <StackPanel Margin="10 15" Orientation="Horizontal">
@@ -875,11 +875,11 @@
                             Margin="0 0 10 0"
                             Padding="10 5 10 5"
                             VerticalAlignment="Center"
-                            Background="{Binding Source={StaticResource AccentColor}}"
+                            Background="{DynamicResource AccentColor}"
                             Click="ImportBtn_Click"
                             Cursor="Hand"
                             FontWeight="ExtraBold"
-                            Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}"
+                            Foreground="{DynamicResource WindowButtonsHoverForeground1}"
                             Style="{StaticResource PrimaryButton}">
                             <StackPanel Orientation="Horizontal">
                                 <TextBlock
@@ -896,11 +896,11 @@
                             x:Name="ExportBtn"
                             Padding="10 5 10 5"
                             VerticalAlignment="Center"
-                            Background="{Binding Source={StaticResource LightAccentColor}}"
+                            Background="{DynamicResource LightAccentColor}"
                             Click="ExportBtn_Click"
                             Cursor="Hand"
                             FontWeight="ExtraBold"
-                            Foreground="{Binding Source={StaticResource AccentColor}}"
+                            Foreground="{DynamicResource AccentColor}"
                             Style="{StaticResource DefaultButton}">
                             <StackPanel Orientation="Horizontal">
                                 <TextBlock
@@ -921,7 +921,7 @@
                         BorderThickness="2"
                         Checked="UseSynethiaChk_Checked"
                         Content="{x:Static lang:Resources.SynethiaEnable}"
-                        Foreground="{Binding Source={StaticResource Foreground1}}"
+                        Foreground="{DynamicResource Foreground1}"
                         Style="{DynamicResource CheckBoxStyle1}"
                         Unchecked="UseSynethiaChk_Checked" />
 
@@ -934,7 +934,7 @@
                         Cursor="Hand"
                         FontSize="14"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource StandardButton}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
@@ -955,7 +955,7 @@
                         Cursor="Hand"
                         FontSize="14"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Style="{DynamicResource StandardButton}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
diff --git a/ColorPicker/Pages/SettingsPage.xaml.cs b/ColorPicker/Pages/SettingsPage.xaml.cs
index 99846b25..a34e592c 100644
--- a/ColorPicker/Pages/SettingsPage.xaml.cs
+++ b/ColorPicker/Pages/SettingsPage.xaml.cs
@@ -173,7 +173,7 @@ private async void CheckUpdateBtn_Click(object sender, RoutedEventArgs e)
 		Border ThemeSelectedBorder;
 		private void Border_MouseEnter(object sender, MouseEventArgs e)
 		{
-			((Border)sender).BorderBrush = new SolidColorBrush { Color = Global.GetColorFromResource("AccentColor") };
+			((Border)sender).BorderBrush = Global.GetColorFromResource("AccentColor");
 		}
 
 		private void Border_MouseLeave(object sender, MouseEventArgs e)
@@ -193,60 +193,41 @@ private void LightBorder_MouseLeftButtonUp(object sender, MouseButtonEventArgs e
 		{
 			ResetBorders();
 			ThemeSelectedBorder = (Border)sender;
-			((Border)sender).BorderBrush = new SolidColorBrush { Color = Global.GetColorFromResource("AccentColor") };
+			((Border)sender).BorderBrush = Global.GetColorFromResource("AccentColor");
 			Global.Settings.Theme = Themes.Light;
-			XmlSerializerManager.SaveToXml(Global.Settings, Global.SettingsPath);
-
-			if (MessageBox.Show(Properties.Resources.NeedRestartToApplyChanges, Properties.Resources.Settings, MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
-			{
-				return;
-			}
+			XmlSerializerManager.SaveToXml(Global.Settings, Global.SettingsPath);			
 
 			SynethiaManager.Save(Global.SynethiaConfig, Global.SynethiaPath);
 			XmlSerializerManager.SaveToXml(Global.Bookmarks, Global.BookmarksPath);
 
-			Process.Start(Directory.GetCurrentDirectory() + @"\ColorPicker.exe");
-			Application.Current.Shutdown();
+			Global.ChangeTheme();
 		}
 
 		private void DarkBorder_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
 		{
 			ResetBorders();
 			ThemeSelectedBorder = (Border)sender;
-			((Border)sender).BorderBrush = new SolidColorBrush { Color = Global.GetColorFromResource("AccentColor") };
+			((Border)sender).BorderBrush = Global.GetColorFromResource("AccentColor");
 			Global.Settings.Theme = Themes.Dark;
 			XmlSerializerManager.SaveToXml(Global.Settings, Global.SettingsPath);
 
-			if (MessageBox.Show(Properties.Resources.NeedRestartToApplyChanges, Properties.Resources.Settings, MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
-			{
-				return;
-			}
-
 			SynethiaManager.Save(Global.SynethiaConfig, Global.SynethiaPath);
 			XmlSerializerManager.SaveToXml(Global.Bookmarks, Global.BookmarksPath);
 
-			Process.Start(Directory.GetCurrentDirectory() + @"\ColorPicker.exe");
-			Application.Current.Shutdown();
+			Global.ChangeTheme();
 		}
-
 		private void SystemBorder_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
 		{
 			ResetBorders();
 			ThemeSelectedBorder = (Border)sender;
-			((Border)sender).BorderBrush = new SolidColorBrush { Color = Global.GetColorFromResource("AccentColor") };
+			((Border)sender).BorderBrush = Global.GetColorFromResource("AccentColor");
 			Global.Settings.Theme = Themes.System;
 			XmlSerializerManager.SaveToXml(Global.Settings, Global.SettingsPath);
 
-			if (MessageBox.Show(Properties.Resources.NeedRestartToApplyChanges, Properties.Resources.Settings, MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
-			{
-				return;
-			}
-
 			SynethiaManager.Save(Global.SynethiaConfig, Global.SynethiaPath);
 			XmlSerializerManager.SaveToXml(Global.Bookmarks, Global.BookmarksPath);
 
-			Process.Start(Directory.GetCurrentDirectory() + @"\ColorPicker.exe");
-			Application.Current.Shutdown();
+			Global.ChangeTheme();
 		}
 
 		private void LangComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
diff --git a/ColorPicker/Pages/TextPage.xaml b/ColorPicker/Pages/TextPage.xaml
index 449d0a5c..bead4646 100644
--- a/ColorPicker/Pages/TextPage.xaml
+++ b/ColorPicker/Pages/TextPage.xaml
@@ -10,7 +10,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     FontFamily="..\Fonts\#Hauora"
-    Foreground="{Binding Source={StaticResource Foreground1}}"
+    Foreground="{DynamicResource Foreground1}"
     mc:Ignorable="d">
 
     <Grid>
@@ -36,14 +36,14 @@
                 Grid.Row="1"
                 Margin="10"
                 Padding="5"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="10">
                 <Border.Effect>
                     <DropShadowEffect
                         BlurRadius="15"
                         Opacity="0.2"
                         ShadowDepth="0"
-                        Color="{Binding Source={StaticResource AccentColor}}" />
+                        Color="{DynamicResource Accent}" />
                 </Border.Effect>
 
                 <Grid>
@@ -73,7 +73,7 @@
                             Click="RgbBtn_Click"
                             Content="{x:Static lang:Resources.RGB}"
                             FontWeight="ExtraBold"
-                            Foreground="{Binding Source={StaticResource AccentColor}}"
+                            Foreground="{DynamicResource AccentColor}"
                             Style="{DynamicResource DefaultButton}" />
                         <Button
                             x:Name="HexBtn"
@@ -85,7 +85,7 @@
                             Click="RgbBtn_Click"
                             Content="{x:Static lang:Resources.HEX}"
                             FontWeight="ExtraBold"
-                            Foreground="{Binding Source={StaticResource AccentColor}}"
+                            Foreground="{DynamicResource AccentColor}"
                             Style="{DynamicResource DefaultButton}" />
                         <Button
                             x:Name="HsvBtn"
@@ -97,7 +97,7 @@
                             Click="RgbBtn_Click"
                             Content="{x:Static lang:Resources.HSV}"
                             FontWeight="ExtraBold"
-                            Foreground="{Binding Source={StaticResource AccentColor}}"
+                            Foreground="{DynamicResource AccentColor}"
                             Style="{DynamicResource DefaultButton}" />
                         <Button
                             x:Name="HslBtn"
@@ -109,7 +109,7 @@
                             Click="RgbBtn_Click"
                             Content="{x:Static lang:Resources.HSL}"
                             FontWeight="ExtraBold"
-                            Foreground="{Binding Source={StaticResource AccentColor}}"
+                            Foreground="{DynamicResource AccentColor}"
                             Style="{DynamicResource DefaultButton}" />
                         <Button
                             x:Name="CmykBtn"
@@ -121,7 +121,7 @@
                             Click="RgbBtn_Click"
                             Content="{x:Static lang:Resources.CMYK}"
                             FontWeight="ExtraBold"
-                            Foreground="{Binding Source={StaticResource AccentColor}}"
+                            Foreground="{DynamicResource AccentColor}"
                             Style="{DynamicResource DefaultButton}" />
                         <Button
                             x:Name="DecBtn"
@@ -133,7 +133,7 @@
                             Click="RgbBtn_Click"
                             Content="{x:Static lang:Resources.DEC}"
                             FontWeight="ExtraBold"
-                            Foreground="{Binding Source={StaticResource AccentColor}}"
+                            Foreground="{DynamicResource AccentColor}"
                             Style="{DynamicResource DefaultButton}" />
                         <Button
                             x:Name="XyzBtn"
@@ -145,7 +145,7 @@
                             Click="RgbBtn_Click"
                             Content="{x:Static lang:Resources.XYZ}"
                             FontWeight="ExtraBold"
-                            Foreground="{Binding Source={StaticResource AccentColor}}"
+                            Foreground="{DynamicResource AccentColor}"
                             Style="{DynamicResource DefaultButton}" />
                         <Button
                             x:Name="YiqBtn"
@@ -157,7 +157,7 @@
                             Click="RgbBtn_Click"
                             Content="{x:Static lang:Resources.YIQ}"
                             FontWeight="ExtraBold"
-                            Foreground="{Binding Source={StaticResource AccentColor}}"
+                            Foreground="{DynamicResource AccentColor}"
                             Style="{DynamicResource DefaultButton}" />
                         <Button
                             x:Name="YuvBtn"
@@ -169,7 +169,7 @@
                             Click="RgbBtn_Click"
                             Content="{x:Static lang:Resources.YUV}"
                             FontWeight="ExtraBold"
-                            Foreground="{Binding Source={StaticResource AccentColor}}"
+                            Foreground="{DynamicResource AccentColor}"
                             Style="{DynamicResource DefaultButton}" />
                     </StackPanel>
 
@@ -199,7 +199,7 @@
                             x:Name="B1"
                             Width="50"
                             HorizontalAlignment="Center"
-                            Background="{Binding Source={StaticResource CardBackground}}"
+                            Background="{DynamicResource CardBackground}"
                             CornerRadius="5"
                             Visibility="Collapsed">
                             <Border.Effect>
@@ -207,7 +207,7 @@
                                     BlurRadius="15"
                                     Opacity="0.2"
                                     ShadowDepth="0"
-                                    Color="{Binding Source={StaticResource AccentColor}}" />
+                                    Color="{DynamicResource Accent}" />
                             </Border.Effect>
                             <Grid>
                                 <TextBox
@@ -220,7 +220,7 @@
                                     CommandManager.CanExecute="Txt1_CanExecute"
                                     CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                     FontWeight="Bold"
-                                    Foreground="{Binding Source={StaticResource DarkGray}}"
+                                    Foreground="{DynamicResource DarkGray}"
                                     TextAlignment="Center"
                                     TextChanged="Txt1_TextChanged" />
                             </Grid>
@@ -235,7 +235,7 @@
                             x:Name="B2"
                             Width="50"
                             HorizontalAlignment="Center"
-                            Background="{Binding Source={StaticResource CardBackground}}"
+                            Background="{DynamicResource CardBackground}"
                             CornerRadius="5"
                             Visibility="Collapsed">
                             <Border.Effect>
@@ -243,7 +243,7 @@
                                     BlurRadius="15"
                                     Opacity="0.2"
                                     ShadowDepth="0"
-                                    Color="{Binding Source={StaticResource AccentColor}}" />
+                                    Color="{DynamicResource Accent}" />
                             </Border.Effect>
                             <Grid>
                                 <TextBox
@@ -256,7 +256,7 @@
                                     CommandManager.CanExecute="Txt1_CanExecute"
                                     CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                     FontWeight="Bold"
-                                    Foreground="{Binding Source={StaticResource DarkGray}}"
+                                    Foreground="{DynamicResource DarkGray}"
                                     TextAlignment="Center"
                                     TextChanged="Txt1_TextChanged" />
                             </Grid>
@@ -271,7 +271,7 @@
                             x:Name="B3"
                             Width="50"
                             HorizontalAlignment="Center"
-                            Background="{Binding Source={StaticResource CardBackground}}"
+                            Background="{DynamicResource CardBackground}"
                             CornerRadius="5"
                             Visibility="Collapsed">
                             <Border.Effect>
@@ -279,7 +279,7 @@
                                     BlurRadius="15"
                                     Opacity="0.2"
                                     ShadowDepth="0"
-                                    Color="{Binding Source={StaticResource AccentColor}}" />
+                                    Color="{DynamicResource Accent}" />
                             </Border.Effect>
                             <Grid>
                                 <TextBox
@@ -292,7 +292,7 @@
                                     CommandManager.CanExecute="Txt1_CanExecute"
                                     CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                     FontWeight="Bold"
-                                    Foreground="{Binding Source={StaticResource DarkGray}}"
+                                    Foreground="{DynamicResource DarkGray}"
                                     TextAlignment="Center"
                                     TextChanged="Txt1_TextChanged" />
                             </Grid>
@@ -307,7 +307,7 @@
                             x:Name="B4"
                             Width="50"
                             HorizontalAlignment="Center"
-                            Background="{Binding Source={StaticResource CardBackground}}"
+                            Background="{DynamicResource CardBackground}"
                             CornerRadius="5"
                             Visibility="Collapsed">
                             <Border.Effect>
@@ -315,7 +315,7 @@
                                     BlurRadius="15"
                                     Opacity="0.2"
                                     ShadowDepth="0"
-                                    Color="{Binding Source={StaticResource AccentColor}}" />
+                                    Color="{DynamicResource Accent}" />
                             </Border.Effect>
                             <Grid>
                                 <TextBox
@@ -328,7 +328,7 @@
                                     CommandManager.CanExecute="Txt1_CanExecute"
                                     CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                     FontWeight="Bold"
-                                    Foreground="{Binding Source={StaticResource DarkGray}}"
+                                    Foreground="{DynamicResource DarkGray}"
                                     TextAlignment="Center"
                                     TextChanged="Txt1_TextChanged" />
                             </Grid>
@@ -343,7 +343,7 @@
                             x:Name="B5"
                             Width="100"
                             HorizontalAlignment="Center"
-                            Background="{Binding Source={StaticResource CardBackground}}"
+                            Background="{DynamicResource CardBackground}"
                             CornerRadius="5"
                             Visibility="Collapsed">
                             <Border.Effect>
@@ -351,7 +351,7 @@
                                     BlurRadius="15"
                                     Opacity="0.2"
                                     ShadowDepth="0"
-                                    Color="{Binding Source={StaticResource AccentColor}}" />
+                                    Color="{DynamicResource Accent}" />
                             </Border.Effect>
                             <Grid>
                                 <TextBox
@@ -364,7 +364,7 @@
                                     CommandManager.CanExecute="Txt1_CanExecute"
                                     CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                     FontWeight="Bold"
-                                    Foreground="{Binding Source={StaticResource DarkGray}}"
+                                    Foreground="{DynamicResource DarkGray}"
                                     TextAlignment="Center"
                                     TextChanged="Txt1_TextChanged" />
                             </Grid>
@@ -378,11 +378,11 @@
                         Padding="5"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
-                        Background="{Binding Source={StaticResource Background3}}"
+                        Background="{DynamicResource Background3}"
                         Click="SelectColorBtn_Click"
                         Content="{x:Static lang:Resources.Apply}"
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource Foreground1}}"
+                        Foreground="{DynamicResource Foreground1}"
                         Style="{DynamicResource DefaultButton}" />
 
                 </Grid>
@@ -398,7 +398,7 @@
                 VerticalAlignment="Center"
                 FontFamily="../Fonts/#FluentSystemIcons-Regular"
                 FontSize="16"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Text="&#xF793;" />
             <TextBlock
                 x:Name="TitleTxt"
@@ -414,14 +414,14 @@
             Grid.ColumnSpan="2"
             Margin="10"
             Padding="10"
-            Background="{Binding Source={StaticResource CardBackground}}"
+            Background="{DynamicResource CardBackground}"
             CornerRadius="5">
             <Border.Effect>
                 <DropShadowEffect
                     BlurRadius="15"
                     Opacity="0.2"
                     ShadowDepth="0"
-                    Color="{Binding Source={StaticResource AccentColor}}" />
+                    Color="{DynamicResource Accent}" />
             </Border.Effect>
 
             <Grid>
@@ -435,13 +435,13 @@
                         Margin="0 0 10 0"
                         VerticalAlignment="Center"
                         Text="{x:Static lang:Resources.Font}" />
-                    <Border Background="{Binding Source={StaticResource CardBackground}}" CornerRadius="5">
+                    <Border Background="{DynamicResource CardBackground}" CornerRadius="5">
                         <Border.Effect>
                             <DropShadowEffect
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
 
                         </Border.Effect>
                         <ComboBox
@@ -453,9 +453,9 @@
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             Background="Transparent"
-                            BorderBrush="{Binding Source={StaticResource AccentColor}}"
+                            BorderBrush="{DynamicResource AccentColor}"
                             BorderThickness="0"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             IsEditable="True"
                             SelectionChanged="FontComboBox_SelectionChanged"
                             Style="{DynamicResource ComboBoxStyle1}" />
@@ -468,14 +468,14 @@
                         x:Name="B"
                         Width="50"
                         HorizontalAlignment="Center"
-                        Background="{Binding Source={StaticResource CardBackground}}"
+                        Background="{DynamicResource CardBackground}"
                         CornerRadius="5">
                         <Border.Effect>
                             <DropShadowEffect
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
                         </Border.Effect>
                         <TextBox
                             x:Name="FontSizeTxt"
@@ -484,7 +484,7 @@
                             Background="Transparent"
                             BorderThickness="0"
                             FontWeight="Bold"
-                            Foreground="{Binding Source={StaticResource DarkGray}}"
+                            Foreground="{DynamicResource DarkGray}"
                             PreviewTextInput="FontSizeTxt_PreviewTextInput"
                             Text="16"
                             TextAlignment="Center"
@@ -498,7 +498,7 @@
                         x:Name="ForegroundBorder"
                         Width="30"
                         Height="30"
-                        Background="{Binding Source={StaticResource Foreground1}}"
+                        Background="{DynamicResource Foreground1}"
                         BorderThickness="0"
                         CornerRadius="20"
                         Cursor="Hand"
@@ -509,7 +509,7 @@
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
                         </Border.Effect>
                     </Border>
                     <TextBlock
@@ -520,7 +520,7 @@
                         x:Name="BackgroundBorder"
                         Width="30"
                         Height="30"
-                        Background="{Binding Source={StaticResource Background1}}"
+                        Background="{DynamicResource Background1}"
                         BorderThickness="0"
                         CornerRadius="20"
                         Cursor="Hand"
@@ -531,7 +531,7 @@
                                 BlurRadius="15"
                                 Opacity="0.2"
                                 ShadowDepth="0"
-                                Color="{Binding Source={StaticResource AccentColor}}" />
+                                Color="{DynamicResource Accent}" />
                         </Border.Effect>
                     </Border>
                 </StackPanel>
@@ -541,17 +541,17 @@
                         Grid.Column="2"
                         Padding="5"
                         VerticalAlignment="Center"
-                        Background="{Binding Source={StaticResource Background3}}"
+                        Background="{DynamicResource Background3}"
                         Click="GenerateGradientBtn_Click"
                         Content="&#xF191;"
                         FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                        Foreground="{Binding Source={StaticResource Foreground1}}"
+                        Foreground="{DynamicResource Foreground1}"
                         Style="{DynamicResource DefaultButton}">
                         <Button.ToolTip>
                             <ToolTip
-                                Background="{Binding Source={StaticResource Background1}}"
+                                Background="{DynamicResource Background1}"
                                 Content="{x:Static lang:Resources.GenerateTextColors}"
-                                Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                Foreground="{DynamicResource Foreground1}" />
                         </Button.ToolTip>
                     </Button>
                     <Button
@@ -559,18 +559,18 @@
                         Grid.Column="3"
                         Padding="5"
                         VerticalAlignment="Center"
-                        Background="{Binding Source={StaticResource Background3}}"
+                        Background="{DynamicResource Background3}"
                         Click="BookmarkBtn_Click"
                         Content="&#xF1F6;"
                         FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                        Foreground="{Binding Source={StaticResource Foreground1}}"
+                        Foreground="{DynamicResource Foreground1}"
                         Style="{DynamicResource DefaultButton}">
                         <Button.ToolTip>
                             <ToolTip
                                 x:Name="BookmarkToolTip"
-                                Background="{Binding Source={StaticResource Background1}}"
+                                Background="{DynamicResource Background1}"
                                 Content="{x:Static lang:Resources.AddBookmark}"
-                                Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                Foreground="{DynamicResource Foreground1}" />
                         </Button.ToolTip>
                     </Button>
                 </StackPanel>
@@ -581,14 +581,14 @@
             Grid.Row="2"
             Margin="10"
             Padding="10"
-            Background="{Binding Source={StaticResource CardBackground}}"
+            Background="{DynamicResource CardBackground}"
             CornerRadius="5">
             <Border.Effect>
                 <DropShadowEffect
                     BlurRadius="15"
                     Opacity="0.2"
                     ShadowDepth="0"
-                    Color="{Binding Source={StaticResource AccentColor}}" />
+                    Color="{DynamicResource Accent}" />
             </Border.Effect>
             <StackPanel>
                 <TextBox
@@ -623,20 +623,20 @@
             Margin="10"
             Padding="10"
             VerticalAlignment="Top"
-            Background="{Binding Source={StaticResource CardBackground}}"
+            Background="{DynamicResource CardBackground}"
             CornerRadius="5">
             <Border.Effect>
                 <DropShadowEffect
                     BlurRadius="15"
                     Opacity="0.2"
                     ShadowDepth="0"
-                    Color="{Binding Source={StaticResource AccentColor}}" />
+                    Color="{DynamicResource Accent}" />
             </Border.Effect>
             <StackPanel>
                 <TextBlock
                     Margin="0 0 0 10"
                     FontWeight="ExtraBold"
-                    Foreground="{Binding Source={StaticResource DarkGray}}"
+                    Foreground="{DynamicResource DarkGray}"
                     Text="{x:Static lang:Resources.Contrast}" />
 
                 <Grid HorizontalAlignment="Center">
diff --git a/ColorPicker/Pages/TextPage.xaml.cs b/ColorPicker/Pages/TextPage.xaml.cs
index 3850d70d..ce6b7480 100644
--- a/ColorPicker/Pages/TextPage.xaml.cs
+++ b/ColorPicker/Pages/TextPage.xaml.cs
@@ -260,7 +260,7 @@ internal void RgbBtn_Click(object sender, RoutedEventArgs? e)
 		BookmarkBtn.Content = !Global.Bookmarks.TextBookmarks.Contains(bookmarkText) ? "\uF1F6" : "\uF1F8";
 	}
 
-	private void CheckButton(Button button) => button.Background = new SolidColorBrush { Color = Global.GetColorFromResource("LightAccentColor") };
+	private void CheckButton(Button button) => button.Background = Global.GetColorFromResource("LightAccentColor");
 
 	private void HideAllInput()
 	{
diff --git a/ColorPicker/UserControls/ActionCard.xaml b/ColorPicker/UserControls/ActionCard.xaml
index eba4a0b4..f7d8b03e 100644
--- a/ColorPicker/UserControls/ActionCard.xaml
+++ b/ColorPicker/UserControls/ActionCard.xaml
@@ -9,10 +9,10 @@
     Height="30"
     Margin="5 2"
     FontFamily="../Fonts/#Hauroa"
-    Foreground="{Binding Source={StaticResource Foreground1}}"
+    Foreground="{DynamicResource Foreground1}"
     mc:Ignorable="d">
     <Border
-        Background="{Binding Source={StaticResource LightAccentColor}}"
+        Background="{DynamicResource LightAccentColor}"
         CornerRadius="15"
         Cursor="Hand"
         MouseLeftButtonUp="Border_MouseLeftButtonUp">
@@ -26,7 +26,7 @@
                 d:Text="&#xF4DB;"
                 FontFamily="../Fonts/#FluentSystemIcons-Filled"
                 FontSize="16"
-                Foreground="{Binding Source={StaticResource AccentColor}}" />
+                Foreground="{DynamicResource AccentColor}" />
             <TextBlock
                 x:Name="PageNameTxt"
                 Margin="10 0 0 0"
@@ -35,7 +35,7 @@
                 FontFamily="../Fonts/#Hauora"
                 FontSize="14"
                 FontWeight="ExtraBold"
-                Foreground="{Binding Source={StaticResource AccentColor}}" />
+                Foreground="{DynamicResource AccentColor}" />
         </StackPanel>
     </Border>
 </UserControl>
diff --git a/ColorPicker/UserControls/ColorItem.xaml b/ColorPicker/UserControls/ColorItem.xaml
index 24afa51e..56401e65 100644
--- a/ColorPicker/UserControls/ColorItem.xaml
+++ b/ColorPicker/UserControls/ColorItem.xaml
@@ -9,11 +9,11 @@
     Width="250"
     Height="110"
     FontFamily="../Fonts/#Hauora"
-    Foreground="{Binding Source={StaticResource Foreground1}}"
+    Foreground="{DynamicResource Foreground1}"
     mc:Ignorable="d">
     <Border
         Margin="10"
-        Background="{Binding Source={StaticResource CardBackground}}"
+        Background="{DynamicResource CardBackground}"
         CornerRadius="10">
         <Border.Effect>
             <DropShadowEffect
@@ -46,55 +46,55 @@
                         <MenuItem
                             x:Name="CopyRGB"
                             Click="CopyRGB_Click"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Header="{x:Static lang:Resources.CopyRGB}"
                             Style="{DynamicResource MenuStyle}" />
                         <MenuItem
                             x:Name="CopyHEX"
                             Click="CopyHEX_Click"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Header="{x:Static lang:Resources.CopyHEX}"
                             Style="{DynamicResource MenuStyle}" />
                         <MenuItem
                             x:Name="CopyHSV"
                             Click="CopyHSV_Click"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Header="{x:Static lang:Resources.CopyHSV}"
                             Style="{DynamicResource MenuStyle}" />
                         <MenuItem
                             x:Name="CopyHSL"
                             Click="CopyHSL_Click"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Header="{x:Static lang:Resources.CopyHSL}"
                             Style="{DynamicResource MenuStyle}" />
                         <MenuItem
                             x:Name="CopyCMYK"
                             Click="CopyCMYK_Click"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Header="{x:Static lang:Resources.CopyCMYK}"
                             Style="{DynamicResource MenuStyle}" />
                         <MenuItem
                             x:Name="CopyDEC"
                             Click="CopyDEC_Click"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Header="{x:Static lang:Resources.CopyDEC}"
                             Style="{DynamicResource MenuStyle}" />
                         <MenuItem
                             x:Name="CopyXYZ"
                             Click="CopyXYZ_Click"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Header="{x:Static lang:Resources.CopyXYZ}"
                             Style="{DynamicResource MenuStyle}" />
                         <MenuItem
                             x:Name="CopyYIQ"
                             Click="CopyYIQ_Click"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Header="{x:Static lang:Resources.CopyYIQ}"
                             Style="{DynamicResource MenuStyle}" />
                         <MenuItem
                             x:Name="CopyYUV"
                             Click="CopyYUV_Click"
-                            Foreground="{Binding Source={StaticResource Foreground1}}"
+                            Foreground="{DynamicResource Foreground1}"
                             Header="{x:Static lang:Resources.CopyYUV}"
                             Style="{DynamicResource MenuStyle}" />
                     </ContextMenu>
@@ -110,7 +110,7 @@
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.RGB}" />
                     <TextBlock
                         x:Name="RgbTxt"
@@ -121,7 +121,7 @@
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.HEX}" />
                     <TextBlock
                         x:Name="HEXTxt"
@@ -138,17 +138,17 @@
                     Margin="0 5 5 0"
                     Padding="5"
                     VerticalAlignment="Top"
-                    Background="{Binding Source={StaticResource Background3}}"
+                    Background="{DynamicResource Background3}"
                     Click="DeleteBtn_Click"
                     Content="&#xF34D;"
                     FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                    Foreground="{Binding Source={StaticResource Foreground1}}"
+                    Foreground="{DynamicResource Foreground1}"
                     Style="{DynamicResource DefaultButton}">
                     <Button.ToolTip>
                         <ToolTip
-                            Background="{Binding Source={StaticResource Background1}}"
+                            Background="{DynamicResource Background1}"
                             Content="{x:Static lang:Resources.Delete}"
-                            Foreground="{Binding Source={StaticResource Foreground1}}" />
+                            Foreground="{DynamicResource Foreground1}" />
                     </Button.ToolTip>
                 </Button>
                 <Button
@@ -157,17 +157,17 @@
                     Margin="0 5 5 0"
                     Padding="5"
                     VerticalAlignment="Top"
-                    Background="{Binding Source={StaticResource Background3}}"
+                    Background="{DynamicResource Background3}"
                     Click="MoreBtn_Click"
                     Content="&#xFC2E;"
                     FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                    Foreground="{Binding Source={StaticResource Foreground1}}"
+                    Foreground="{DynamicResource Foreground1}"
                     Style="{DynamicResource DefaultButton}">
                     <Button.ToolTip>
                         <ToolTip
-                            Background="{Binding Source={StaticResource Background1}}"
+                            Background="{DynamicResource Background1}"
                             Content="{x:Static lang:Resources.Details}"
-                            Foreground="{Binding Source={StaticResource Foreground1}}" />
+                            Foreground="{DynamicResource Foreground1}" />
                     </Button.ToolTip>
                 </Button>
                 <Popup
@@ -179,7 +179,7 @@
                     <Border
                         Margin="10"
                         Padding="10"
-                        Background="{Binding Source={StaticResource Background1}}"
+                        Background="{DynamicResource Background1}"
                         CornerRadius="10">
                         <Border.Effect>
                             <DropShadowEffect
@@ -197,7 +197,7 @@
                                 Click="GoBtn_Click"
                                 Content="{x:Static lang:Resources.EditInSelector}"
                                 FontWeight="Bold"
-                                Foreground="{Binding Source={StaticResource Foreground1}}"
+                                Foreground="{DynamicResource Foreground1}"
                                 Style="{DynamicResource DefaultButton}" />
                             <Button
                                 x:Name="EditConverterBtn"
@@ -206,7 +206,7 @@
                                 Click="EditConverterBtn_Click"
                                 Content="{x:Static lang:Resources.Convert}"
                                 FontWeight="Bold"
-                                Foreground="{Binding Source={StaticResource Foreground1}}"
+                                Foreground="{DynamicResource Foreground1}"
                                 Style="{DynamicResource DefaultButton}" />
                             <Button
                                 x:Name="EditPaletteBtn"
@@ -215,7 +215,7 @@
                                 Click="EditPaletteBtn_Click"
                                 Content="{x:Static lang:Resources.GeneratePalette}"
                                 FontWeight="Bold"
-                                Foreground="{Binding Source={StaticResource Foreground1}}"
+                                Foreground="{DynamicResource Foreground1}"
                                 Style="{DynamicResource DefaultButton}" />
                         </StackPanel>
                     </Border>
diff --git a/ColorPicker/UserControls/ColorItem.xaml.cs b/ColorPicker/UserControls/ColorItem.xaml.cs
index 8882429c..040aaee9 100644
--- a/ColorPicker/UserControls/ColorItem.xaml.cs
+++ b/ColorPicker/UserControls/ColorItem.xaml.cs
@@ -55,8 +55,8 @@ private void InitUI()
 			ColorBorder.Effect = new DropShadowEffect() { BlurRadius = 15, ShadowDepth = 0, Color = color };
 			ColorBorder.ToolTip = new ToolTip()
 			{
-				Background = new SolidColorBrush { Color = Global.GetColorFromResource("Background1") },
-				Foreground = new SolidColorBrush { Color = Global.GetColorFromResource("Foreground1") },
+				Background = Global.GetColorFromResource("Background1"),
+				Foreground = Global.GetColorFromResource("Foreground1"),
 				Content = ColorInfo.ToString()
 			};
 
diff --git a/ColorPicker/UserControls/GradientItem.xaml b/ColorPicker/UserControls/GradientItem.xaml
index 210aa3ec..ba1b2030 100644
--- a/ColorPicker/UserControls/GradientItem.xaml
+++ b/ColorPicker/UserControls/GradientItem.xaml
@@ -9,11 +9,11 @@
     Width="300"
     Height="110"
     FontFamily="../Fonts/#Hauora"
-    Foreground="{Binding Source={StaticResource Foreground1}}"
+    Foreground="{DynamicResource Foreground1}"
     mc:Ignorable="d">
     <Border
         Margin="10"
-        Background="{Binding Source={StaticResource CardBackground}}"
+        Background="{DynamicResource CardBackground}"
         CornerRadius="10">
         <Border.Effect>
             <DropShadowEffect
@@ -49,7 +49,7 @@
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.From}" />
                     <TextBlock
                         x:Name="FromTxt"
@@ -60,7 +60,7 @@
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.To}" />
                     <TextBlock
                         x:Name="ToTxt"
@@ -71,7 +71,7 @@
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.Rotation}" />
                     <TextBlock
                         x:Name="AngleTxt"
@@ -88,17 +88,17 @@
                     Margin="0 5 5 0"
                     Padding="5"
                     VerticalAlignment="Top"
-                    Background="{Binding Source={StaticResource Background3}}"
+                    Background="{DynamicResource Background3}"
                     Click="DeleteBtn_Click"
                     Content="&#xF34D;"
                     FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                    Foreground="{Binding Source={StaticResource Foreground1}}"
+                    Foreground="{DynamicResource Foreground1}"
                     Style="{DynamicResource DefaultButton}">
                     <Button.ToolTip>
                         <ToolTip
-                            Background="{Binding Source={StaticResource Background1}}"
+                            Background="{DynamicResource Background1}"
                             Content="{x:Static lang:Resources.Delete}"
-                            Foreground="{Binding Source={StaticResource Foreground1}}" />
+                            Foreground="{DynamicResource Foreground1}" />
                     </Button.ToolTip>
                 </Button>
                 <Button
@@ -107,17 +107,17 @@
                     Margin="0 5 5 0"
                     Padding="5"
                     VerticalAlignment="Top"
-                    Background="{Binding Source={StaticResource Background3}}"
+                    Background="{DynamicResource Background3}"
                     Click="GoBtn_Click"
                     Content="&#xF3DE;"
                     FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                    Foreground="{Binding Source={StaticResource Foreground1}}"
+                    Foreground="{DynamicResource Foreground1}"
                     Style="{DynamicResource DefaultButton}">
                     <Button.ToolTip>
                         <ToolTip
-                            Background="{Binding Source={StaticResource Background1}}"
+                            Background="{DynamicResource Background1}"
                             Content="{x:Static lang:Resources.Details}"
-                            Foreground="{Binding Source={StaticResource Foreground1}}" />
+                            Foreground="{DynamicResource Foreground1}" />
                     </Button.ToolTip>
                 </Button>
             </StackPanel>
diff --git a/ColorPicker/UserControls/PageCard.xaml b/ColorPicker/UserControls/PageCard.xaml
index 87740a32..7f28d0d5 100644
--- a/ColorPicker/UserControls/PageCard.xaml
+++ b/ColorPicker/UserControls/PageCard.xaml
@@ -9,11 +9,11 @@
     MinWidth="200"
     Margin="5"
     FontFamily="../Fonts/#Hauora"
-    Foreground="{Binding Source={StaticResource Foreground1}}"
+    Foreground="{DynamicResource Foreground1}"
     mc:Ignorable="d">
     <Border
         Padding="5"
-        Background="{Binding Source={StaticResource CardBackground}}"
+        Background="{DynamicResource CardBackground}"
         CornerRadius="5"
         Cursor="Hand"
         MouseLeftButtonUp="Border_MouseLeftButtonUp">
@@ -35,7 +35,7 @@
                 d:Text="&#xF4DB;"
                 FontFamily="../Fonts/#FluentSystemIcons-Filled"
                 FontSize="26"
-                Foreground="{Binding Source={StaticResource AccentColor}}" />
+                Foreground="{DynamicResource AccentColor}" />
             <TextBlock
                 x:Name="PageNameTxt"
                 Margin="10 0 0 0"
diff --git a/ColorPicker/UserControls/PaletteItem.xaml b/ColorPicker/UserControls/PaletteItem.xaml
index b92a6010..300daddd 100644
--- a/ColorPicker/UserControls/PaletteItem.xaml
+++ b/ColorPicker/UserControls/PaletteItem.xaml
@@ -9,12 +9,12 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     FontFamily="../Fonts/#Hauora"
-    Foreground="{Binding Source={StaticResource Foreground1}}"
+    Foreground="{DynamicResource Foreground1}"
     mc:Ignorable="d">
     <Border
         Margin="10"
         Padding="10"
-        Background="{Binding Source={StaticResource CardBackground}}"
+        Background="{DynamicResource CardBackground}"
         CornerRadius="10">
         <Border.Effect>
             <DropShadowEffect
@@ -59,7 +59,7 @@
                         VerticalAlignment="Center"
                         FontFamily="../Fonts/#FluentSystemIcons-Regular"
                         FontSize="16"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Text="&#xF2F8;" />
                     <TextBlock
                         Margin="5 0 0 0"
@@ -83,7 +83,7 @@
                         VerticalAlignment="Center"
                         FontFamily="../Fonts/#FluentSystemIcons-Regular"
                         FontSize="16"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Text="&#xF4D7;" />
                     <TextBlock
                         Margin="5 0 0 0"
@@ -107,7 +107,7 @@
                         VerticalAlignment="Center"
                         FontFamily="../Fonts/#FluentSystemIcons-Regular"
                         FontSize="16"
-                        Foreground="{Binding Source={StaticResource AccentColor}}"
+                        Foreground="{DynamicResource AccentColor}"
                         Text="&#xF2BE;" />
                     <TextBlock
                         Margin="5 0 0 0"
@@ -130,17 +130,17 @@
                     Margin="0 5 5 0"
                     Padding="5"
                     VerticalAlignment="Top"
-                    Background="{Binding Source={StaticResource Background3}}"
+                    Background="{DynamicResource Background3}"
                     Click="DeleteBtn_Click"
                     Content="&#xF34D;"
                     FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                    Foreground="{Binding Source={StaticResource Foreground1}}"
+                    Foreground="{DynamicResource Foreground1}"
                     Style="{DynamicResource DefaultButton}">
                     <Button.ToolTip>
                         <ToolTip
-                            Background="{Binding Source={StaticResource Background1}}"
+                            Background="{DynamicResource Background1}"
                             Content="{x:Static lang:Resources.Delete}"
-                            Foreground="{Binding Source={StaticResource Foreground1}}" />
+                            Foreground="{DynamicResource Foreground1}" />
                     </Button.ToolTip>
                 </Button>
                 <Button
@@ -149,17 +149,17 @@
                     Margin="0 5 5 0"
                     Padding="5"
                     VerticalAlignment="Top"
-                    Background="{Binding Source={StaticResource Background3}}"
+                    Background="{DynamicResource Background3}"
                     Click="GoBtn_Click"
                     Content="&#xF3DE;"
                     FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                    Foreground="{Binding Source={StaticResource Foreground1}}"
+                    Foreground="{DynamicResource Foreground1}"
                     Style="{DynamicResource DefaultButton}">
                     <Button.ToolTip>
                         <ToolTip
-                            Background="{Binding Source={StaticResource Background1}}"
+                            Background="{DynamicResource Background1}"
                             Content="{x:Static lang:Resources.Details}"
-                            Foreground="{Binding Source={StaticResource Foreground1}}" />
+                            Foreground="{DynamicResource Foreground1}" />
                     </Button.ToolTip>
                 </Button>
             </StackPanel>
diff --git a/ColorPicker/UserControls/PaletteItem.xaml.cs b/ColorPicker/UserControls/PaletteItem.xaml.cs
index 01c30d2d..10bee89e 100644
--- a/ColorPicker/UserControls/PaletteItem.xaml.cs
+++ b/ColorPicker/UserControls/PaletteItem.xaml.cs
@@ -58,8 +58,8 @@ private void InitUI()
 			ColorBorder.Effect = new DropShadowEffect() { BlurRadius = 15, ShadowDepth = 0, Color = color };
 			ColorBorder.ToolTip = new ToolTip()
 			{
-				Background = new SolidColorBrush { Color = Global.GetColorFromResource("Background1") },
-				Foreground = new SolidColorBrush { Color = Global.GetColorFromResource("Foreground1") },
+				Background = Global.GetColorFromResource("Background1"),
+				Foreground = Global.GetColorFromResource("Foreground1"),
 				Content = ColorInfo.ToString()
 			};
 
@@ -94,8 +94,8 @@ private void InitUI()
 						},
 						ToolTip = new ToolTip()
 						{
-							Background = new SolidColorBrush { Color = Global.GetColorFromResource("Background1") },
-							Foreground = new SolidColorBrush { Color = Global.GetColorFromResource("Foreground1") },
+							Background = Global.GetColorFromResource("Background1"),
+							Foreground = Global.GetColorFromResource("Foreground1"),
 							Content = new ColorInfo(new(shades[i].R, shades[i].G, shades[i].B)).ToString()
 						},
 					};
diff --git a/ColorPicker/UserControls/TextItem.xaml b/ColorPicker/UserControls/TextItem.xaml
index 64f9c92d..85ab21be 100644
--- a/ColorPicker/UserControls/TextItem.xaml
+++ b/ColorPicker/UserControls/TextItem.xaml
@@ -9,12 +9,12 @@
     Width="150"
     Height="150"
     FontFamily="../Fonts/#Hauora"
-    Foreground="{Binding Source={StaticResource Foreground1}}"
+    Foreground="{DynamicResource Foreground1}"
     mc:Ignorable="d">
     <Border
         Name="BgBorder"
         Margin="10"
-        d:Background="{Binding Source={StaticResource CardBackground}}"
+        d:Background="{DynamicResource CardBackground}"
         CornerRadius="10">
         <Border.Effect>
             <DropShadowEffect
@@ -56,17 +56,17 @@
                     Margin="0 5 5 0"
                     Padding="5"
                     VerticalAlignment="Top"
-                    Background="{Binding Source={StaticResource Background3}}"
+                    Background="{DynamicResource Background3}"
                     Click="DeleteBtn_Click"
                     Content="&#xF34D;"
                     FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                    Foreground="{Binding Source={StaticResource Foreground1}}"
+                    Foreground="{DynamicResource Foreground1}"
                     Style="{DynamicResource DefaultButton}">
                     <Button.ToolTip>
                         <ToolTip
-                            Background="{Binding Source={StaticResource Background1}}"
+                            Background="{DynamicResource Background1}"
                             Content="{x:Static lang:Resources.Delete}"
-                            Foreground="{Binding Source={StaticResource Foreground1}}" />
+                            Foreground="{DynamicResource Foreground1}" />
                     </Button.ToolTip>
                 </Button>
                 <Button
@@ -75,17 +75,17 @@
                     Margin="0 5 5 0"
                     Padding="5"
                     VerticalAlignment="Top"
-                    Background="{Binding Source={StaticResource Background3}}"
+                    Background="{DynamicResource Background3}"
                     Click="GoBtn_Click"
                     Content="&#xF3DE;"
                     FontFamily="..\Fonts\#FluentSystemIcons-Regular"
-                    Foreground="{Binding Source={StaticResource Foreground1}}"
+                    Foreground="{DynamicResource Foreground1}"
                     Style="{DynamicResource DefaultButton}">
                     <Button.ToolTip>
                         <ToolTip
-                            Background="{Binding Source={StaticResource Background1}}"
+                            Background="{DynamicResource Background1}"
                             Content="{x:Static lang:Resources.Details}"
-                            Foreground="{Binding Source={StaticResource Foreground1}}" />
+                            Foreground="{DynamicResource Foreground1}" />
                     </Button.ToolTip>
                 </Button>
             </StackPanel>
diff --git a/ColorPicker/Windows/ColorDetailsWindow.xaml b/ColorPicker/Windows/ColorDetailsWindow.xaml
index c86b7d66..4fa36051 100644
--- a/ColorPicker/Windows/ColorDetailsWindow.xaml
+++ b/ColorPicker/Windows/ColorDetailsWindow.xaml
@@ -51,10 +51,10 @@
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="true">
-                                <Setter TargetName="border" Property="Background" Value="{Binding Source={StaticResource WindowButtonsHover1}}" />
+                                <Setter TargetName="border" Property="Background" Value="{DynamicResource WindowButtonsHover1}" />
                             </Trigger>
                             <Trigger Property="IsPressed" Value="true">
-                                <Setter TargetName="border" Property="Background" Value="{Binding Source={StaticResource WindowButtonsPressed1}}" />
+                                <Setter TargetName="border" Property="Background" Value="{DynamicResource WindowButtonsPressed1}" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -111,7 +111,7 @@
     <Border
         Name="WindowBorder"
         Margin="10"
-        Background="{Binding Source={StaticResource Background1}}"
+        Background="{DynamicResource Background1}"
         BorderThickness="0"
         CornerRadius="5">
         <Grid VerticalAlignment="Stretch">
@@ -174,16 +174,16 @@
                                 Margin="0 3 3 3"
                                 Padding="5"
                                 VerticalAlignment="Top"
-                                Background="{Binding Source={StaticResource Background3}}"
+                                Background="{DynamicResource Background3}"
                                 Click="CopyRgbBtn_Click"
                                 Content="&#xF32C;"
                                 FontFamily="..\Fonts\#FluentSystemIcons-Regular"
                                 Style="{DynamicResource DefaultButton}">
                                 <Button.ToolTip>
                                     <ToolTip
-                                        Background="{Binding Source={StaticResource Background1}}"
+                                        Background="{DynamicResource Background1}"
                                         Content="{x:Static lang:Resources.CopyRGB}"
-                                        Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                        Foreground="{DynamicResource Foreground1}" />
                                 </Button.ToolTip>
                             </Button>
 
@@ -209,16 +209,16 @@
                                 Margin="0 3 3 3"
                                 Padding="5"
                                 VerticalAlignment="Top"
-                                Background="{Binding Source={StaticResource Background3}}"
+                                Background="{DynamicResource Background3}"
                                 Click="CopyHexBtn_Click"
                                 Content="&#xF32C;"
                                 FontFamily="..\Fonts\#FluentSystemIcons-Regular"
                                 Style="{DynamicResource DefaultButton}">
                                 <Button.ToolTip>
                                     <ToolTip
-                                        Background="{Binding Source={StaticResource Background1}}"
+                                        Background="{DynamicResource Background1}"
                                         Content="{x:Static lang:Resources.CopyHEX}"
-                                        Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                        Foreground="{DynamicResource Foreground1}" />
                                 </Button.ToolTip>
                             </Button>
 
@@ -244,16 +244,16 @@
                                 Margin="0 3 3 3"
                                 Padding="5"
                                 VerticalAlignment="Top"
-                                Background="{Binding Source={StaticResource Background3}}"
+                                Background="{DynamicResource Background3}"
                                 Click="CopyHsvBtn_Click"
                                 Content="&#xF32C;"
                                 FontFamily="..\Fonts\#FluentSystemIcons-Regular"
                                 Style="{DynamicResource DefaultButton}">
                                 <Button.ToolTip>
                                     <ToolTip
-                                        Background="{Binding Source={StaticResource Background1}}"
+                                        Background="{DynamicResource Background1}"
                                         Content="{x:Static lang:Resources.CopyHSV}"
-                                        Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                        Foreground="{DynamicResource Foreground1}" />
                                 </Button.ToolTip>
                             </Button>
 
@@ -279,16 +279,16 @@
                                 Margin="0 3 3 3"
                                 Padding="5"
                                 VerticalAlignment="Top"
-                                Background="{Binding Source={StaticResource Background3}}"
+                                Background="{DynamicResource Background3}"
                                 Click="CopyHslBtn_Click"
                                 Content="&#xF32C;"
                                 FontFamily="..\Fonts\#FluentSystemIcons-Regular"
                                 Style="{DynamicResource DefaultButton}">
                                 <Button.ToolTip>
                                     <ToolTip
-                                        Background="{Binding Source={StaticResource Background1}}"
+                                        Background="{DynamicResource Background1}"
                                         Content="{x:Static lang:Resources.CopyHSL}"
-                                        Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                        Foreground="{DynamicResource Foreground1}" />
                                 </Button.ToolTip>
                             </Button>
 
@@ -314,16 +314,16 @@
                                 Margin="0 3 3 3"
                                 Padding="5"
                                 VerticalAlignment="Top"
-                                Background="{Binding Source={StaticResource Background3}}"
+                                Background="{DynamicResource Background3}"
                                 Click="CopyCmykBtn_Click"
                                 Content="&#xF32C;"
                                 FontFamily="..\Fonts\#FluentSystemIcons-Regular"
                                 Style="{DynamicResource DefaultButton}">
                                 <Button.ToolTip>
                                     <ToolTip
-                                        Background="{Binding Source={StaticResource Background1}}"
+                                        Background="{DynamicResource Background1}"
                                         Content="{x:Static lang:Resources.CopyCMYK}"
-                                        Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                        Foreground="{DynamicResource Foreground1}" />
                                 </Button.ToolTip>
                             </Button>
 
@@ -349,16 +349,16 @@
                                 Margin="0 3 3 3"
                                 Padding="5"
                                 VerticalAlignment="Top"
-                                Background="{Binding Source={StaticResource Background3}}"
+                                Background="{DynamicResource Background3}"
                                 Click="CopyXyzBtn_Click"
                                 Content="&#xF32C;"
                                 FontFamily="..\Fonts\#FluentSystemIcons-Regular"
                                 Style="{DynamicResource DefaultButton}">
                                 <Button.ToolTip>
                                     <ToolTip
-                                        Background="{Binding Source={StaticResource Background1}}"
+                                        Background="{DynamicResource Background1}"
                                         Content="{x:Static lang:Resources.CopyXYZ}"
-                                        Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                        Foreground="{DynamicResource Foreground1}" />
                                 </Button.ToolTip>
                             </Button>
 
@@ -384,16 +384,16 @@
                                 Margin="0 3 3 3"
                                 Padding="5"
                                 VerticalAlignment="Top"
-                                Background="{Binding Source={StaticResource Background3}}"
+                                Background="{DynamicResource Background3}"
                                 Click="CopyYiqBtn_Click"
                                 Content="&#xF32C;"
                                 FontFamily="..\Fonts\#FluentSystemIcons-Regular"
                                 Style="{DynamicResource DefaultButton}">
                                 <Button.ToolTip>
                                     <ToolTip
-                                        Background="{Binding Source={StaticResource Background1}}"
+                                        Background="{DynamicResource Background1}"
                                         Content="{x:Static lang:Resources.CopyYIQ}"
-                                        Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                        Foreground="{DynamicResource Foreground1}" />
                                 </Button.ToolTip>
                             </Button>
 
@@ -419,16 +419,16 @@
                                 Margin="0 3 3 3"
                                 Padding="5"
                                 VerticalAlignment="Top"
-                                Background="{Binding Source={StaticResource Background3}}"
+                                Background="{DynamicResource Background3}"
                                 Click="CopyYuvBtn_Click"
                                 Content="&#xF32C;"
                                 FontFamily="..\Fonts\#FluentSystemIcons-Regular"
                                 Style="{DynamicResource DefaultButton}">
                                 <Button.ToolTip>
                                     <ToolTip
-                                        Background="{Binding Source={StaticResource Background1}}"
+                                        Background="{DynamicResource Background1}"
                                         Content="{x:Static lang:Resources.CopyYUV}"
-                                        Foreground="{Binding Source={StaticResource Foreground1}}" />
+                                        Foreground="{DynamicResource Foreground1}" />
                                 </Button.ToolTip>
                             </Button>
 
diff --git a/ColorPicker/Windows/FirstRunWindow.xaml b/ColorPicker/Windows/FirstRunWindow.xaml
index d2b3255e..1810d3d6 100644
--- a/ColorPicker/Windows/FirstRunWindow.xaml
+++ b/ColorPicker/Windows/FirstRunWindow.xaml
@@ -13,7 +13,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     FontFamily="/Fonts/#Hauora"
-    Foreground="{Binding Source={StaticResource Foreground1}}"
+    Foreground="{DynamicResource Foreground1}"
     ResizeMode="NoResize"
     WindowStartupLocation="CenterScreen"
     WindowStyle="None"
@@ -52,10 +52,10 @@
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="true">
-                                <Setter TargetName="border" Property="Background" Value="{Binding Source={StaticResource WindowButtonsHover1}}" />
+                                <Setter TargetName="border" Property="Background" Value="{DynamicResource WindowButtonsHover1}" />
                             </Trigger>
                             <Trigger Property="IsPressed" Value="true">
-                                <Setter TargetName="border" Property="Background" Value="{Binding Source={StaticResource WindowButtonsPressed1}}" />
+                                <Setter TargetName="border" Property="Background" Value="{DynamicResource WindowButtonsPressed1}" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -159,7 +159,7 @@
                         Content="&#xF36B;"
                         FontFamily="/Fonts/#FluentSystemIcons-Regular"
                         FontSize="14"
-                        Foreground="{Binding Source={StaticResource Foreground1}}"
+                        Foreground="{DynamicResource Foreground1}"
                         RenderOptions.EdgeMode="Aliased"
                         Style="{StaticResource TitleBarCloseButtonStyle}" />
                 </Grid>
diff --git a/ColorPicker/Windows/MiniPicker.xaml b/ColorPicker/Windows/MiniPicker.xaml
index 328fe62b..a98735c3 100644
--- a/ColorPicker/Windows/MiniPicker.xaml
+++ b/ColorPicker/Windows/MiniPicker.xaml
@@ -12,7 +12,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     FontFamily="../Fonts/#Hauora"
-    Foreground="{Binding Source={StaticResource Foreground1}}"
+    Foreground="{DynamicResource Foreground1}"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     Topmost="True"
@@ -21,7 +21,7 @@
     mc:Ignorable="d">
     <Border
         Margin="10"
-        Background="{Binding Source={StaticResource CardBackground}}"
+        Background="{DynamicResource CardBackground}"
         CornerRadius="15">
         <Border.Effect>
             <DropShadowEffect
@@ -54,7 +54,7 @@
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.RGB}" />
                     <TextBlock
                         x:Name="RgbTxt"
@@ -65,7 +65,7 @@
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontWeight="ExtraBold"
-                        Foreground="{Binding Source={StaticResource DarkGray}}"
+                        Foreground="{DynamicResource DarkGray}"
                         Text="{x:Static lang:Resources.HEX}" />
                     <TextBlock
                         x:Name="HEXTxt"