diff --git a/Business/Menus.cs b/Business/Menus.cs
index c9958ad..fb4427f 100644
--- a/Business/Menus.cs
+++ b/Business/Menus.cs
@@ -187,8 +187,6 @@ namespace SystemTrayMenu.Business
             Closing,
         }
 
-        public static SolidColorBrush BrushSelectedItemBorder => MenuDefines.ColorSelectedItemBorder.ToSolidColorBrush();
-
         private Menu? MainMenu => menus[0];
 
         private bool IsMainUsable => MainMenu?.IsUsable ?? false;
@@ -678,20 +676,20 @@ namespace SystemTrayMenu.Business
                 RowData rowData = itemData.data;
                 if (rowData.IsClicking)
                 {
-                    itemData.BorderBrush = MenuDefines.ColorIcons.ToSolidColorBrush();
-                    itemData.BackgroundBrush = MenuDefines.ColorSelectedItem.ToSolidColorBrush();
+                    itemData.BorderBrush = MenuDefines.ColorIcons;
+                    itemData.BackgroundBrush = MenuDefines.ColorSelectedItem;
                     dgv.SelectedItems.Add(itemData);
                 }
                 else if (rowData.IsMenuOpen)
                 {
-                    itemData.BorderBrush = MenuDefines.ColorOpenFolderBorder.ToSolidColorBrush();
-                    itemData.BackgroundBrush = MenuDefines.ColorOpenFolder.ToSolidColorBrush();
+                    itemData.BorderBrush = MenuDefines.ColorOpenFolderBorder;
+                    itemData.BackgroundBrush = MenuDefines.ColorOpenFolder;
                     dgv.SelectedItems.Add(itemData);
                 }
                 else if (rowData.IsSelected)
                 {
-                    itemData.BorderBrush = MenuDefines.ColorSelectedItemBorder.ToSolidColorBrush();
-                    itemData.BackgroundBrush = MenuDefines.ColorSelectedItem.ToSolidColorBrush();
+                    itemData.BorderBrush = MenuDefines.ColorSelectedItemBorder;
+                    itemData.BackgroundBrush = MenuDefines.ColorSelectedItem;
                     dgv.SelectedItems.Add(itemData);
                 }
                 else
diff --git a/Config/AppColors.cs b/Config/AppColors.cs
index 08a13e6..49e6701 100644
--- a/Config/AppColors.cs
+++ b/Config/AppColors.cs
@@ -4,80 +4,80 @@
 
 namespace SystemTrayMenu
 {
-    using System.Drawing;
+    using System.Windows.Media;
 
     internal static class AppColors
     {
-        public static Color Arrow { get; internal set; }
+        public static SolidColorBrush Arrow { get; internal set; } = new ();
 
-        public static Color ArrowHoverBackground { get; internal set; }
+        public static SolidColorBrush ArrowHoverBackground { get; internal set; } = new ();
 
-        public static Color ArrowHover { get; internal set; }
+        public static SolidColorBrush ArrowHover { get; internal set; } = new ();
 
-        public static Color ArrowClick { get; internal set; }
+        public static SolidColorBrush ArrowClick { get; internal set; } = new ();
 
-        public static Color ArrowClickBackground { get; internal set; }
+        public static SolidColorBrush ArrowClickBackground { get; internal set; } = new ();
 
-        public static Color SliderArrowsAndTrackHover { get; internal set; }
+        public static SolidColorBrush SliderArrowsAndTrackHover { get; internal set; } = new ();
 
-        public static Color Slider { get; internal set; }
+        public static SolidColorBrush Slider { get; internal set; } = new ();
 
-        public static Color SliderHover { get; internal set; }
+        public static SolidColorBrush SliderHover { get; internal set; } = new ();
 
-        public static Color SliderDragging { get; internal set; }
+        public static SolidColorBrush SliderDragging { get; internal set; } = new ();
 
-        public static Color ScrollbarBackground { get; internal set; }
+        public static SolidColorBrush ScrollbarBackground { get; internal set; } = new ();
 
-        public static Color ArrowDarkMode { get; internal set; }
+        public static SolidColorBrush ArrowDarkMode { get; internal set; } = new ();
 
-        public static Color ArrowHoverBackgroundDarkMode { get; internal set; }
+        public static SolidColorBrush ArrowHoverBackgroundDarkMode { get; internal set; } = new ();
 
-        public static Color ArrowHoverDarkMode { get; internal set; }
+        public static SolidColorBrush ArrowHoverDarkMode { get; internal set; } = new ();
 
-        public static Color ArrowClickDarkMode { get; internal set; }
+        public static SolidColorBrush ArrowClickDarkMode { get; internal set; } = new ();
 
-        public static Color ArrowClickBackgroundDarkMode { get; internal set; }
+        public static SolidColorBrush ArrowClickBackgroundDarkMode { get; internal set; } = new ();
 
-        public static Color SliderArrowsAndTrackHoverDarkMode { get; internal set; }
+        public static SolidColorBrush SliderArrowsAndTrackHoverDarkMode { get; internal set; } = new ();
 
-        public static Color SliderDarkMode { get; internal set; }
+        public static SolidColorBrush SliderDarkMode { get; internal set; } = new ();
 
-        public static Color SliderHoverDarkMode { get; internal set; }
+        public static SolidColorBrush SliderHoverDarkMode { get; internal set; } = new ();
 
-        public static Color SliderDraggingDarkMode { get; internal set; }
+        public static SolidColorBrush SliderDraggingDarkMode { get; internal set; } = new ();
 
-        public static Color ScrollbarBackgroundDarkMode { get; internal set; }
+        public static SolidColorBrush ScrollbarBackgroundDarkMode { get; internal set; } = new ();
 
-        public static Color SelectedItem { get; set; }
+        public static SolidColorBrush SelectedItem { get; internal set; } = new ();
 
-        public static Color DarkModeSelecetedItem { get; set; }
+        public static SolidColorBrush DarkModeSelecetedItem { get; internal set; } = new ();
 
-        public static Color SelectedItemBorder { get; set; }
+        public static SolidColorBrush SelectedItemBorder { get; internal set; } = new ();
 
-        public static Color DarkModeSelectedItemBorder { get; set; }
+        public static SolidColorBrush DarkModeSelectedItemBorder { get; internal set; } = new ();
 
-        public static Color OpenFolder { get; set; }
+        public static SolidColorBrush OpenFolder { get; internal set; } = new ();
 
-        public static Color DarkModeOpenFolder { get; set; }
+        public static SolidColorBrush DarkModeOpenFolder { get; internal set; } = new ();
 
-        public static Color OpenFolderBorder { get; set; }
+        public static SolidColorBrush OpenFolderBorder { get; internal set; } = new ();
 
-        public static Color DarkModeOpenFolderBorder { get; set; }
+        public static SolidColorBrush DarkModeOpenFolderBorder { get; internal set; } = new ();
 
-        public static Color Background { get; set; }
+        public static SolidColorBrush Background { get; internal set; } = new ();
 
-        public static Color DarkModeBackground { get; set; }
+        public static SolidColorBrush DarkModeBackground { get; internal set; } = new ();
 
-        public static Color BackgroundBorder { get; set; }
+        public static SolidColorBrush BackgroundBorder { get; internal set; } = new ();
 
-        public static Color DarkModeBackgroundBorder { get; set; }
+        public static SolidColorBrush DarkModeBackgroundBorder { get; internal set; } = new ();
 
-        public static Color SearchField { get; set; }
+        public static SolidColorBrush SearchField { get; internal set; } = new ();
 
-        public static Color DarkModeSearchField { get; set; }
+        public static SolidColorBrush DarkModeSearchField { get; internal set; } = new ();
 
-        public static Color Icons { get; set; }
+        public static SolidColorBrush Icons { get; internal set; } = new ();
 
-        public static Color DarkModeIcons { get; set; }
+        public static SolidColorBrush DarkModeIcons { get; internal set; } = new ();
     }
 }
\ No newline at end of file
diff --git a/Config/Config.cs b/Config/Config.cs
index 0229c06..2e5e070 100644
--- a/Config/Config.cs
+++ b/Config/Config.cs
@@ -5,14 +5,15 @@
 namespace SystemTrayMenu
 {
     using System;
-    using System.Drawing;
     using System.IO;
     using System.Windows;
+    using System.Windows.Media;
     using Microsoft.Win32;
     using SystemTrayMenu.Properties;
     using SystemTrayMenu.UserInterface.FolderBrowseDialog;
     using SystemTrayMenu.Utilities;
     using static SystemTrayMenu.Utilities.IconReader;
+    using Icon = System.Drawing.Icon;
 
     public static class Config
     {
@@ -195,220 +196,220 @@ namespace SystemTrayMenu
             bool resetDefaults = false;
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorSelectedItem;
-            colorAndCode.Color = Color.FromArgb(204, 232, 255);
+            colorAndCode.Color = Color.FromRgb(204, 232, 255);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorSelectedItem = colorAndCode.HtmlColorCode;
-            AppColors.SelectedItem = colorAndCode.Color;
+            AppColors.SelectedItem = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorDarkModeSelecetedItem;
-            colorAndCode.Color = Color.FromArgb(51, 51, 51);
+            colorAndCode.Color = Color.FromRgb(51, 51, 51);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorDarkModeSelecetedItem = colorAndCode.HtmlColorCode;
-            AppColors.DarkModeSelecetedItem = colorAndCode.Color;
+            AppColors.DarkModeSelecetedItem = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorSelectedItemBorder;
-            colorAndCode.Color = Color.FromArgb(153, 209, 255);
+            colorAndCode.Color = Color.FromRgb(153, 209, 255);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorSelectedItemBorder = colorAndCode.HtmlColorCode;
-            AppColors.SelectedItemBorder = colorAndCode.Color;
+            AppColors.SelectedItemBorder = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorDarkModeSelectedItemBorder;
-            colorAndCode.Color = Color.FromArgb(20, 29, 75);
+            colorAndCode.Color = Color.FromRgb(20, 29, 75);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorDarkModeSelectedItemBorder = colorAndCode.HtmlColorCode;
-            AppColors.DarkModeSelectedItemBorder = colorAndCode.Color;
+            AppColors.DarkModeSelectedItemBorder = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorOpenFolder;
-            colorAndCode.Color = Color.FromArgb(194, 245, 222);
+            colorAndCode.Color = Color.FromRgb(194, 245, 222);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorOpenFolder = colorAndCode.HtmlColorCode;
-            AppColors.OpenFolder = colorAndCode.Color;
+            AppColors.OpenFolder = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorDarkModeOpenFolder;
-            colorAndCode.Color = Color.FromArgb(20, 65, 42);
+            colorAndCode.Color = Color.FromRgb(20, 65, 42);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorDarkModeOpenFolder = colorAndCode.HtmlColorCode;
-            AppColors.DarkModeOpenFolder = colorAndCode.Color;
+            AppColors.DarkModeOpenFolder = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorOpenFolderBorder;
-            colorAndCode.Color = Color.FromArgb(153, 255, 165);
+            colorAndCode.Color = Color.FromRgb(153, 255, 165);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorOpenFolderBorder = colorAndCode.HtmlColorCode;
-            AppColors.OpenFolderBorder = colorAndCode.Color;
+            AppColors.OpenFolderBorder = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorDarkModeOpenFolderBorder;
-            colorAndCode.Color = Color.FromArgb(20, 75, 85);
+            colorAndCode.Color = Color.FromRgb(20, 75, 85);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorDarkModeOpenFolderBorder = colorAndCode.HtmlColorCode;
-            AppColors.DarkModeOpenFolderBorder = colorAndCode.Color;
+            AppColors.DarkModeOpenFolderBorder = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorIcons;
-            colorAndCode.Color = Color.FromArgb(149, 160, 166);
+            colorAndCode.Color = Color.FromRgb(149, 160, 166);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorIcons = colorAndCode.HtmlColorCode;
-            AppColors.Icons = colorAndCode.Color;
+            AppColors.Icons = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorDarkModeIcons;
-            colorAndCode.Color = Color.FromArgb(149, 160, 166);
+            colorAndCode.Color = Color.FromRgb(149, 160, 166);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorDarkModeIcons = colorAndCode.HtmlColorCode;
-            AppColors.DarkModeIcons = colorAndCode.Color;
+            AppColors.DarkModeIcons = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorSearchField;
-            colorAndCode.Color = Color.FromArgb(255, 255, 255);
+            colorAndCode.Color = Color.FromRgb(255, 255, 255);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorSearchField = colorAndCode.HtmlColorCode;
-            AppColors.SearchField = colorAndCode.Color;
+            AppColors.SearchField = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorDarkModeSearchField;
-            colorAndCode.Color = Color.FromArgb(25, 25, 25);
+            colorAndCode.Color = Color.FromRgb(25, 25, 25);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorDarkModeSearchField = colorAndCode.HtmlColorCode;
-            AppColors.DarkModeSearchField = colorAndCode.Color;
+            AppColors.DarkModeSearchField = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorBackground;
-            colorAndCode.Color = Color.FromArgb(255, 255, 255);
+            colorAndCode.Color = Color.FromRgb(255, 255, 255);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorBackground = colorAndCode.HtmlColorCode;
-            AppColors.Background = colorAndCode.Color;
+            AppColors.Background = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorDarkModeBackground;
-            colorAndCode.Color = Color.FromArgb(32, 32, 32);
+            colorAndCode.Color = Color.FromRgb(32, 32, 32);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorDarkModeBackground = colorAndCode.HtmlColorCode;
-            AppColors.DarkModeBackground = colorAndCode.Color;
+            AppColors.DarkModeBackground = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorBackgroundBorder;
-            colorAndCode.Color = Color.FromArgb(0, 0, 0);
+            colorAndCode.Color = Color.FromRgb(0, 0, 0);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorBackgroundBorder = colorAndCode.HtmlColorCode;
-            AppColors.BackgroundBorder = colorAndCode.Color;
+            AppColors.BackgroundBorder = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorDarkModeBackgroundBorder;
-            colorAndCode.Color = Color.FromArgb(0, 0, 0);
+            colorAndCode.Color = Color.FromRgb(0, 0, 0);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorDarkModeBackgroundBorder = colorAndCode.HtmlColorCode;
-            AppColors.DarkModeBackgroundBorder = colorAndCode.Color;
+            AppColors.DarkModeBackgroundBorder = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorArrow;
-            colorAndCode.Color = Color.FromArgb(96, 96, 96);
+            colorAndCode.Color = Color.FromRgb(96, 96, 96);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorArrow = colorAndCode.HtmlColorCode;
-            AppColors.Arrow = colorAndCode.Color;
+            AppColors.Arrow = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorArrowHoverBackground;
-            colorAndCode.Color = Color.FromArgb(218, 218, 218);
+            colorAndCode.Color = Color.FromRgb(218, 218, 218);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorArrowHoverBackground = colorAndCode.HtmlColorCode;
-            AppColors.ArrowHoverBackground = colorAndCode.Color;
+            AppColors.ArrowHoverBackground = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorArrowHover;
-            colorAndCode.Color = Color.FromArgb(0, 0, 0);
+            colorAndCode.Color = Color.FromRgb(0, 0, 0);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorArrowHover = colorAndCode.HtmlColorCode;
-            AppColors.ArrowHover = colorAndCode.Color;
+            AppColors.ArrowHover = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorArrowClick;
-            colorAndCode.Color = Color.FromArgb(255, 255, 255);
+            colorAndCode.Color = Color.FromRgb(255, 255, 255);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorArrowClick = colorAndCode.HtmlColorCode;
-            AppColors.ArrowClick = colorAndCode.Color;
+            AppColors.ArrowClick = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorArrowClickBackground;
-            colorAndCode.Color = Color.FromArgb(96, 96, 96);
+            colorAndCode.Color = Color.FromRgb(96, 96, 96);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorArrowClickBackground = colorAndCode.HtmlColorCode;
-            AppColors.ArrowClickBackground = colorAndCode.Color;
+            AppColors.ArrowClickBackground = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorSliderArrowsAndTrackHover;
-            colorAndCode.Color = Color.FromArgb(192, 192, 192);
+            colorAndCode.Color = Color.FromRgb(192, 192, 192);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorSliderArrowsAndTrackHover = colorAndCode.HtmlColorCode;
-            AppColors.SliderArrowsAndTrackHover = colorAndCode.Color;
+            AppColors.SliderArrowsAndTrackHover = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorSlider;
-            colorAndCode.Color = Color.FromArgb(205, 205, 205);
+            colorAndCode.Color = Color.FromRgb(205, 205, 205);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorSlider = colorAndCode.HtmlColorCode;
-            AppColors.Slider = colorAndCode.Color;
+            AppColors.Slider = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorSliderHover;
-            colorAndCode.Color = Color.FromArgb(166, 166, 166);
+            colorAndCode.Color = Color.FromRgb(166, 166, 166);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorSliderHover = colorAndCode.HtmlColorCode;
-            AppColors.SliderHover = colorAndCode.Color;
+            AppColors.SliderHover = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorSliderDragging;
-            colorAndCode.Color = Color.FromArgb(96, 96, 96);
+            colorAndCode.Color = Color.FromRgb(96, 96, 96);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorSliderDragging = colorAndCode.HtmlColorCode;
-            AppColors.SliderDragging = colorAndCode.Color;
+            AppColors.SliderDragging = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorScrollbarBackground;
-            colorAndCode.Color = Color.FromArgb(240, 240, 240);
+            colorAndCode.Color = Color.FromRgb(240, 240, 240);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorScrollbarBackground = colorAndCode.HtmlColorCode;
-            AppColors.ScrollbarBackground = colorAndCode.Color;
+            AppColors.ScrollbarBackground = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorArrowDarkMode;
-            colorAndCode.Color = Color.FromArgb(103, 103, 103);
+            colorAndCode.Color = Color.FromRgb(103, 103, 103);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorArrowDarkMode = colorAndCode.HtmlColorCode;
-            AppColors.ArrowDarkMode = colorAndCode.Color;
+            AppColors.ArrowDarkMode = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorArrowHoverBackgroundDarkMode;
-            colorAndCode.Color = Color.FromArgb(55, 55, 55);
+            colorAndCode.Color = Color.FromRgb(55, 55, 55);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorArrowHoverBackgroundDarkMode = colorAndCode.HtmlColorCode;
-            AppColors.ArrowHoverBackgroundDarkMode = colorAndCode.Color;
+            AppColors.ArrowHoverBackgroundDarkMode = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorArrowHoverDarkMode;
-            colorAndCode.Color = Color.FromArgb(103, 103, 103);
+            colorAndCode.Color = Color.FromRgb(103, 103, 103);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorArrowHoverDarkMode = colorAndCode.HtmlColorCode;
-            AppColors.ArrowHoverDarkMode = colorAndCode.Color;
+            AppColors.ArrowHoverDarkMode = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorArrowClickDarkMode;
-            colorAndCode.Color = Color.FromArgb(23, 23, 23);
+            colorAndCode.Color = Color.FromRgb(23, 23, 23);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorArrowClickDarkMode = colorAndCode.HtmlColorCode;
-            AppColors.ArrowClickDarkMode = colorAndCode.Color;
+            AppColors.ArrowClickDarkMode = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorArrowClickBackgroundDarkMode;
-            colorAndCode.Color = Color.FromArgb(166, 166, 166);
+            colorAndCode.Color = Color.FromRgb(166, 166, 166);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorArrowClickBackgroundDarkMode = colorAndCode.HtmlColorCode;
-            AppColors.ArrowClickBackgroundDarkMode = colorAndCode.Color;
+            AppColors.ArrowClickBackgroundDarkMode = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorSliderArrowsAndTrackHoverDarkMode;
-            colorAndCode.Color = Color.FromArgb(77, 77, 77);
+            colorAndCode.Color = Color.FromRgb(77, 77, 77);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorSliderArrowsAndTrackHoverDarkMode = colorAndCode.HtmlColorCode;
-            AppColors.SliderArrowsAndTrackHoverDarkMode = colorAndCode.Color;
+            AppColors.SliderArrowsAndTrackHoverDarkMode = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorSliderDarkMode;
-            colorAndCode.Color = Color.FromArgb(77, 77, 77);
+            colorAndCode.Color = Color.FromRgb(77, 77, 77);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorSliderDarkMode = colorAndCode.HtmlColorCode;
-            AppColors.SliderDarkMode = colorAndCode.Color;
+            AppColors.SliderDarkMode = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorSliderHoverDarkMode;
-            colorAndCode.Color = Color.FromArgb(122, 122, 122);
+            colorAndCode.Color = Color.FromRgb(122, 122, 122);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorSliderHoverDarkMode = colorAndCode.HtmlColorCode;
-            AppColors.SliderHoverDarkMode = colorAndCode.Color;
+            AppColors.SliderHoverDarkMode = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorSliderDraggingDarkMode;
-            colorAndCode.Color = Color.FromArgb(166, 166, 166);
+            colorAndCode.Color = Color.FromRgb(166, 166, 166);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorSliderDraggingDarkMode = colorAndCode.HtmlColorCode;
-            AppColors.SliderDraggingDarkMode = colorAndCode.Color;
+            AppColors.SliderDraggingDarkMode = new SolidColorBrush(colorAndCode.Color);
 
             colorAndCode.HtmlColorCode = Settings.Default.ColorScrollbarBackgroundDarkMode;
-            colorAndCode.Color = Color.FromArgb(23, 23, 23);
+            colorAndCode.Color = Color.FromRgb(23, 23, 23);
             ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
             Settings.Default.ColorScrollbarBackgroundDarkMode = colorAndCode.HtmlColorCode;
-            AppColors.ScrollbarBackgroundDarkMode = colorAndCode.Color;
+            AppColors.ScrollbarBackgroundDarkMode = new SolidColorBrush(colorAndCode.Color);
 
             if (save && resetDefaults)
             {
@@ -465,19 +466,19 @@ namespace SystemTrayMenu
             ref ColorAndCode colorAndCode,
             ref bool resetDefaults)
         {
-            Color? color;
             try
             {
-                color = (Color?)colorConverter.ConvertFromString(colorAndCode.HtmlColorCode);
+                Color? color = (Color?)colorConverter.ConvertFromInvariantString(colorAndCode.HtmlColorCode);
                 if (color != null)
                 {
-                    colorAndCode.Color = (Color)color;
+                    colorAndCode.Color = color.Value;
                 }
             }
-            catch (ArgumentException ex)
+            catch (Exception ex)
             {
                 Log.Warn($"HtmlColorCode {colorAndCode.HtmlColorCode}", ex);
-                colorAndCode.HtmlColorCode = ColorTranslator.ToHtml(colorAndCode.Color);
+                colorAndCode.HtmlColorCode = System.Drawing.ColorTranslator.ToHtml(
+                    System.Drawing.Color.FromArgb(colorAndCode.Color.R, colorAndCode.Color.G, colorAndCode.Color.B));
                 resetDefaults = true;
             }
         }
@@ -485,7 +486,7 @@ namespace SystemTrayMenu
         /// <summary>
         /// Helper class to process color settings.
         /// </summary>
-        private struct ColorAndCode
+        internal struct ColorAndCode
         {
             public Color Color { get; set; }
 
diff --git a/Config/MenuDefines.cs b/Config/MenuDefines.cs
index 7dda331..876788b 100644
--- a/Config/MenuDefines.cs
+++ b/Config/MenuDefines.cs
@@ -1,90 +1,29 @@
-// <copyright file="MenuDefines.cs" company="PlaceholderCompany">
-// Copyright (c) PlaceholderCompany. All rights reserved.
-// </copyright>
-
-namespace SystemTrayMenu
-{
-    using System.Drawing;
-
-    internal static class MenuDefines
-    {
-        internal const int MenusMax = 50;
-        internal const int LengthMax = 37;
-        internal const int Scrollspeed = 3;
-
-        public static Color ColorSelectedItem
-        {
-            get
-            {
-                if (Config.IsDarkMode())
-                {
-                    return AppColors.DarkModeSelecetedItem;
-                }
-                else
-                {
-                    return AppColors.SelectedItem;
-                }
-            }
-        }
-
-        public static Color ColorSelectedItemBorder
-        {
-            get
-            {
-                if (Config.IsDarkMode())
-                {
-                    return AppColors.DarkModeSelectedItemBorder;
-                }
-                else
-                {
-                    return AppColors.SelectedItemBorder;
-                }
-            }
-        }
-
-        public static Color ColorOpenFolder
-        {
-            get
-            {
-                if (Config.IsDarkMode())
-                {
-                    return AppColors.DarkModeOpenFolder;
-                }
-                else
-                {
-                    return AppColors.OpenFolder;
-                }
-            }
-        }
-
-        public static Color ColorOpenFolderBorder
-        {
-            get
-            {
-                if (Config.IsDarkMode())
-                {
-                    return AppColors.DarkModeOpenFolderBorder;
-                }
-                else
-                {
-                    return AppColors.OpenFolderBorder;
-                }
-            }
-        }
-
-        public static Color ColorIcons
-        {
-            get
-            {
-                if (Config.IsDarkMode())
-                {
-                    return AppColors.DarkModeIcons;
-                }
-                else
-                {
-                    return AppColors.Icons;
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
+// <copyright file="MenuDefines.cs" company="PlaceholderCompany">
+// Copyright (c) PlaceholderCompany. All rights reserved.
+// </copyright>
+
+namespace SystemTrayMenu
+{
+    using System.Windows.Media;
+
+    internal static class MenuDefines
+    {
+        internal const int MenusMax = 50;
+        internal const int LengthMax = 37;
+
+        public static SolidColorBrush ColorSelectedItem =>
+            Config.IsDarkMode() ? AppColors.DarkModeSelecetedItem : AppColors.SelectedItem;
+
+        public static SolidColorBrush ColorSelectedItemBorder =>
+            Config.IsDarkMode() ? AppColors.DarkModeSelectedItemBorder : AppColors.SelectedItemBorder;
+
+        public static SolidColorBrush ColorOpenFolder =>
+            Config.IsDarkMode() ? AppColors.DarkModeOpenFolder : AppColors.OpenFolder;
+
+        public static SolidColorBrush ColorOpenFolderBorder =>
+            Config.IsDarkMode() ? AppColors.DarkModeOpenFolderBorder : AppColors.OpenFolderBorder;
+
+        public static SolidColorBrush ColorIcons =>
+            Config.IsDarkMode() ? AppColors.DarkModeIcons : AppColors.Icons;
+    }
+}
diff --git a/UserInterface/Menu.xaml b/UserInterface/Menu.xaml
index 8e822ce..e2b4c05 100644
--- a/UserInterface/Menu.xaml
+++ b/UserInterface/Menu.xaml
@@ -6,8 +6,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:sys="clr-namespace:System;assembly=mscorlib"
-        xmlns:utils="clr-namespace:SystemTrayMenu.Utilities"
-        xmlns:business="clr-namespace:SystemTrayMenu.Business"
+        xmlns:stm="clr-namespace:SystemTrayMenu"
         xmlns:local="clr-namespace:SystemTrayMenu.UserInterface"
         x:Class="SystemTrayMenu.UserInterface.Menu"
         mc:Ignorable="d" ResizeMode="NoResize" WindowStyle="None" Topmost="True" Background="Transparent" AllowsTransparency="True" SizeToContent="WidthAndHeight" ShowInTaskbar="False" SnapsToDevicePixels="True" UseLayoutRounding="True"
@@ -126,7 +125,7 @@
                                     </Border>
                                     <ControlTemplate.Triggers>
                                         <Trigger Property="IsMouseOver" Value="True">
-                                            <Setter Property="BorderBrush" Value="{x:Static business:Menus.BrushSelectedItemBorder}" TargetName="Border" />
+                                            <Setter Property="BorderBrush" Value="{x:Static stm:MenuDefines.ColorSelectedItemBorder}" TargetName="Border" />
                                             <Setter Property="Background" Value="LightGray" TargetName="Border" />
                                             <Setter Property="Opacity" Value="0.9" TargetName="Border" />
                                         </Trigger>
diff --git a/UserInterface/Menu.xaml.cs b/UserInterface/Menu.xaml.cs
index 66aa476..ace4b26 100644
--- a/UserInterface/Menu.xaml.cs
+++ b/UserInterface/Menu.xaml.cs
@@ -194,16 +194,16 @@ namespace SystemTrayMenu.UserInterface
             });
 
             SolidColorBrush foreColor = new(Colors.Black);
-            SolidColorBrush backColor = AppColors.Background.ToSolidColorBrush();
-            SolidColorBrush backColorSearch = AppColors.SearchField.ToSolidColorBrush();
-            SolidColorBrush backgroundBorder = AppColors.BackgroundBorder.ToSolidColorBrush();
+            SolidColorBrush backColor = AppColors.Background;
+            SolidColorBrush backColorSearch = AppColors.SearchField;
+            SolidColorBrush backgroundBorder = AppColors.BackgroundBorder;
 
             if (Config.IsDarkMode())
             {
                 foreColor = new (Colors.White);
-                backColor = AppColors.DarkModeBackground.ToSolidColorBrush();
-                backColorSearch = AppColors.DarkModeSearchField.ToSolidColorBrush();
-                backgroundBorder = AppColors.DarkModeBackgroundBorder.ToSolidColorBrush();
+                backColor = AppColors.DarkModeBackground;
+                backColorSearch = AppColors.DarkModeSearchField;
+                backgroundBorder = AppColors.DarkModeBackgroundBorder;
                 Resources["ic_fluent_svgColor"] = WPFExtensions.SolidColorBrushFromString(Settings.Default.ColorDarkModeIcons);
             }
             else
@@ -214,12 +214,12 @@ namespace SystemTrayMenu.UserInterface
             labelTitle.Foreground = foreColor;
             textBoxSearch.Foreground = foreColor;
             dgv.Foreground = foreColor;
-            labelStatus.Foreground = MenuDefines.ColorIcons.ToSolidColorBrush();
+            labelStatus.Foreground = MenuDefines.ColorIcons;
 
             windowFrame.BorderBrush = backgroundBorder;
             windowFrame.Background = backColor;
             searchPanel.Background = backColorSearch;
-            panelLine.Background = AppColors.Icons.ToSolidColorBrush();
+            panelLine.Background = AppColors.Icons;
 
             dgv.GotFocus += (_, _) => FocusTextBox();
 #if TODO // Misc MouseEvents
diff --git a/Utilities/WPFExtensions.cs b/Utilities/WPFExtensions.cs
index 94ec21e..b0db29c 100644
--- a/Utilities/WPFExtensions.cs
+++ b/Utilities/WPFExtensions.cs
@@ -108,11 +108,6 @@ namespace SystemTrayMenu.Utilities
                         CultureInfo.InvariantCulture);
         }
 
-        internal static SolidColorBrush ToSolidColorBrush(this System.Drawing.Color color)
-        {
-            return new SolidColorBrush(Color.FromArgb(color.A, color.R, color.G, color.B));
-        }
-
         internal static SolidColorBrush SolidColorBrushFromString(string value)
         {
             return new SolidColorBrush((Color)System.Windows.Media.ColorConverter.ConvertFromString(value));