diff --git a/ColorPicker.Setup/Setup.iss b/ColorPicker.Setup/Setup.iss
index 519f80c2..1b480321 100644
--- a/ColorPicker.Setup/Setup.iss
+++ b/ColorPicker.Setup/Setup.iss
@@ -2,8 +2,8 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "ColorPicker Max"
-#define MyAppVersion "5.7.1.2311"
-#define MyAppFullVersion "5.7.1.2311"
+#define MyAppVersion "5.8.0.2312"
+#define MyAppFullVersion "5.8.0.2312"
 #define MyAppPublisher "L�o Corporation"
 #define MyAppURL "https://leocorporation.dev/"
 #define MyAppExeName "ColorPicker.exe"
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/Bookmarks.cs b/ColorPicker/Classes/Bookmarks.cs
index ef2649a0..ac77ddd7 100644
--- a/ColorPicker/Classes/Bookmarks.cs
+++ b/ColorPicker/Classes/Bookmarks.cs
@@ -21,7 +21,6 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE. 
 */
-using PeyrSharp.Core.Converters;
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
@@ -41,19 +40,19 @@ public class BookmarkText : IEquatable<BookmarkText>
 		public string FontFamily { get; init; }
 		public string ForegroundColor { get; init; }
 		public string BackgroundColor { get; init; }
-        public BookmarkText()
-        {
+		public BookmarkText()
+		{
 			FontFamily = "Arial"; // Fallback values
 			ForegroundColor = "#000000";
 			BackgroundColor = "#FFFFFF";
-        }
+		}
 
-        public BookmarkText(string font, string fore, string back)
-        {
+		public BookmarkText(string font, string fore, string back)
+		{
 			FontFamily = font;
 			ForegroundColor = fore;
 			BackgroundColor = back;
-        }
+		}
 
 		public bool Equals(BookmarkText? obj)
 		{
diff --git a/ColorPicker/Classes/DEC.cs b/ColorPicker/Classes/DEC.cs
index fe426b0b..f24c104f 100644
--- a/ColorPicker/Classes/DEC.cs
+++ b/ColorPicker/Classes/DEC.cs
@@ -24,11 +24,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
 using ColorHelper;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 
 namespace ColorPicker.Classes;
 public class DEC
diff --git a/ColorPicker/Classes/Global.cs b/ColorPicker/Classes/Global.cs
index 307a9163..f1ec3768 100644
--- a/ColorPicker/Classes/Global.cs
+++ b/ColorPicker/Classes/Global.cs
@@ -33,7 +33,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using System.Linq;
 using System.Threading;
 using System.Windows;
-using System.Windows.Markup.Localizer;
 using System.Windows.Media;
 
 namespace ColorPicker.Classes;
@@ -82,12 +81,14 @@ public static class Global
 		}
 	};
 
+	internal static Action RefreshButton { get; set; }
+
 	internal static string SynethiaPath => $@"{FileSys.AppDataPath}\Léo Corporation\ColorPicker Max\SynethiaConfig.json";
 	internal static string BookmarksPath => $@"{FileSys.AppDataPath}\Léo Corporation\ColorPicker Max\Bookmarks.xml";
 	internal static string SettingsPath => $@"{FileSys.AppDataPath}\Léo Corporation\ColorPicker Max\Settings.xml";
 	public static string LastVersionLink => "https://raw.githubusercontent.com/Leo-Corporation/LeoCorp-Docs/master/Liens/Update%20System/ColorPicker/5.0/Version.txt";
 
-	public static string Version => "5.7.1.2311";
+	public static string Version => "5.8.0.2312";
 
 	public static string HiSentence
 	{
@@ -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)
 	{
@@ -253,7 +254,7 @@ public static AppPages PageInfoToAppPages(PageInfo pageInfo)
 	/// <summary>
 	/// Changes the application's theme.
 	/// </summary>
-	public static void ChangeTheme()
+	public static void ChangeTheme(bool reload = false)
 	{
 		App.Current.Resources.MergedDictionaries.Clear();
 		ResourceDictionary resourceDictionary = new(); // Create a resource dictionary
@@ -274,6 +275,15 @@ public static void ChangeTheme()
 		}
 
 		App.Current.Resources.MergedDictionaries.Add(resourceDictionary); // Add the dictionary
+
+		if (!reload) return;
+		AiGenPage.CheckButton(AiGenPage.CheckedButton);
+		BookmarksPage.CheckButton(BookmarksPage.CheckedButton);
+		ConverterPage.CheckButton(ConverterPage.SelectedColorBtn);
+		ChromaticWheelPage.CheckButton(ChromaticWheelPage.CheckedButton);
+		HarmoniesPage.CheckButton(HarmoniesPage.SelectedColorBtn);
+		PalettePage.CheckButton(PalettePage.SelectedColorBtn);
+		RefreshButton();
 	}
 
 	public static bool IsSystemThemeDark()
@@ -468,9 +478,9 @@ public static Color[] GenerateTriadicColors(Color baseColor)
 
 	public static void ColorToHSL(Color color, out float h, out float s, out float l)
 	{
-		float r = (float)color.R / 255f;
-		float g = (float)color.G / 255f;
-		float b = (float)color.B / 255f;
+		float r = color.R / 255f;
+		float g = color.G / 255f;
+		float b = color.B / 255f;
 
 		float max = Math.Max(r, Math.Max(g, b));
 		float min = Math.Min(r, Math.Min(g, b));
diff --git a/ColorPicker/ColorPicker.csproj b/ColorPicker/ColorPicker.csproj
index 0d315c08..19077d5b 100644
--- a/ColorPicker/ColorPicker.csproj
+++ b/ColorPicker/ColorPicker.csproj
@@ -11,7 +11,7 @@
 	<Title>ColorPicker</Title>
 	<Description>Maximize your creativity.</Description>
 	<RepositoryUrl>https://github.com/Leo-Corporation/ColorPicker</RepositoryUrl>
-	<Version>5.7.1.2311</Version>
+	<Version>5.8.0.2312</Version>
 	<PackageLicenseExpression>MIT</PackageLicenseExpression>
 	<PackageIcon>logo.png</PackageIcon>
 	<ApplicationIcon>CPM.ico</ApplicationIcon>
@@ -48,11 +48,11 @@
   </ItemGroup>
 
   <ItemGroup>
-	<PackageReference Include="Betalgo.OpenAI" Version="7.3.1" />
+	<PackageReference Include="Betalgo.OpenAI" Version="7.4.1" />
 	<PackageReference Include="ColorHelper" Version="1.8.1" />
 	<PackageReference Include="MouseKeyHook" Version="5.7.1" />
-	<PackageReference Include="PeyrSharp.Env" Version="1.10.0.2310" />
-	<PackageReference Include="PeyrSharp.Core" Version="1.10.0.2310" />
+	<PackageReference Include="PeyrSharp.Core" Version="2.0.0.2311" />
+	<PackageReference Include="PeyrSharp.Env" Version="2.0.0.2311" />
 	<PackageReference Include="Synethia" Version="1.1.1.2302" />
   </ItemGroup>
 
diff --git a/ColorPicker/Enums/ColorTypes.cs b/ColorPicker/Enums/ColorTypes.cs
index 5071db05..a826c156 100644
--- a/ColorPicker/Enums/ColorTypes.cs
+++ b/ColorPicker/Enums/ColorTypes.cs
@@ -24,16 +24,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
 namespace ColorPicker.Enums
 {
-    public enum ColorTypes
-    {
-        RGB,
-        HEX,
-        HSV,
-        HSL,
-        CMYK,
-        XYZ,
-        YIQ,
-        YUV,
-        DEC
-    }
+	public enum ColorTypes
+	{
+		RGB,
+		HEX,
+		HSV,
+		HSL,
+		CMYK,
+		XYZ,
+		YIQ,
+		YUV,
+		DEC
+	}
 }
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..7d5809f0 100644
--- a/ColorPicker/MainWindow.xaml.cs
+++ b/ColorPicker/MainWindow.xaml.cs
@@ -43,6 +43,7 @@ public MainWindow()
 	{
 		InitializeComponent();
 		InitUI();
+		Global.RefreshButton = () => SettingsPageBtn.Background = Global.GetColorFromResource("Background1");
 		GC.Collect();
 	}
 
@@ -360,12 +361,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 +386,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 7b8c65e2..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>
@@ -143,20 +143,31 @@
                 Margin="10"
                 VerticalAlignment="Center"
                 d:Background="#ff0000"
-                CornerRadius="50" />
-
-            <StackPanel Orientation="Horizontal">
+                CornerRadius="50"
+                Visibility="Collapsed" />
+            <StackPanel
+                x:Name="EmptyPlaceholder"
+                Grid.Row="2"
+                Margin="10">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    FontFamily="..\Fonts\#FluentSystemIcons-Regular"
+                    FontSize="32"
+                    Text="&#xF2F6;" />
+                <TextBlock HorizontalAlignment="Center" Text="{x:Static lang:Resources.EmptyAiPlaceholder}" />
+            </StackPanel>
+            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <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"
@@ -166,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>
@@ -205,11 +216,22 @@
             Grid.Row="2"
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
+            d:Visibility="Visible"
             Visibility="Collapsed">
+            <StackPanel x:Name="EmptyPalettePlaceholder" Margin="10">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    FontFamily="..\Fonts\#FluentSystemIcons-Regular"
+                    FontSize="32"
+                    Text="&#xF2F6;" />
+                <TextBlock HorizontalAlignment="Center" Text="{x:Static lang:Resources.EmptyAiPlaceholder}" />
+            </StackPanel>
             <StackPanel
+                x:Name="PaletteBordersPanel"
                 Margin="10"
                 HorizontalAlignment="Center"
-                Orientation="Horizontal">
+                Orientation="Horizontal"
+                Visibility="Collapsed">
                 <Border
                     x:Name="C1"
                     Width="50"
@@ -222,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" />
@@ -240,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" />
@@ -258,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" />
@@ -276,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" />
@@ -294,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" />
@@ -302,18 +324,18 @@
                 </Border>
 
             </StackPanel>
-            <StackPanel Orientation="Horizontal">
+            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <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"
@@ -323,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>
@@ -360,7 +382,8 @@
         <StackPanel
             x:Name="ApiPlaceholder"
             Grid.Row="2"
-            VerticalAlignment="Center">
+            VerticalAlignment="Center"
+            d:Visibility="Collapsed">
             <TextBlock
                 HorizontalAlignment="Center"
                 FontFamily="..\Fonts\#FluentSystemIcons-Regular"
@@ -378,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"
@@ -394,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"
@@ -416,23 +439,24 @@
 
                     <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>
         </StackPanel>
-
         <StackPanel
+            x:Name="DetailsHeader"
             Grid.Row="3"
             Margin="10"
-            Orientation="Horizontal">
+            Orientation="Horizontal"
+            Visibility="Collapsed">
             <TextBlock
                 VerticalAlignment="Center"
                 FontFamily="../Fonts/#FluentSystemIcons-Regular"
                 FontSize="16"
-                Foreground="{Binding Source={StaticResource AccentColor}}"
+                Foreground="{DynamicResource AccentColor}"
                 Text="&#xF4A4;" />
             <TextBlock
                 Margin="5 0 0 0"
@@ -446,13 +470,14 @@
             x:Name="DetailsWrap"
             Grid.Row="4"
             Margin="0 0 0 20"
-            Orientation="Horizontal">
+            Orientation="Horizontal"
+            Visibility="Collapsed">
             <Border
                 MinWidth="150"
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -471,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
@@ -480,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>
 
@@ -509,7 +534,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -528,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
@@ -537,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>
 
@@ -566,7 +591,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -585,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
@@ -594,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>
 
@@ -623,7 +648,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -642,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
@@ -651,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>
 
@@ -680,7 +705,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -699,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
@@ -708,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>
 
@@ -737,7 +762,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -756,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
@@ -765,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>
 
@@ -794,7 +819,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -813,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
@@ -822,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>
 
@@ -851,7 +876,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -870,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
@@ -879,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>
 
@@ -908,7 +933,7 @@
                 Margin="5"
                 Padding="5"
                 HorizontalAlignment="Left"
-                Background="{Binding Source={StaticResource CardBackground}}"
+                Background="{DynamicResource CardBackground}"
                 CornerRadius="5">
                 <Border.Effect>
                     <DropShadowEffect
@@ -927,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
@@ -936,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 497858af..2823a472 100644
--- a/ColorPicker/Pages/AiGenPage.xaml.cs
+++ b/ColorPicker/Pages/AiGenPage.xaml.cs
@@ -22,21 +22,21 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE. 
 */
 
+using ColorHelper;
 using ColorPicker.Classes;
-using OpenAI.Managers;
 using OpenAI;
+using OpenAI.Managers;
+using OpenAI.ObjectModels;
+using OpenAI.ObjectModels.RequestModels;
 using Synethia;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
-using OpenAI.ObjectModels.RequestModels;
-using OpenAI.ObjectModels;
 using System.Windows.Media.Effects;
-using System.Text.Json;
-using System;
-using ColorHelper;
 
 namespace ColorPicker.Pages;
 /// <summary>
@@ -59,6 +59,7 @@ private void InitUI()
 		if (!string.IsNullOrEmpty(Global.Settings.ApiKey))
 		{
 			CheckButton(ColorBtn);
+			CheckedButton = ColorBtn;
 			ColorPanel.Visibility = Visibility.Visible;
 			ApiPlaceholder.Visibility = Visibility.Collapsed;
 			return;
@@ -70,6 +71,8 @@ internal void LoadDetails()
 	{
 		ColorBorder.Background = new SolidColorBrush { Color = Color.FromRgb(ColorInfo.RGB.R, ColorInfo.RGB.G, ColorInfo.RGB.B) };
 		ColorBorder.Effect = new DropShadowEffect() { BlurRadius = 15, ShadowDepth = 0, Color = Color.FromRgb(ColorInfo.RGB.R, ColorInfo.RGB.G, ColorInfo.RGB.B) };
+		ColorBorder.Visibility = Visibility.Visible;
+		EmptyPlaceholder.Visibility = Visibility.Collapsed;
 
 		// Load the details section		
 		RgbTxt.Text = $"{ColorInfo.RGB.R}; {ColorInfo.RGB.G}; {ColorInfo.RGB.B}";
@@ -85,6 +88,9 @@ internal void LoadDetails()
 		// Load the bookmark icon
 		BookmarkBtn.Content = Global.Bookmarks.ColorBookmarks.Contains(ColorInfo.HEX.Value) ? "\uF1F8" : "\uF1F6";
 		BookmarkBtn.Visibility = Visibility.Visible;
+
+		DetailsHeader.Visibility = Visibility.Visible;
+		DetailsWrap.Visibility = Visibility.Visible;
 	}
 
 	private void LoadBorders(string[] colors)
@@ -108,6 +114,9 @@ private void LoadBorders(string[] colors)
 			C3Shadow.Color = Color.FromRgb(convertedColors[2].R, convertedColors[2].G, convertedColors[2].B);
 			C4Shadow.Color = Color.FromRgb(convertedColors[3].R, convertedColors[3].G, convertedColors[3].B);
 			C5Shadow.Color = Color.FromRgb(convertedColors[4].R, convertedColors[4].G, convertedColors[4].B);
+
+			PaletteBordersPanel.Visibility = Visibility.Visible;
+			EmptyPalettePlaceholder.Visibility = Visibility.Collapsed;
 		}
 		catch (Exception e)
 		{
@@ -194,7 +203,8 @@ private async void GenerateBtn_Click(object sender, RoutedEventArgs e)
 		catch { }
 	}
 
-	private void CheckButton(Button button) => button.Background = new SolidColorBrush { Color = Global.GetColorFromResource("LightAccentColor") };
+	internal Button CheckedButton;
+	internal void CheckButton(Button button) => button.Background = Global.GetColorFromResource("LightAccentColor");
 
 	private void UnCheckAllButtons()
 	{
@@ -210,7 +220,8 @@ private void ColorBtn_Click(object sender, RoutedEventArgs e)
 		if (string.IsNullOrEmpty(Global.Settings.ApiKey)) return;
 		UnCheckAllButtons();
 		CheckButton(ColorBtn);
-		ColorPanel.Visibility = Visibility.Visible;		
+		CheckedButton = ColorBtn;
+		ColorPanel.Visibility = Visibility.Visible;
 	}
 
 	private void PaletteBtn_Click(object sender, RoutedEventArgs e)
@@ -218,6 +229,7 @@ private void PaletteBtn_Click(object sender, RoutedEventArgs e)
 		if (string.IsNullOrEmpty(Global.Settings.ApiKey)) return;
 		UnCheckAllButtons();
 		CheckButton(PaletteBtn);
+		CheckedButton = PaletteBtn;
 		PalettePanel.Visibility = Visibility.Visible;
 	}
 
@@ -272,7 +284,7 @@ private void ApiApplyBtn_Click(object sender, RoutedEventArgs e)
 		Global.Settings.ApiKey = ApiKeyTxt.Password;
 		XmlSerializerManager.SaveToXml(Global.Settings, Global.SettingsPath);
 		InitUI();
-    }
+	}
 
 	private void CopyDecBtn_Click(object sender, RoutedEventArgs e)
 	{
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..e8a0b23d 100644
--- a/ColorPicker/Pages/BookmarksPage.xaml.cs
+++ b/ColorPicker/Pages/BookmarksPage.xaml.cs
@@ -139,7 +139,8 @@ private void UnCheckAllButtons()
 			TextBookmarks.Visibility = Visibility.Collapsed;
 		}
 
-		private void CheckButton(Button button) => button.Background = new SolidColorBrush { Color = Global.GetColorFromResource("LightAccentColor") };
+		internal Button CheckedButton;
+		internal void CheckButton(Button button) { button.Background = Global.GetColorFromResource("LightAccentColor"); CheckedButton = button; }
 
 		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..e0217ab8 100644
--- a/ColorPicker/Pages/ChromaticWheelPage.xaml.cs
+++ b/ColorPicker/Pages/ChromaticWheelPage.xaml.cs
@@ -126,7 +126,8 @@ private void UnCheckAllButtons()
 		ShadesBtn.Background = new SolidColorBrush { Color = Colors.Transparent };
 	}
 
-	private void CheckButton(Button button) => button.Background = new SolidColorBrush { Color = Global.GetColorFromResource("LightAccentColor") };
+	internal Button CheckedButton;
+	internal void CheckButton(Button button) { button.Background = Global.GetColorFromResource("LightAccentColor"); CheckedButton = button; }
 
 	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..5f6ad074 100644
--- a/ColorPicker/Pages/ConverterPage.xaml.cs
+++ b/ColorPicker/Pages/ConverterPage.xaml.cs
@@ -75,7 +75,7 @@ private void InitUI()
 		}, null);
 	}
 
-	Button SelectedColorBtn { get; set; }
+	internal Button SelectedColorBtn { get; set; }
 	private void UnCheckAllButtons()
 	{
 		RgbBtn.Background = new SolidColorBrush { Color = Colors.Transparent };
@@ -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") };
+	internal 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..b1504cb4 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,27 +91,30 @@ 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);
+			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);
+			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);
+			Global.ChangeTheme();
 		}
 	}
 }
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 03074f26..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,13 +365,31 @@
                                 CommandManager.CanExecute="Txt1_CanExecute"
                                 CommandManager.PreviewExecuted="Txt1_PreviewExecuted"
                                 FontWeight="Bold"
-                                Foreground="{Binding Source={StaticResource DarkGray}}"
+                                Foreground="{DynamicResource DarkGray}"
                                 TextAlignment="Center"
                                 TextChanged="Txt1_TextChanged" />
                         </Grid>
                     </Border>
                 </StackPanel>
-
+                <Button
+                    x:Name="BookmarkBtn"
+                    Grid.Column="3"
+                    Padding="5"
+                    VerticalAlignment="Top"
+                    Background="{DynamicResource Background3}"
+                    Click="BookmarkBtn_Click"
+                    Content="&#xF1F6;"
+                    FontFamily="..\Fonts\#FluentSystemIcons-Regular"
+                    Foreground="{DynamicResource Foreground1}"
+                    Style="{DynamicResource DefaultButton}">
+                    <Button.ToolTip>
+                        <ToolTip
+                            x:Name="BookmarkToolTip"
+                            Background="{DynamicResource Background1}"
+                            Content="{x:Static lang:Resources.AddBookmark}"
+                            Foreground="{DynamicResource Foreground1}" />
+                    </Button.ToolTip>
+                </Button>
             </Grid>
         </Border>
         <StackPanel Grid.Row="2">
diff --git a/ColorPicker/Pages/HarmoniesPage.xaml.cs b/ColorPicker/Pages/HarmoniesPage.xaml.cs
index 40ae4815..190fcc15 100644
--- a/ColorPicker/Pages/HarmoniesPage.xaml.cs
+++ b/ColorPicker/Pages/HarmoniesPage.xaml.cs
@@ -27,39 +27,29 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using ColorPicker.Enums;
 using ColorPicker.Windows;
 using Synethia;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace ColorPicker.Pages
 {
-    /// <summary>
-    /// Interaction logic for HarmoniesPage.xaml
-    /// </summary>
-    public partial class HarmoniesPage : Page
-    {
+	/// <summary>
+	/// Interaction logic for HarmoniesPage.xaml
+	/// </summary>
+	public partial class HarmoniesPage : Page
+	{
 		bool code = Global.Settings.UseSynethia ? false : true; // checks if the code as already been implemented
 		public HarmoniesPage()
-        {
-            InitializeComponent();
-            InitUI();
+		{
+			InitializeComponent();
+			InitUI();
 			Loaded += (o, e) => SynethiaManager.InjectSynethiaCode(this, Global.SynethiaConfig.PagesInfo, 7, ref code); // injects the code in the page
 		}
 
-        private void InitUI()
-        {
+		private void InitUI()
+		{
 			TitleTxt.Text = $"{Properties.Resources.Creation} > {Properties.Resources.Harmonies}";
 			try
 			{
@@ -137,8 +127,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 +160,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()
 					},
 				};
@@ -179,6 +169,16 @@ internal void InitHarmonies()
 
 				MonochromaticPanel.Children.Add(border);
 			}
+
+			// Load the bookmark icon
+			if (!Global.Bookmarks.ColorBookmarks.Contains($"#{ColorInfo.HEX.Value}"))
+			{
+				BookmarkBtn.Content = "\uF1F6";
+				BookmarkToolTip.Content = Properties.Resources.AddBookmark;
+				return;
+			}
+			BookmarkBtn.Content = "\uF1F8";
+			BookmarkToolTip.Content = Properties.Resources.RemoveBookmark;
 		}
 
 		internal ColorInfo ColorInfo { get; set; }
@@ -211,7 +211,7 @@ private RGB ConvertToRgb()
 												 double.Parse(Txt3.Text)));
 		}
 
-		Button SelectedColorBtn { get; set; }
+		internal Button SelectedColorBtn { get; set; }
 		private void UnCheckAllButtons()
 		{
 			RgbBtn.Background = new SolidColorBrush { Color = Colors.Transparent };
@@ -237,7 +237,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") };
+		internal void CheckButton(Button button) => button.Background = Global.GetColorFromResource("LightAccentColor");
 
 		private void HideAllInput()
 		{
@@ -439,5 +439,20 @@ private void ComplementaryBorder_MouseLeftButtonUp(object sender, MouseButtonEve
 		{
 			new ColorDetailsWindow((SolidColorBrush)((Border)sender).Background).Show();
 		}
+
+		private void BookmarkBtn_Click(object sender, RoutedEventArgs e)
+		{
+			if (Global.Bookmarks.ColorBookmarks.Contains($"#{ColorInfo.HEX.Value}"))
+			{
+				Global.Bookmarks.ColorBookmarks.Remove($"#{ColorInfo.HEX.Value}");
+				BookmarkBtn.Content = "\uF1F6";
+				BookmarkToolTip.Content = Properties.Resources.AddBookmark;
+
+				return;
+			}
+			Global.Bookmarks.ColorBookmarks.Add($"#{ColorInfo.HEX.Value}"); // Add to color bookmarks
+			BookmarkBtn.Content = "\uF1F8";
+			BookmarkToolTip.Content = Properties.Resources.RemoveBookmark;
+		}
 	}
 }
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..ad8ab083 100644
--- a/ColorPicker/Pages/PalettePage.xaml.cs
+++ b/ColorPicker/Pages/PalettePage.xaml.cs
@@ -26,7 +26,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using ColorPicker.Enums;
 using ColorPicker.Windows;
 using Synethia;
-using System.Security.Cryptography;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -103,7 +102,7 @@ private RGB ConvertToRgb()
 											 double.Parse(Txt3.Text)));
 	}
 
-	Button SelectedColorBtn { get; set; }
+	internal Button SelectedColorBtn { get; set; }
 	private void UnCheckAllButtons()
 	{
 		RgbBtn.Background = new SolidColorBrush { Color = Colors.Transparent };
@@ -128,7 +127,7 @@ internal void RgbBtn_Click(object sender, RoutedEventArgs? e)
 		LoadInputUI();
 	}
 
-	private void CheckButton(Button button) => button.Background = new SolidColorBrush { Color = Global.GetColorFromResource("LightAccentColor") };
+	internal void CheckButton(Button button) => button.Background = Global.GetColorFromResource("LightAccentColor");
 
 	private void HideAllInput()
 	{
@@ -296,8 +295,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..9c92c6d9 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;
@@ -426,5 +426,5 @@ private void PaletteBtn_Click(object sender, RoutedEventArgs e)
 	private void CopyDecBtn_Click(object sender, RoutedEventArgs e)
 	{
 		Clipboard.SetText(DecTxt.Text);
-    }
+	}
 }
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..a13d3362 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;
-			}
-
 			SynethiaManager.Save(Global.SynethiaConfig, Global.SynethiaPath);
 			XmlSerializerManager.SaveToXml(Global.Bookmarks, Global.BookmarksPath);
 
-			Process.Start(Directory.GetCurrentDirectory() + @"\ColorPicker.exe");
-			Application.Current.Shutdown();
+			Global.ChangeTheme(true);
 		}
 
 		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(true);
 		}
-
 		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(true);
 		}
 
 		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/Properties/Resources.Designer.cs b/ColorPicker/Properties/Resources.Designer.cs
index 099b6f85..b208b2f0 100644
--- a/ColorPicker/Properties/Resources.Designer.cs
+++ b/ColorPicker/Properties/Resources.Designer.cs
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Ce code a été généré par un outil.
+//     Version du runtime :4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
+//     le code est régénéré.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -13,12 +13,12 @@ namespace ColorPicker.Properties {
     
     
     /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    ///   Une classe de ressource fortement typée destinée, entre autres, à la consultation des chaînes localisées.
     /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
+    // Cette classe a été générée automatiquement par la classe StronglyTypedResourceBuilder
+    // à l'aide d'un outil, tel que ResGen ou Visual Studio.
+    // Pour ajouter ou supprimer un membre, modifiez votre fichier .ResX, puis réexécutez ResGen
+    // avec l'option /str ou régénérez votre projet VS.
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
@@ -33,7 +33,7 @@ internal Resources() {
         }
         
         /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
+        ///   Retourne l'instance ResourceManager mise en cache utilisée par cette classe.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         public static global::System.Resources.ResourceManager ResourceManager {
@@ -47,8 +47,8 @@ internal Resources() {
         }
         
         /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
+        ///   Remplace la propriété CurrentUICulture du thread actuel pour toutes
+        ///   les recherches de ressources à l'aide de cette classe de ressource fortement typée.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         public static global::System.Globalization.CultureInfo Culture {
@@ -61,7 +61,7 @@ internal Resources() {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Add to bookmarks.
+        ///   Recherche une chaîne localisée semblable à Add to bookmarks.
         /// </summary>
         public static string AddBookmark {
             get {
@@ -70,7 +70,7 @@ public static string AddBookmark {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to I agree.
+        ///   Recherche une chaîne localisée semblable à I agree.
         /// </summary>
         public static string Agree {
             get {
@@ -79,7 +79,7 @@ public static string Agree {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Generate colors with AI.
+        ///   Recherche une chaîne localisée semblable à Generate colors with AI.
         /// </summary>
         public static string AIGenerateColor {
             get {
@@ -88,7 +88,7 @@ public static string AIGenerateColor {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to AI Generation.
+        ///   Recherche une chaîne localisée semblable à AI Generation.
         /// </summary>
         public static string AIGeneration {
             get {
@@ -97,7 +97,7 @@ public static string AIGeneration {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Ocean Breeze,Crimson Sunset,Enchanted Forest,Electric Dreams,Desert Mirage,Midnight Serenade,Neon Galaxy,Golden Harvest,Lavender Mist,Tropical Paradise,Fire and Ice,Mystic Moonlight,Emerald Elegance,Cherry Blossom,Aurora Australis,Steel City Lights,Vintage Romance,Sapphire Dreams,Amber Afterglow,Velvet Touch,Dandelion Wishes,Urban Jungle,Rose Petal Whispers,Icy Tundra,Chocolate Delight,Harbor Reflections,Whispering Wind,Vibrant Spectrum,Pastel Reverie,Moonlit Meadow.
+        ///   Recherche une chaîne localisée semblable à Ocean Breeze,Crimson Sunset,Enchanted Forest,Electric Dreams,Desert Mirage,Midnight Serenade,Neon Galaxy,Golden Harvest,Lavender Mist,Tropical Paradise,Fire and Ice,Mystic Moonlight,Emerald Elegance,Cherry Blossom,Aurora Australis,Steel City Lights,Vintage Romance,Sapphire Dreams,Amber Afterglow,Velvet Touch,Dandelion Wishes,Urban Jungle,Rose Petal Whispers,Icy Tundra,Chocolate Delight,Harbor Reflections,Whispering Wind,Vibrant Spectrum,Pastel Reverie,Moonlit Meadow.
         /// </summary>
         public static string AiPrompts {
             get {
@@ -106,7 +106,7 @@ public static string AiPrompts {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Customize AI Generation settings..
+        ///   Recherche une chaîne localisée semblable à Customize AI Generation settings..
         /// </summary>
         public static string AISettings {
             get {
@@ -115,7 +115,7 @@ public static string AISettings {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Analogous.
+        ///   Recherche une chaîne localisée semblable à Analogous.
         /// </summary>
         public static string Analogous {
             get {
@@ -124,7 +124,7 @@ public static string Analogous {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Apply.
+        ///   Recherche une chaîne localisée semblable à Apply.
         /// </summary>
         public static string Apply {
             get {
@@ -133,7 +133,7 @@ public static string Apply {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Updates are available..
+        ///   Recherche une chaîne localisée semblable à Updates are available..
         /// </summary>
         public static string AvailableUpdates {
             get {
@@ -142,7 +142,7 @@ public static string AvailableUpdates {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Background.
+        ///   Recherche une chaîne localisée semblable à Background.
         /// </summary>
         public static string Background {
             get {
@@ -151,7 +151,7 @@ public static string Background {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to B.
+        ///   Recherche une chaîne localisée semblable à B.
         /// </summary>
         public static string BlueP {
             get {
@@ -160,7 +160,7 @@ public static string BlueP {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Bookmarks.
+        ///   Recherche une chaîne localisée semblable à Bookmarks.
         /// </summary>
         public static string Bookmarks {
             get {
@@ -169,7 +169,7 @@ public static string Bookmarks {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Brightness.
+        ///   Recherche une chaîne localisée semblable à Brightness.
         /// </summary>
         public static string Brightness {
             get {
@@ -178,7 +178,7 @@ public static string Brightness {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Change the language of ColorPicker..
+        ///   Recherche une chaîne localisée semblable à Change the language of ColorPicker..
         /// </summary>
         public static string ChangeLanguage {
             get {
@@ -187,7 +187,7 @@ public static string ChangeLanguage {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Change ColorPicker theme..
+        ///   Recherche une chaîne localisée semblable à Change ColorPicker theme..
         /// </summary>
         public static string ChangeTheme {
             get {
@@ -196,7 +196,7 @@ public static string ChangeTheme {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Check for updates.
+        ///   Recherche une chaîne localisée semblable à Check for updates.
         /// </summary>
         public static string CheckUpdate {
             get {
@@ -205,7 +205,7 @@ public static string CheckUpdate {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Check for updates on start.
+        ///   Recherche une chaîne localisée semblable à Check for updates on start.
         /// </summary>
         public static string CheckUpdatesOnStart {
             get {
@@ -214,7 +214,7 @@ public static string CheckUpdatesOnStart {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Chromatic wheel.
+        ///   Recherche une chaîne localisée semblable à Chromatic wheel.
         /// </summary>
         public static string ChromaticWheel {
             get {
@@ -223,7 +223,7 @@ public static string ChromaticWheel {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Circle.
+        ///   Recherche une chaîne localisée semblable à Circle.
         /// </summary>
         public static string Circle {
             get {
@@ -232,7 +232,7 @@ public static string Circle {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to CMYK.
+        ///   Recherche une chaîne localisée semblable à CMYK.
         /// </summary>
         public static string CMYK {
             get {
@@ -241,7 +241,7 @@ public static string CMYK {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Color Options.
+        ///   Recherche une chaîne localisée semblable à Color Options.
         /// </summary>
         public static string ColorOptions {
             get {
@@ -250,7 +250,7 @@ public static string ColorOptions {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The way ColorPicker handle colors..
+        ///   Recherche une chaîne localisée semblable à The way ColorPicker handle colors..
         /// </summary>
         public static string ColorOptionsDesc {
             get {
@@ -259,7 +259,7 @@ public static string ColorOptionsDesc {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to ColorPicker.
+        ///   Recherche une chaîne localisée semblable à ColorPicker.
         /// </summary>
         public static string ColorPicker {
             get {
@@ -268,7 +268,7 @@ public static string ColorPicker {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to ColorPicker Max.
+        ///   Recherche une chaîne localisée semblable à ColorPicker Max.
         /// </summary>
         public static string ColorPickerMax {
             get {
@@ -277,7 +277,7 @@ public static string ColorPickerMax {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Colors.
+        ///   Recherche une chaîne localisée semblable à Colors.
         /// </summary>
         public static string Colors {
             get {
@@ -286,7 +286,7 @@ public static string Colors {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Color Tools.
+        ///   Recherche une chaîne localisée semblable à Color Tools.
         /// </summary>
         public static string ColorTools {
             get {
@@ -295,7 +295,7 @@ public static string ColorTools {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The color is valid..
+        ///   Recherche une chaîne localisée semblable à The color is valid..
         /// </summary>
         public static string ColorValid {
             get {
@@ -304,7 +304,7 @@ public static string ColorValid {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Complementary.
+        ///   Recherche une chaîne localisée semblable à Complementary.
         /// </summary>
         public static string Complementary {
             get {
@@ -313,7 +313,7 @@ public static string Complementary {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Contrast.
+        ///   Recherche une chaîne localisée semblable à Contrast.
         /// </summary>
         public static string Contrast {
             get {
@@ -322,7 +322,7 @@ public static string Contrast {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Convert.
+        ///   Recherche une chaîne localisée semblable à Convert.
         /// </summary>
         public static string Convert {
             get {
@@ -331,7 +331,7 @@ public static string Convert {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Converter.
+        ///   Recherche une chaîne localisée semblable à Converter.
         /// </summary>
         public static string Converter {
             get {
@@ -340,7 +340,7 @@ public static string Converter {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The converter feature of ColorPicker allows you to convert any color type to another one. The color types are RGB, HEX, HSV, HSL, CMYK, XYZ, YIQ and YUV. You can enter a color code in any of these formats and see the corresponding codes in the other formats..
+        ///   Recherche une chaîne localisée semblable à The converter feature of ColorPicker allows you to convert any color type to another one. The color types are RGB, HEX, HSV, HSL, CMYK, XYZ, YIQ and YUV. You can enter a color code in any of these formats and see the corresponding codes in the other formats..
         /// </summary>
         public static string ConverterInfo {
             get {
@@ -349,7 +349,7 @@ public static string ConverterInfo {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Convert from RGB.
+        ///   Recherche une chaîne localisée semblable à Convert from RGB.
         /// </summary>
         public static string ConvertFromRGB {
             get {
@@ -358,7 +358,7 @@ public static string ConvertFromRGB {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Copy CMYK.
+        ///   Recherche une chaîne localisée semblable à Copy CMYK.
         /// </summary>
         public static string CopyCMYK {
             get {
@@ -367,7 +367,7 @@ public static string CopyCMYK {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Copy color.
+        ///   Recherche une chaîne localisée semblable à Copy color.
         /// </summary>
         public static string CopyColor {
             get {
@@ -376,7 +376,7 @@ public static string CopyColor {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Copy Decimal.
+        ///   Recherche une chaîne localisée semblable à Copy Decimal.
         /// </summary>
         public static string CopyDEC {
             get {
@@ -385,7 +385,7 @@ public static string CopyDEC {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Copy HEX.
+        ///   Recherche une chaîne localisée semblable à Copy HEX.
         /// </summary>
         public static string CopyHEX {
             get {
@@ -394,7 +394,7 @@ public static string CopyHEX {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Copy HSL.
+        ///   Recherche une chaîne localisée semblable à Copy HSL.
         /// </summary>
         public static string CopyHSL {
             get {
@@ -403,7 +403,7 @@ public static string CopyHSL {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Copy HSV.
+        ///   Recherche une chaîne localisée semblable à Copy HSV.
         /// </summary>
         public static string CopyHSV {
             get {
@@ -412,7 +412,7 @@ public static string CopyHSV {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Copy RGB.
+        ///   Recherche une chaîne localisée semblable à Copy RGB.
         /// </summary>
         public static string CopyRGB {
             get {
@@ -421,7 +421,7 @@ public static string CopyRGB {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Copy XYZ.
+        ///   Recherche une chaîne localisée semblable à Copy XYZ.
         /// </summary>
         public static string CopyXYZ {
             get {
@@ -430,7 +430,7 @@ public static string CopyXYZ {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Copy YIQ.
+        ///   Recherche une chaîne localisée semblable à Copy YIQ.
         /// </summary>
         public static string CopyYIQ {
             get {
@@ -439,7 +439,7 @@ public static string CopyYIQ {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Copy YUV.
+        ///   Recherche une chaîne localisée semblable à Copy YUV.
         /// </summary>
         public static string CopyYUV {
             get {
@@ -448,7 +448,7 @@ public static string CopyYUV {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Creation.
+        ///   Recherche une chaîne localisée semblable à Creation.
         /// </summary>
         public static string Creation {
             get {
@@ -457,7 +457,7 @@ public static string Creation {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to CSS.
+        ///   Recherche une chaîne localisée semblable à CSS.
         /// </summary>
         public static string CSS {
             get {
@@ -466,7 +466,7 @@ public static string CSS {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Dark.
+        ///   Recherche une chaîne localisée semblable à Dark.
         /// </summary>
         public static string Dark {
             get {
@@ -475,7 +475,7 @@ public static string Dark {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Manage your data and your privacy..
+        ///   Recherche une chaîne localisée semblable à Manage your data and your privacy..
         /// </summary>
         public static string DataDescription {
             get {
@@ -484,7 +484,7 @@ public static string DataDescription {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Data and Privacy.
+        ///   Recherche une chaîne localisée semblable à Data and Privacy.
         /// </summary>
         public static string DataPrivacy {
             get {
@@ -493,7 +493,7 @@ public static string DataPrivacy {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DEC.
+        ///   Recherche une chaîne localisée semblable à DEC.
         /// </summary>
         public static string DEC {
             get {
@@ -502,7 +502,7 @@ public static string DEC {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Decimal.
+        ///   Recherche une chaîne localisée semblable à Decimal.
         /// </summary>
         public static string Decimal {
             get {
@@ -511,7 +511,7 @@ public static string Decimal {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Default.
+        ///   Recherche une chaîne localisée semblable à Default.
         /// </summary>
         public static string Default {
             get {
@@ -520,7 +520,7 @@ public static string Default {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Default color type.
+        ///   Recherche une chaîne localisée semblable à Default color type.
         /// </summary>
         public static string DefaultColorType {
             get {
@@ -529,7 +529,7 @@ public static string DefaultColorType {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Delete.
+        ///   Recherche une chaîne localisée semblable à Delete.
         /// </summary>
         public static string Delete {
             get {
@@ -538,7 +538,7 @@ public static string Delete {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Details.
+        ///   Recherche une chaîne localisée semblable à Details.
         /// </summary>
         public static string Details {
             get {
@@ -547,7 +547,7 @@ public static string Details {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Developer tools.
+        ///   Recherche une chaîne localisée semblable à Developer tools.
         /// </summary>
         public static string DevTools {
             get {
@@ -556,7 +556,7 @@ public static string DevTools {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Disc.
+        ///   Recherche une chaîne localisée semblable à Disc.
         /// </summary>
         public static string Disc {
             get {
@@ -565,7 +565,7 @@ public static string Disc {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Discover.
+        ///   Recherche une chaîne localisée semblable à Discover.
         /// </summary>
         public static string Discover {
             get {
@@ -574,7 +574,7 @@ public static string Discover {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Edit in Selector.
+        ///   Recherche une chaîne localisée semblable à Edit in Selector.
         /// </summary>
         public static string EditInSelector {
             get {
@@ -583,7 +583,7 @@ public static string EditInSelector {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Edit shortcut.
+        ///   Recherche une chaîne localisée semblable à Edit shortcut.
         /// </summary>
         public static string EditShortcut {
             get {
@@ -592,7 +592,16 @@ public static string EditShortcut {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Empty bookmarks.
+        ///   Recherche une chaîne localisée semblable à Enter a prompt to generate colors using the power of AI.
+        /// </summary>
+        public static string EmptyAiPlaceholder {
+            get {
+                return ResourceManager.GetString("EmptyAiPlaceholder", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Empty bookmarks.
         /// </summary>
         public static string EmptyBookmarks {
             get {
@@ -601,7 +610,7 @@ public static string EmptyBookmarks {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Are you sure want to empty these bookmarks? This action is irreversible..
+        ///   Recherche une chaîne localisée semblable à Are you sure want to empty these bookmarks? This action is irreversible..
         /// </summary>
         public static string EmptyHistoryMsg {
             get {
@@ -610,7 +619,7 @@ public static string EmptyHistoryMsg {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Export settings.
+        ///   Recherche une chaîne localisée semblable à Export settings.
         /// </summary>
         public static string Export {
             get {
@@ -619,7 +628,7 @@ public static string Export {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Features.
+        ///   Recherche une chaîne localisée semblable à Features.
         /// </summary>
         public static string Features {
             get {
@@ -628,7 +637,7 @@ public static string Features {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Do you want to ignore this window and continue to ColorPicker?.
+        ///   Recherche une chaîne localisée semblable à Do you want to ignore this window and continue to ColorPicker?.
         /// </summary>
         public static string FirstRunQuitMsg {
             get {
@@ -637,7 +646,7 @@ public static string FirstRunQuitMsg {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Font.
+        ///   Recherche une chaîne localisée semblable à Font.
         /// </summary>
         public static string Font {
             get {
@@ -646,7 +655,7 @@ public static string Font {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Foreground.
+        ///   Recherche une chaîne localisée semblable à Foreground.
         /// </summary>
         public static string Foreground {
             get {
@@ -655,7 +664,7 @@ public static string Foreground {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to From.
+        ///   Recherche une chaîne localisée semblable à From.
         /// </summary>
         public static string From {
             get {
@@ -664,7 +673,7 @@ public static string From {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Generate.
+        ///   Recherche une chaîne localisée semblable à Generate.
         /// </summary>
         public static string Generate {
             get {
@@ -673,7 +682,7 @@ public static string Generate {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Generate a random color.
+        ///   Recherche une chaîne localisée semblable à Generate a random color.
         /// </summary>
         public static string GenerateColor {
             get {
@@ -682,7 +691,7 @@ public static string GenerateColor {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Generate a gradient.
+        ///   Recherche une chaîne localisée semblable à Generate a gradient.
         /// </summary>
         public static string GenerateGradient {
             get {
@@ -691,7 +700,7 @@ public static string GenerateGradient {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Generate a palette.
+        ///   Recherche une chaîne localisée semblable à Generate a palette.
         /// </summary>
         public static string GeneratePalette {
             get {
@@ -700,7 +709,7 @@ public static string GeneratePalette {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Generate new colors.
+        ///   Recherche une chaîne localisée semblable à Generate new colors.
         /// </summary>
         public static string GenerateTextColors {
             get {
@@ -709,7 +718,7 @@ public static string GenerateTextColors {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Get contrast ratio.
+        ///   Recherche une chaîne localisée semblable à Get contrast ratio.
         /// </summary>
         public static string GetContrast {
             get {
@@ -718,7 +727,7 @@ public static string GetContrast {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Get harmonies.
+        ///   Recherche une chaîne localisée semblable à Get harmonies.
         /// </summary>
         public static string GetHarmonies {
             get {
@@ -727,7 +736,7 @@ public static string GetHarmonies {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Get ideas.
+        ///   Recherche une chaîne localisée semblable à Get ideas.
         /// </summary>
         public static string GetIdeas {
             get {
@@ -736,7 +745,7 @@ public static string GetIdeas {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Get started.
+        ///   Recherche une chaîne localisée semblable à Get started.
         /// </summary>
         public static string GetStarted {
             get {
@@ -745,7 +754,7 @@ public static string GetStarted {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Good afternoon.
+        ///   Recherche une chaîne localisée semblable à Good afternoon.
         /// </summary>
         public static string GoodAfternoon {
             get {
@@ -754,7 +763,7 @@ public static string GoodAfternoon {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Good evening.
+        ///   Recherche une chaîne localisée semblable à Good evening.
         /// </summary>
         public static string GoodEvening {
             get {
@@ -763,7 +772,7 @@ public static string GoodEvening {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Good night.
+        ///   Recherche une chaîne localisée semblable à Good night.
         /// </summary>
         public static string GoodNight {
             get {
@@ -772,7 +781,7 @@ public static string GoodNight {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Gradient.
+        ///   Recherche une chaîne localisée semblable à Gradient.
         /// </summary>
         public static string Gradient {
             get {
@@ -781,7 +790,7 @@ public static string Gradient {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The gradient feature of ColorPicker lets you generate random two-stops gradients with a specific rotation angle. You can see a preview of the gradient and its CSS code. You can also export the gradient to CSS code and use it in your web design projects..
+        ///   Recherche une chaîne localisée semblable à The gradient feature of ColorPicker lets you generate random two-stops gradients with a specific rotation angle. You can see a preview of the gradient and its CSS code. You can also export the gradient to CSS code and use it in your web design projects..
         /// </summary>
         public static string GradientInfo {
             get {
@@ -790,7 +799,7 @@ public static string GradientInfo {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Gradients.
+        ///   Recherche une chaîne localisée semblable à Gradients.
         /// </summary>
         public static string Gradients {
             get {
@@ -799,7 +808,7 @@ public static string Gradients {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to G.
+        ///   Recherche une chaîne localisée semblable à G.
         /// </summary>
         public static string GreenP {
             get {
@@ -808,7 +817,7 @@ public static string GreenP {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Harmonies.
+        ///   Recherche une chaîne localisée semblable à Harmonies.
         /// </summary>
         public static string Harmonies {
             get {
@@ -817,7 +826,7 @@ public static string Harmonies {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to HEX.
+        ///   Recherche une chaîne localisée semblable à HEX.
         /// </summary>
         public static string HEX {
             get {
@@ -826,7 +835,7 @@ public static string HEX {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Hi.
+        ///   Recherche une chaîne localisée semblable à Hi.
         /// </summary>
         public static string Hi {
             get {
@@ -835,7 +844,7 @@ public static string Hi {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to History.
+        ///   Recherche une chaîne localisée semblable à History.
         /// </summary>
         public static string History {
             get {
@@ -844,7 +853,7 @@ public static string History {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Home.
+        ///   Recherche une chaîne localisée semblable à Home.
         /// </summary>
         public static string Home {
             get {
@@ -853,7 +862,7 @@ public static string Home {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to HSL.
+        ///   Recherche une chaîne localisée semblable à HSL.
         /// </summary>
         public static string HSL {
             get {
@@ -862,7 +871,7 @@ public static string HSL {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to HSV.
+        ///   Recherche une chaîne localisée semblable à HSV.
         /// </summary>
         public static string HSV {
             get {
@@ -871,7 +880,7 @@ public static string HSV {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Hues.
+        ///   Recherche une chaîne localisée semblable à Hues.
         /// </summary>
         public static string Hues {
             get {
@@ -880,7 +889,7 @@ public static string Hues {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Import settings.
+        ///   Recherche une chaîne localisée semblable à Import settings.
         /// </summary>
         public static string Import {
             get {
@@ -889,7 +898,7 @@ public static string Import {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Install.
+        ///   Recherche une chaîne localisée semblable à Install.
         /// </summary>
         public static string Install {
             get {
@@ -898,7 +907,7 @@ public static string Install {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to To install updates, ColorPicker needs to restarts. Do you want to continue?.
+        ///   Recherche une chaîne localisée semblable à To install updates, ColorPicker needs to restarts. Do you want to continue?.
         /// </summary>
         public static string InstallConfirmMsg {
             get {
@@ -907,7 +916,7 @@ public static string InstallConfirmMsg {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Install version.
+        ///   Recherche une chaîne localisée semblable à Install version.
         /// </summary>
         public static string InstallVersion {
             get {
@@ -916,7 +925,7 @@ public static string InstallVersion {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Introducing Synethia.
+        ///   Recherche une chaîne localisée semblable à Introducing Synethia.
         /// </summary>
         public static string IntroducingSynethia {
             get {
@@ -925,7 +934,7 @@ public static string IntroducingSynethia {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The color is invalid..
+        ///   Recherche une chaîne localisée semblable à The color is invalid..
         /// </summary>
         public static string InvalidColor {
             get {
@@ -934,7 +943,7 @@ public static string InvalidColor {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Press {0} to start or stop selecting a color from your screen..
+        ///   Recherche une chaîne localisée semblable à Press {0} to start or stop selecting a color from your screen..
         /// </summary>
         public static string KeyboardSelectionHint {
             get {
@@ -943,7 +952,7 @@ public static string KeyboardSelectionHint {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Keyboard shortcuts.
+        ///   Recherche une chaîne localisée semblable à Keyboard shortcuts.
         /// </summary>
         public static string KeyboardShortcuts {
             get {
@@ -952,7 +961,7 @@ public static string KeyboardShortcuts {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Language.
+        ///   Recherche une chaîne localisée semblable à Language.
         /// </summary>
         public static string Language {
             get {
@@ -961,7 +970,7 @@ public static string Language {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Let&apos;s go!.
+        ///   Recherche une chaîne localisée semblable à Let&apos;s go!.
         /// </summary>
         public static string LetsGo {
             get {
@@ -970,7 +979,7 @@ public static string LetsGo {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Licenses.
+        ///   Recherche une chaîne localisée semblable à Licenses.
         /// </summary>
         public static string Licenses {
             get {
@@ -979,7 +988,7 @@ public static string Licenses {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Light.
+        ///   Recherche une chaîne localisée semblable à Light.
         /// </summary>
         public static string Light {
             get {
@@ -988,7 +997,7 @@ public static string Light {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Max.
+        ///   Recherche une chaîne localisée semblable à Max.
         /// </summary>
         public static string Max {
             get {
@@ -997,7 +1006,7 @@ public static string Max {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Model.
+        ///   Recherche une chaîne localisée semblable à Model.
         /// </summary>
         public static string Model {
             get {
@@ -1006,7 +1015,7 @@ public static string Model {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Monochromatic.
+        ///   Recherche une chaîne localisée semblable à Monochromatic.
         /// </summary>
         public static string Monochromatic {
             get {
@@ -1015,7 +1024,7 @@ public static string Monochromatic {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to ColorPicker needs to restart to apply the changes..
+        ///   Recherche une chaîne localisée semblable à ColorPicker needs to restart to apply the changes..
         /// </summary>
         public static string NeedRestartLabel {
             get {
@@ -1024,7 +1033,7 @@ public static string NeedRestartLabel {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to ColorPicker needs to restart to apply the changes. Do you want to restart now?.
+        ///   Recherche une chaîne localisée semblable à ColorPicker needs to restart to apply the changes. Do you want to restart now?.
         /// </summary>
         public static string NeedRestartToApplyChanges {
             get {
@@ -1033,7 +1042,7 @@ public static string NeedRestartToApplyChanges {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Next.
+        ///   Recherche une chaîne localisée semblable à Next.
         /// </summary>
         public static string Next {
             get {
@@ -1042,7 +1051,7 @@ public static string Next {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to To use AI featues, you need an OpenAI API key..
+        ///   Recherche une chaîne localisée semblable à To use AI featues, you need an OpenAI API key..
         /// </summary>
         public static string NoApiKeyMsg {
             get {
@@ -1051,7 +1060,7 @@ public static string NoApiKeyMsg {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to No thanks.
+        ///   Recherche une chaîne localisée semblable à No thanks.
         /// </summary>
         public static string NoThanks {
             get {
@@ -1060,7 +1069,7 @@ public static string NoThanks {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Notifications.
+        ///   Recherche une chaîne localisée semblable à Notifications.
         /// </summary>
         public static string Notifications {
             get {
@@ -1069,7 +1078,7 @@ public static string Notifications {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Notifications settings..
+        ///   Recherche une chaîne localisée semblable à Notifications settings..
         /// </summary>
         public static string NotificationsDescription {
             get {
@@ -1078,7 +1087,7 @@ public static string NotificationsDescription {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Show a notification when updates are available.
+        ///   Recherche une chaîne localisée semblable à Show a notification when updates are available.
         /// </summary>
         public static string NotifyUpdates {
             get {
@@ -1087,7 +1096,7 @@ public static string NotifyUpdates {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to On start.
+        ///   Recherche une chaîne localisée semblable à On start.
         /// </summary>
         public static string OnStart {
             get {
@@ -1096,7 +1105,7 @@ public static string OnStart {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Settings that applies on start..
+        ///   Recherche une chaîne localisée semblable à Settings that applies on start..
         /// </summary>
         public static string OnStartDescription {
             get {
@@ -1105,7 +1114,7 @@ public static string OnStartDescription {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to OpenAI API Key.
+        ///   Recherche une chaîne localisée semblable à OpenAI API Key.
         /// </summary>
         public static string OpenAIKey {
             get {
@@ -1114,7 +1123,7 @@ public static string OpenAIKey {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Palette.
+        ///   Recherche une chaîne localisée semblable à Palette.
         /// </summary>
         public static string Palette {
             get {
@@ -1123,7 +1132,7 @@ public static string Palette {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Palettes.
+        ///   Recherche une chaîne localisée semblable à Palettes.
         /// </summary>
         public static string Palettes {
             get {
@@ -1132,7 +1141,7 @@ public static string Palettes {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Picker.
+        ///   Recherche une chaîne localisée semblable à Picker.
         /// </summary>
         public static string Picker {
             get {
@@ -1141,7 +1150,7 @@ public static string Picker {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Pinned.
+        ///   Recherche une chaîne localisée semblable à Pinned.
         /// </summary>
         public static string Pinned {
             get {
@@ -1150,7 +1159,7 @@ public static string Pinned {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Automatic updates are not available in portable mode, please download ColorPicker Max again..
+        ///   Recherche une chaîne localisée semblable à Automatic updates are not available in portable mode, please download ColorPicker Max again..
         /// </summary>
         public static string PortableNoAutoUpdates {
             get {
@@ -1159,7 +1168,7 @@ public static string PortableNoAutoUpdates {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Press a combination of keys..
+        ///   Recherche une chaîne localisée semblable à Press a combination of keys..
         /// </summary>
         public static string PressKeys {
             get {
@@ -1168,7 +1177,7 @@ public static string PressKeys {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Please define an API Key in settings..
+        ///   Recherche une chaîne localisée semblable à Please define an API Key in settings..
         /// </summary>
         public static string ProvideAPIKey {
             get {
@@ -1177,7 +1186,7 @@ public static string ProvideAPIKey {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Please provide a prompt to AI..
+        ///   Recherche une chaîne localisée semblable à Please provide a prompt to AI..
         /// </summary>
         public static string ProvideAPromptMsg {
             get {
@@ -1186,7 +1195,7 @@ public static string ProvideAPromptMsg {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to R.
+        ///   Recherche une chaîne localisée semblable à R.
         /// </summary>
         public static string RedP {
             get {
@@ -1195,7 +1204,7 @@ public static string RedP {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Remove from bookmarks.
+        ///   Recherche une chaîne localisée semblable à Remove from bookmarks.
         /// </summary>
         public static string RemoveBookmark {
             get {
@@ -1204,7 +1213,7 @@ public static string RemoveBookmark {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Reset keyboard shortcuts.
+        ///   Recherche une chaîne localisée semblable à Reset keyboard shortcuts.
         /// </summary>
         public static string ResetKeyboardShortcuts {
             get {
@@ -1213,7 +1222,7 @@ public static string ResetKeyboardShortcuts {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Reset settings.
+        ///   Recherche une chaîne localisée semblable à Reset settings.
         /// </summary>
         public static string ResetSettings {
             get {
@@ -1222,7 +1231,7 @@ public static string ResetSettings {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Are you sure you want to reset all settings?.
+        ///   Recherche une chaîne localisée semblable à Are you sure you want to reset all settings?.
         /// </summary>
         public static string ResetSettingsConfirmation {
             get {
@@ -1231,7 +1240,7 @@ public static string ResetSettingsConfirmation {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Reset Synethia data.
+        ///   Recherche une chaîne localisée semblable à Reset Synethia data.
         /// </summary>
         public static string ResetSynethia {
             get {
@@ -1240,7 +1249,7 @@ public static string ResetSynethia {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to RGB.
+        ///   Recherche une chaîne localisée semblable à RGB.
         /// </summary>
         public static string RGB {
             get {
@@ -1249,7 +1258,7 @@ public static string RGB {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Rotation.
+        ///   Recherche une chaîne localisée semblable à Rotation.
         /// </summary>
         public static string Rotation {
             get {
@@ -1258,7 +1267,7 @@ public static string Rotation {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to See licenses.
+        ///   Recherche une chaîne localisée semblable à See licenses.
         /// </summary>
         public static string SeeLicenses {
             get {
@@ -1267,7 +1276,7 @@ public static string SeeLicenses {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Select from the chromatic disc.
+        ///   Recherche une chaîne localisée semblable à Select from the chromatic disc.
         /// </summary>
         public static string SelectChomaticDisc {
             get {
@@ -1276,7 +1285,7 @@ public static string SelectChomaticDisc {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Select a color.
+        ///   Recherche une chaîne localisée semblable à Select a color.
         /// </summary>
         public static string SelectColor {
             get {
@@ -1285,7 +1294,7 @@ public static string SelectColor {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Selector.
+        ///   Recherche une chaîne localisée semblable à Selector.
         /// </summary>
         public static string Selector {
             get {
@@ -1294,7 +1303,7 @@ public static string Selector {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The selector feature of ColorPicker enables you to choose any color from the screen by moving the cursor over it and pressing a keyboard shortcut. The chosen color will be shown in a preview box and its code will be copied to the clipboard in a desired color type..
+        ///   Recherche une chaîne localisée semblable à The selector feature of ColorPicker enables you to choose any color from the screen by moving the cursor over it and pressing a keyboard shortcut. The chosen color will be shown in a preview box and its code will be copied to the clipboard in a desired color type..
         /// </summary>
         public static string SelectorInfo {
             get {
@@ -1303,7 +1312,7 @@ public static string SelectorInfo {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Settings.
+        ///   Recherche une chaîne localisée semblable à Settings.
         /// </summary>
         public static string Settings {
             get {
@@ -1312,7 +1321,7 @@ public static string Settings {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Settings have been sucessfully exported..
+        ///   Recherche une chaîne localisée semblable à Settings have been sucessfully exported..
         /// </summary>
         public static string SettingsExportedSucessMsg {
             get {
@@ -1321,7 +1330,7 @@ public static string SettingsExportedSucessMsg {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Settings were sucessfully imported. To finish the process, ColorPicker is going to restart..
+        ///   Recherche une chaîne localisée semblable à Settings were sucessfully imported. To finish the process, ColorPicker is going to restart..
         /// </summary>
         public static string SettingsImportedMsg {
             get {
@@ -1330,7 +1339,7 @@ public static string SettingsImportedMsg {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Shades.
+        ///   Recherche une chaîne localisée semblable à Shades.
         /// </summary>
         public static string Shades {
             get {
@@ -1339,7 +1348,7 @@ public static string Shades {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Single color.
+        ///   Recherche une chaîne localisée semblable à Single color.
         /// </summary>
         public static string SingleColor {
             get {
@@ -1348,7 +1357,7 @@ public static string SingleColor {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Size.
+        ///   Recherche une chaîne localisée semblable à Size.
         /// </summary>
         public static string Size {
             get {
@@ -1357,7 +1366,7 @@ public static string Size {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Skip.
+        ///   Recherche une chaîne localisée semblable à Skip.
         /// </summary>
         public static string Skip {
             get {
@@ -1366,7 +1375,7 @@ public static string Skip {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Split Complementary.
+        ///   Recherche une chaîne localisée semblable à Split Complementary.
         /// </summary>
         public static string SplitComplementary {
             get {
@@ -1375,7 +1384,7 @@ public static string SplitComplementary {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Start selection.
+        ///   Recherche une chaîne localisée semblable à Start selection.
         /// </summary>
         public static string StartSelection {
             get {
@@ -1384,7 +1393,7 @@ public static string StartSelection {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Default page on start.
+        ///   Recherche une chaîne localisée semblable à Default page on start.
         /// </summary>
         public static string StartupPage {
             get {
@@ -1393,7 +1402,7 @@ public static string StartupPage {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Suggested actions.
+        ///   Recherche une chaîne localisée semblable à Suggested actions.
         /// </summary>
         public static string SuggestedActions {
             get {
@@ -1402,7 +1411,7 @@ public static string SuggestedActions {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Synethia will then analyze this data to provide a unique experience.
+        ///   Recherche une chaîne localisée semblable à Synethia will then analyze this data to provide a unique experience.
         /// </summary>
         public static string SynethiaAnalyze {
             get {
@@ -1411,7 +1420,7 @@ public static string SynethiaAnalyze {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Synethia collects data in ColorPicker only.
+        ///   Recherche une chaîne localisée semblable à Synethia collects data in ColorPicker only.
         /// </summary>
         public static string SynethiaDataInfo {
             get {
@@ -1420,7 +1429,7 @@ public static string SynethiaDataInfo {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Are you sure you want to reset all Synethia data? Your personalized experience will be lost; This action cannot be canceled..
+        ///   Recherche une chaîne localisée semblable à Are you sure you want to reset all Synethia data? Your personalized experience will be lost; This action cannot be canceled..
         /// </summary>
         public static string SynethiaDeleteMsg {
             get {
@@ -1429,7 +1438,7 @@ public static string SynethiaDeleteMsg {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Enable Synethia customized experience..
+        ///   Recherche une chaîne localisée semblable à Enable Synethia customized experience..
         /// </summary>
         public static string SynethiaEnable {
             get {
@@ -1438,7 +1447,7 @@ public static string SynethiaEnable {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The Home dashbord will recommand actions based on your usage.
+        ///   Recherche une chaîne localisée semblable à The Home dashbord will recommand actions based on your usage.
         /// </summary>
         public static string SynethiaHome {
             get {
@@ -1447,7 +1456,7 @@ public static string SynethiaHome {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Synethia is an algorithm that personnalizes your experience..
+        ///   Recherche une chaîne localisée semblable à Synethia is an algorithm that personnalizes your experience..
         /// </summary>
         public static string SynethiaInfo {
             get {
@@ -1456,7 +1465,7 @@ public static string SynethiaInfo {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Your data is stored on your device, anonymously. Absolutely NO data is sent to Léo Corporation..
+        ///   Recherche une chaîne localisée semblable à Your data is stored on your device, anonymously. Absolutely NO data is sent to Léo Corporation..
         /// </summary>
         public static string SynethiaPrivacy {
             get {
@@ -1465,7 +1474,7 @@ public static string SynethiaPrivacy {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Text.
+        ///   Recherche une chaîne localisée semblable à Text.
         /// </summary>
         public static string TextTool {
             get {
@@ -1474,7 +1483,7 @@ public static string TextTool {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Text tool settings..
+        ///   Recherche une chaîne localisée semblable à Text tool settings..
         /// </summary>
         public static string TextToolDesc {
             get {
@@ -1483,7 +1492,7 @@ public static string TextToolDesc {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Theme.
+        ///   Recherche une chaîne localisée semblable à Theme.
         /// </summary>
         public static string Theme {
             get {
@@ -1492,7 +1501,7 @@ public static string Theme {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to To.
+        ///   Recherche une chaîne localisée semblable à To.
         /// </summary>
         public static string To {
             get {
@@ -1501,7 +1510,7 @@ public static string To {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Tools.
+        ///   Recherche une chaîne localisée semblable à Tools.
         /// </summary>
         public static string Tools {
             get {
@@ -1510,7 +1519,7 @@ public static string Tools {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Triadic.
+        ///   Recherche une chaîne localisée semblable à Triadic.
         /// </summary>
         public static string Triadic {
             get {
@@ -1519,7 +1528,7 @@ public static string Triadic {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Updates.
+        ///   Recherche une chaîne localisée semblable à Updates.
         /// </summary>
         public static string Updates {
             get {
@@ -1528,7 +1537,7 @@ public static string Updates {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to ColorPicker is up to date..
+        ///   Recherche une chaîne localisée semblable à ColorPicker is up to date..
         /// </summary>
         public static string UpToDate {
             get {
@@ -1537,7 +1546,7 @@ public static string UpToDate {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Use keyboard shortcuts.
+        ///   Recherche une chaîne localisée semblable à Use keyboard shortcuts.
         /// </summary>
         public static string UseKeyboardShortcuts {
             get {
@@ -1546,7 +1555,7 @@ public static string UseKeyboardShortcuts {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Version.
+        ///   Recherche une chaîne localisée semblable à Version.
         /// </summary>
         public static string Version {
             get {
@@ -1555,7 +1564,7 @@ public static string Version {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Welcome to ColorPicker, the ultimate tool for picking, converting and generating colors..
+        ///   Recherche une chaîne localisée semblable à Welcome to ColorPicker, the ultimate tool for picking, converting and generating colors..
         /// </summary>
         public static string WelcomeDesc {
             get {
@@ -1564,7 +1573,7 @@ public static string WelcomeDesc {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Everyting is ready.
+        ///   Recherche une chaîne localisée semblable à Everyting is ready.
         /// </summary>
         public static string WelcomeReady {
             get {
@@ -1573,7 +1582,7 @@ public static string WelcomeReady {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to XAML.
+        ///   Recherche une chaîne localisée semblable à XAML.
         /// </summary>
         public static string XAML {
             get {
@@ -1582,7 +1591,7 @@ public static string XAML {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to XYZ.
+        ///   Recherche une chaîne localisée semblable à XYZ.
         /// </summary>
         public static string XYZ {
             get {
@@ -1591,7 +1600,7 @@ public static string XYZ {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to YIQ.
+        ///   Recherche une chaîne localisée semblable à YIQ.
         /// </summary>
         public static string YIQ {
             get {
@@ -1600,7 +1609,7 @@ public static string YIQ {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to YUV.
+        ///   Recherche une chaîne localisée semblable à YUV.
         /// </summary>
         public static string YUV {
             get {
diff --git a/ColorPicker/Properties/Resources.en-US.resx b/ColorPicker/Properties/Resources.en-US.resx
index bf5ea3f1..812574d0 100644
--- a/ColorPicker/Properties/Resources.en-US.resx
+++ b/ColorPicker/Properties/Resources.en-US.resx
@@ -633,4 +633,7 @@
   <data name="PortableNoAutoUpdates" xml:space="preserve">
     <value>Automatic updates are not available in portable mode, please download ColorPicker Max again.</value>
   </data>
+  <data name="EmptyAiPlaceholder" xml:space="preserve">
+    <value>Enter a prompt to generate colors using the power of AI</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ColorPicker/Properties/Resources.fr-FR.resx b/ColorPicker/Properties/Resources.fr-FR.resx
index 7b078b3e..ff4daa75 100644
--- a/ColorPicker/Properties/Resources.fr-FR.resx
+++ b/ColorPicker/Properties/Resources.fr-FR.resx
@@ -637,4 +637,7 @@
   <data name="PortableNoAutoUpdates" xml:space="preserve">
     <value>Les mises à jour automatiques ne sont pas disponibles en mode portable, veuillez télécharger ColorPicker Max à nouveau.</value>
   </data>
+  <data name="EmptyAiPlaceholder" xml:space="preserve">
+    <value>Saisissez une instruction pour générer des couleurs en utilisant la puissance de l'IA</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ColorPicker/Properties/Resources.resx b/ColorPicker/Properties/Resources.resx
index 66b3193f..88e7a00e 100644
--- a/ColorPicker/Properties/Resources.resx
+++ b/ColorPicker/Properties/Resources.resx
@@ -613,4 +613,7 @@
   <data name="PortableNoAutoUpdates" xml:space="preserve">
     <value>Automatic updates are not available in portable mode, please download ColorPicker Max again.</value>
   </data>
+  <data name="EmptyAiPlaceholder" xml:space="preserve">
+    <value>Enter a prompt to generate colors using the power of AI</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ColorPicker/Properties/Resources.zh-CN.resx b/ColorPicker/Properties/Resources.zh-CN.resx
index 8936dd39..624082fc 100644
--- a/ColorPicker/Properties/Resources.zh-CN.resx
+++ b/ColorPicker/Properties/Resources.zh-CN.resx
@@ -641,4 +641,7 @@
   <data name="PortableNoAutoUpdates" xml:space="preserve">
     <value>便携模式下无法进行自动更新，请重新下载 ColorPicker Max</value>
   </data>
+  <data name="EmptyAiPlaceholder" xml:space="preserve">
+    <value>输入提示，利用人工智能的力量生成颜色</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ColorPicker/Themes/Dark.xaml b/ColorPicker/Themes/Dark.xaml
index ed173e35..73d97b6b 100644
--- a/ColorPicker/Themes/Dark.xaml
+++ b/ColorPicker/Themes/Dark.xaml
@@ -3,24 +3,48 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
-    <sys:String x:Key="Background1">#0A0A1E</sys:String>
-    <sys:String x:Key="Background2">#141428</sys:String>
-    <sys:String x:Key="Background3">#222277</sys:String>
-    <sys:String x:Key="CardBackground">#141446</sys:String>
-    <sys:String x:Key="Foreground1">#FFFFFF</sys:String>
-    <sys:String x:Key="BackgroundImg">/Images/DarkBackground.png</sys:String>
-    <sys:String x:Key="WindowButtonsHover1">#141428</sys:String>
-    <sys:String x:Key="WindowButtonsPressed1">#1E1E32</sys:String>
-    <sys:String x:Key="WindowButtonsHoverForeground1">#ffffff</sys:String>
-    <sys:String x:Key="AccentColor">#3FA5FF</sys:String>
-    <sys:String x:Key="DarkFAccentColor">#003666</sys:String>
-    <sys:String x:Key="LightAccentColor">#003C70</sys:String>
-    <sys:String x:Key="Gray">#5A5A6E</sys:String>
-    <sys:String x:Key="Green">#25DE0F</sys:String>
-    <sys:String x:Key="Red">#FF321E</sys:String>
-    <sys:String x:Key="Orange">#ff7a00</sys:String>
-    <sys:String x:Key="DarkGray">#7474B1</sys:String>
-    <sys:String x:Key="SliderRed">#FF4500</sys:String>
-    <sys:String x:Key="SliderGreen">#00DF39</sys:String>
-    <sys:String x:Key="SliderBlue">#4169E1</sys:String>
+    <SolidColorBrush x:Key="Background1" Color="#0A0A1E" />
+    <SolidColorBrush x:Key="Background2" Color="#141428" />
+    <SolidColorBrush x:Key="Background3" Color="#222277" />
+    <SolidColorBrush x:Key="CardBackground" Color="#141446" />
+    <SolidColorBrush x:Key="Foreground1" Color="#FFFFFF" />
+    <ImageBrush x:Key="BackgroundImg" ImageSource="/Images/DarkBackground.png" />
+    <SolidColorBrush x:Key="WindowButtonsHover1" Color="#141428" />
+    <SolidColorBrush x:Key="WindowButtonsPressed1" Color="#1E1E32" />
+    <SolidColorBrush x:Key="WindowButtonsHoverForeground1" Color="#ffffff" />
+    <SolidColorBrush x:Key="AccentColor" Color="#3FA5FF" />
+    <SolidColorBrush x:Key="DarkFAccentColor" Color="#003666" />
+    <SolidColorBrush x:Key="LightAccentColor" Color="#003C70" />
+    <SolidColorBrush x:Key="Gray" Color="#5A5A6E" />
+    <SolidColorBrush x:Key="Green" Color="#25DE0F" />
+    <SolidColorBrush x:Key="Red" Color="#FF321E" />
+    <SolidColorBrush x:Key="Orange" Color="#ff7a00" />
+    <SolidColorBrush x:Key="DarkGray" Color="#7474B1" />
+    <SolidColorBrush x:Key="SliderRed" Color="#FF4500" />
+    <SolidColorBrush x:Key="SliderGreen" Color="#00DF39" />
+    <SolidColorBrush x:Key="SliderBlue" Color="#4169E1" />
+    <Color
+        x:Key="Accent"
+        A="255"
+        B="255"
+        G="165"
+        R="63" />
+    <Color
+        x:Key="LightAccent"
+        A="255"
+        B="112"
+        G="60"
+        R="0" />
+    <Color
+        x:Key="Foreground"
+        A="255"
+        B="0"
+        G="0"
+        R="0" />
+    <Color
+        x:Key="DarkGrayColor"
+        A="255"
+        B="177"
+        G="116"
+        R="116" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ColorPicker/Themes/Light.xaml b/ColorPicker/Themes/Light.xaml
index b77d636c..0e6cdd85 100644
--- a/ColorPicker/Themes/Light.xaml
+++ b/ColorPicker/Themes/Light.xaml
@@ -2,24 +2,48 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:sys="clr-namespace:System;assembly=mscorlib">
-    <sys:String x:Key="Background1">#ffffff</sys:String>
-    <sys:String x:Key="Background2">#e6e6e6</sys:String>
-    <sys:String x:Key="Background3">#e6e6e6</sys:String>
-    <sys:String x:Key="CardBackground">#ffffff</sys:String>
-    <sys:String x:Key="Foreground1">#000000</sys:String>
-    <sys:String x:Key="BackgroundImg">/Images/LightBackground.png</sys:String>
-    <sys:String x:Key="WindowButtonsHover1">#E5E5E5</sys:String>
-    <sys:String x:Key="WindowButtonsPressed1">#DBDBDB</sys:String>
-    <sys:String x:Key="WindowButtonsHoverForeground1">#ffffff</sys:String>
-    <sys:String x:Key="AccentColor">#3FA5FF</sys:String>
-    <sys:String x:Key="DarkFAccentColor">#2153E0</sys:String>
-    <sys:String x:Key="LightAccentColor">#C8E6FF</sys:String>
-    <sys:String x:Key="Gray">#DEDEDE</sys:String>
-    <sys:String x:Key="Green">#25DE0F</sys:String>
-    <sys:String x:Key="Red">#FF321E</sys:String>
-    <sys:String x:Key="Orange">#ff7a00</sys:String>
-    <sys:String x:Key="DarkGray">#969696</sys:String>
-    <sys:String x:Key="SliderRed">#FF4500</sys:String>
-    <sys:String x:Key="SliderGreen">#00DF39</sys:String>
-    <sys:String x:Key="SliderBlue">#4169E1</sys:String>
+    <SolidColorBrush x:Key="Background1" Color="#ffffff" />
+    <SolidColorBrush x:Key="Background2" Color="#e6e6e6" />
+    <SolidColorBrush x:Key="Background3" Color="#e6e6e6" />
+    <SolidColorBrush x:Key="CardBackground" Color="#ffffff" />
+    <SolidColorBrush x:Key="Foreground1" Color="#000000" />
+    <ImageBrush x:Key="BackgroundImg" ImageSource="/Images/LightBackground.png" />
+    <SolidColorBrush x:Key="WindowButtonsHover1" Color="#E5E5E5" />
+    <SolidColorBrush x:Key="WindowButtonsPressed1" Color="#DBDBDB" />
+    <SolidColorBrush x:Key="WindowButtonsHoverForeground1" Color="#ffffff" />
+    <SolidColorBrush x:Key="AccentColor" Color="#3FA5FF" />
+    <SolidColorBrush x:Key="DarkFAccentColor" Color="#2153E0" />
+    <SolidColorBrush x:Key="LightAccentColor" Color="#C8E6FF" />
+    <SolidColorBrush x:Key="Gray" Color="#DEDEDE" />
+    <SolidColorBrush x:Key="Green" Color="#25DE0F" />
+    <SolidColorBrush x:Key="Red" Color="#FF321E" />
+    <SolidColorBrush x:Key="Orange" Color="#ff7a00" />
+    <SolidColorBrush x:Key="DarkGray" Color="#969696" />
+    <SolidColorBrush x:Key="SliderRed" Color="#FF4500" />
+    <SolidColorBrush x:Key="SliderGreen" Color="#00DF39" />
+    <SolidColorBrush x:Key="SliderBlue" Color="#4169E1" />
+    <Color
+        x:Key="Accent"
+        A="255"
+        B="255"
+        G="165"
+        R="63" />
+    <Color
+        x:Key="LightAccent"
+        A="255"
+        B="255"
+        G="230"
+        R="200" />
+    <Color
+        x:Key="Foreground"
+        A="255"
+        B="0"
+        G="0"
+        R="0" />
+    <Color
+        x:Key="DarkGrayColor"
+        A="255"
+        B="150"
+        G="150"
+        R="150" />
 </ResourceDictionary>
\ No newline at end of file
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..dec73dff 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()
 			};
 
@@ -147,7 +147,7 @@ private void CopyDEC_Click(object sender, RoutedEventArgs e)
 		private void MoreBtn_Click(object sender, RoutedEventArgs e)
 		{
 			MorePopup.IsOpen = true;
-        }
+		}
 
 		private void EditConverterBtn_Click(object sender, RoutedEventArgs e)
 		{
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/UserControls/TextItem.xaml.cs b/ColorPicker/UserControls/TextItem.xaml.cs
index d4eb3048..1cc9a25a 100644
--- a/ColorPicker/UserControls/TextItem.xaml.cs
+++ b/ColorPicker/UserControls/TextItem.xaml.cs
@@ -26,19 +26,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using ColorPicker.Classes;
 using ColorPicker.Enums;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace ColorPicker.UserControls;
 /// <summary>
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/ColorDetailsWindow.xaml.cs b/ColorPicker/Windows/ColorDetailsWindow.xaml.cs
index cd05cbaa..f70f0840 100644
--- a/ColorPicker/Windows/ColorDetailsWindow.xaml.cs
+++ b/ColorPicker/Windows/ColorDetailsWindow.xaml.cs
@@ -24,18 +24,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
 using ColorPicker.Classes;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace ColorPicker.Windows;
 /// <summary>
@@ -44,7 +34,7 @@ namespace ColorPicker.Windows;
 public partial class ColorDetailsWindow : Window
 {
 	ColorInfo ColorInfo { get; init; }
-	SolidColorBrush BackgroundSolidBrush { get; init; } 
+	SolidColorBrush BackgroundSolidBrush { get; init; }
 	public ColorDetailsWindow(SolidColorBrush color)
 	{
 		InitializeComponent();
diff --git a/ColorPicker/Windows/FirstRunWindow.xaml b/ColorPicker/Windows/FirstRunWindow.xaml
index d2b3255e..a4d3a7ce 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>
@@ -131,11 +131,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" />
@@ -159,7 +157,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"