diff --git a/RetroBar/App.config b/RetroBar/App.config
deleted file mode 100644
index 2c42d133..00000000
--- a/RetroBar/App.config
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="RetroBar.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-        </sectionGroup>
-    </configSections>
-    <userSettings>
-        <RetroBar.Properties.Settings>
-            <setting name="Theme" serializeAs="String">
-                <value>Windows 95-98</value>
-            </setting>
-            <setting name="IsFirstRun" serializeAs="String">
-                <value>True</value>
-            </setting>
-            <setting name="ShowClock" serializeAs="String">
-                <value>True</value>
-            </setting>
-            <setting name="ShowQuickLaunch" serializeAs="String">
-                <value>True</value>
-            </setting>
-            <setting name="QuickLaunchPath" serializeAs="String">
-                <value>%appdata%\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar</value>
-            </setting>
-            <setting name="CollapseNotifyIcons" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="AllowFontSmoothing" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="Language" serializeAs="String">
-                <value>System</value>
-            </setting>
-            <setting name="Edge" serializeAs="String">
-                <value>3</value>
-            </setting>
-            <setting name="ShowMultiMon" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="UseSoftwareRendering" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="MiddleMouseToClose" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="ShowDesktopButton" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="PeekAtDesktop" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="PinnedNotifyIcons" serializeAs="String">
-                <value>7820ae76-23e3-4229-82c1-e41cb67d5b9c|7820ae75-23e3-4229-82c1-e41cb67d5b9c|7820ae74-23e3-4229-82c1-e41cb67d5b9c|7820ae73-23e3-4229-82c1-e41cb67d5b9c</value>
-            </setting>
-            <setting name="QuickLaunchOrder" serializeAs="String">
-                <value />
-            </setting>
-            <setting name="ShowTaskThumbnails" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="MultiMonMode" serializeAs="String">
-                <value>0</value>
-            </setting>
-            <setting name="TaskbarScale" serializeAs="String">
-                <value>1</value>
-            </setting>
-            <setting name="DebugLogging" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="AutoHide" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="LockTaskbar" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="InvertIconsMode" serializeAs="String">
-                <value>0</value>
-            </setting>
-        </RetroBar.Properties.Settings>
-    </userSettings>
-</configuration>
\ No newline at end of file
diff --git a/RetroBar/Controls/NotifyBalloon.xaml.cs b/RetroBar/Controls/NotifyBalloon.xaml.cs
index 689ae144..637e06bf 100644
--- a/RetroBar/Controls/NotifyBalloon.xaml.cs
+++ b/RetroBar/Controls/NotifyBalloon.xaml.cs
@@ -47,7 +47,7 @@ public CustomPopupPlacement[] PlacePopup(Size popupSize, Size targetSize, Point
 
             DpiScale dpiScale = VisualTreeHelper.GetDpi(this);
 
-            switch ((AppBarEdge)Settings.Instance.Edge)
+            switch (Settings.Instance.Edge)
             {
                 case AppBarEdge.Top:
                     if (FlowDirection == FlowDirection.LeftToRight)
diff --git a/RetroBar/Controls/NotifyIcon.xaml.cs b/RetroBar/Controls/NotifyIcon.xaml.cs
index 874b7001..e7d6146b 100644
--- a/RetroBar/Controls/NotifyIcon.xaml.cs
+++ b/RetroBar/Controls/NotifyIcon.xaml.cs
@@ -33,7 +33,7 @@ public NotifyIcon()
 
         private void applyEffects()
         {
-            if ((!EnvironmentHelper.IsWindows10OrBetter && Settings.Instance.InvertIconsMode == 0) || TrayIcon == null || Settings.Instance.InvertIconsMode == 2)
+            if ((!EnvironmentHelper.IsWindows10OrBetter && Settings.Instance.InvertIconsMode == Settings.InvertIconsOption.WhenNeededByTheme) || TrayIcon == null || Settings.Instance.InvertIconsMode == Settings.InvertIconsOption.Never)
             {
                 return;
             }
@@ -53,7 +53,7 @@ private void applyEffects()
             }
 
             bool invertByTheme = Application.Current.FindResource("InvertSystemNotifyIcons") as bool? ?? false;
-            bool performInvert = invertByTheme || Settings.Instance.InvertIconsMode == 1;
+            bool performInvert = invertByTheme || Settings.Instance.InvertIconsMode == Settings.InvertIconsOption.Always;
 
             if (NotifyIconImage.Effect == null != performInvert)
             {
diff --git a/RetroBar/Controls/TaskList.xaml.cs b/RetroBar/Controls/TaskList.xaml.cs
index 6b64eb6f..7c8c9367 100644
--- a/RetroBar/Controls/TaskList.xaml.cs
+++ b/RetroBar/Controls/TaskList.xaml.cs
@@ -56,7 +56,7 @@ private void SetStyles()
             MinButtonWidth = Application.Current.FindResource("TaskButtonMinWidth") as double? ?? 0;
             Thickness buttonMargin;
 
-            if (Settings.Instance.Edge == (int)AppBarEdge.Left || Settings.Instance.Edge == (int)AppBarEdge.Right)
+            if (Settings.Instance.Edge == AppBarEdge.Left || Settings.Instance.Edge == AppBarEdge.Right)
             {
                 buttonMargin = Application.Current.FindResource("TaskButtonVerticalMargin") as Thickness? ?? new Thickness();
             }
@@ -98,7 +98,7 @@ private void Settings_PropertyChanged(object sender, PropertyChangedEventArgs e)
             }
             else if (e.PropertyName == "ShowMultiMon")
             {
-                if (Settings.Instance.MultiMonMode != 0)
+                if (Settings.Instance.MultiMonMode != Settings.MultiMonOption.AllTaskbars)
                 {
                     taskbarItems?.Refresh();
                 }
@@ -114,12 +114,12 @@ private bool Tasks_Filter(object obj)
                     return false;
                 }
 
-                if (!Settings.Instance.ShowMultiMon || Settings.Instance.MultiMonMode == 0)
+                if (!Settings.Instance.ShowMultiMon || Settings.Instance.MultiMonMode == Settings.MultiMonOption.AllTaskbars)
                 {
                     return true;
                 }
 
-                if (Settings.Instance.MultiMonMode == 2 && Host.Screen.Primary)
+                if (Settings.Instance.MultiMonMode == Settings.MultiMonOption.SameAsWindowAndPrimary && Host.Screen.Primary)
                 {
                     return true;
                 }
@@ -159,7 +159,7 @@ private void TaskList_OnSizeChanged(object sender, SizeChangedEventArgs e)
 
         private void SetTaskButtonWidth()
         {
-            if (Settings.Instance.Edge == (int)AppBarEdge.Left || Settings.Instance.Edge == (int)AppBarEdge.Right)
+            if (Settings.Instance.Edge == AppBarEdge.Left || Settings.Instance.Edge == AppBarEdge.Right)
             {
                 ButtonWidth = ActualWidth;
                 SetScrollable(true); // while technically not always scrollable, we don't run into DPI-specific issues with it enabled while vertical
diff --git a/RetroBar/Converters/DockOrientationConverter.cs b/RetroBar/Converters/DockOrientationConverter.cs
index c7af5a30..9f8861e7 100644
--- a/RetroBar/Converters/DockOrientationConverter.cs
+++ b/RetroBar/Converters/DockOrientationConverter.cs
@@ -11,7 +11,7 @@ public class DockOrientationConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
-            bool vertical = Settings.Instance.Edge == (int)AppBarEdge.Left || Settings.Instance.Edge == (int)AppBarEdge.Right;
+            bool vertical = Settings.Instance.Edge == AppBarEdge.Left || Settings.Instance.Edge == AppBarEdge.Right;
 
             // parameter is a string "leading" or "trailing"
 
diff --git a/RetroBar/Converters/EdgeOrientationConverter.cs b/RetroBar/Converters/EdgeOrientationConverter.cs
index 7f8000e0..1f266e78 100644
--- a/RetroBar/Converters/EdgeOrientationConverter.cs
+++ b/RetroBar/Converters/EdgeOrientationConverter.cs
@@ -11,7 +11,7 @@ public class EdgeOrientationConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
-            if (Settings.Instance.Edge == (int)AppBarEdge.Left || Settings.Instance.Edge == (int)AppBarEdge.Right)
+            if (Settings.Instance.Edge == AppBarEdge.Left || Settings.Instance.Edge == AppBarEdge.Right)
             {
                 return Orientation.Vertical;
             }
diff --git a/RetroBar/Converters/EnumConverter.cs b/RetroBar/Converters/EnumConverter.cs
new file mode 100644
index 00000000..a1a2ebda
--- /dev/null
+++ b/RetroBar/Converters/EnumConverter.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace RetroBar.Converters
+{
+    public class EnumConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return (int)value;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return Enum.ToObject(targetType, value);
+        }
+    }
+}
diff --git a/RetroBar/Converters/ToolTipHorizontalOffsetConverter.cs b/RetroBar/Converters/ToolTipHorizontalOffsetConverter.cs
index 2c6e29e6..2dc7a777 100644
--- a/RetroBar/Converters/ToolTipHorizontalOffsetConverter.cs
+++ b/RetroBar/Converters/ToolTipHorizontalOffsetConverter.cs
@@ -18,7 +18,7 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
                 return double.NaN;
             }
 
-            if (Settings.Instance.Edge == (int)AppBarEdge.Left || Settings.Instance.Edge == (int)AppBarEdge.Right)
+            if (Settings.Instance.Edge == AppBarEdge.Left || Settings.Instance.Edge == AppBarEdge.Right)
             {
                 return (double)0;
             }
diff --git a/RetroBar/Converters/ToolTipPlacementConverter.cs b/RetroBar/Converters/ToolTipPlacementConverter.cs
index c3c3cc67..c50618a3 100644
--- a/RetroBar/Converters/ToolTipPlacementConverter.cs
+++ b/RetroBar/Converters/ToolTipPlacementConverter.cs
@@ -11,15 +11,15 @@ public class ToolTipPlacementConverter : IMultiValueConverter
     {
         public object Convert(object[] value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
-            if (Settings.Instance.Edge == (int)AppBarEdge.Left)
+            if (Settings.Instance.Edge == AppBarEdge.Left)
             {
                 return PlacementMode.Right;
             }
-            else if (Settings.Instance.Edge == (int)AppBarEdge.Right)
+            else if (Settings.Instance.Edge == AppBarEdge.Right)
             {
                 return PlacementMode.Left;
             }
-            else if (Settings.Instance.Edge == (int)AppBarEdge.Top)
+            else if (Settings.Instance.Edge == AppBarEdge.Top)
             {
                 return PlacementMode.Bottom;
             }
diff --git a/RetroBar/Converters/ToolTipVerticalOffsetConverter.cs b/RetroBar/Converters/ToolTipVerticalOffsetConverter.cs
index cebe5f15..ad72b36c 100644
--- a/RetroBar/Converters/ToolTipVerticalOffsetConverter.cs
+++ b/RetroBar/Converters/ToolTipVerticalOffsetConverter.cs
@@ -18,7 +18,7 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
                 return double.NaN;
             }
 
-            if (Settings.Instance.Edge == (int)AppBarEdge.Left || Settings.Instance.Edge == (int)AppBarEdge.Right)
+            if (Settings.Instance.Edge == AppBarEdge.Left || Settings.Instance.Edge == AppBarEdge.Right)
             {
                 double placementTargetHeight = (double)values[0];
                 double toolTipHeight = (double)values[1];
diff --git a/RetroBar/Properties/Settings.Designer.cs b/RetroBar/Properties/Settings.Designer.cs
deleted file mode 100644
index 7efd6821..00000000
--- a/RetroBar/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,303 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace RetroBar.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("Windows 95-98")]
-        public string Theme {
-            get {
-                return ((string)(this["Theme"]));
-            }
-            set {
-                this["Theme"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("True")]
-        public bool IsFirstRun {
-            get {
-                return ((bool)(this["IsFirstRun"]));
-            }
-            set {
-                this["IsFirstRun"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("True")]
-        public bool ShowClock {
-            get {
-                return ((bool)(this["ShowClock"]));
-            }
-            set {
-                this["ShowClock"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("True")]
-        public bool ShowQuickLaunch {
-            get {
-                return ((bool)(this["ShowQuickLaunch"]));
-            }
-            set {
-                this["ShowQuickLaunch"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("%appdata%\\Microsoft\\Internet Explorer\\Quick Launch\\User Pinned\\TaskBar")]
-        public string QuickLaunchPath {
-            get {
-                return ((string)(this["QuickLaunchPath"]));
-            }
-            set {
-                this["QuickLaunchPath"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool CollapseNotifyIcons {
-            get {
-                return ((bool)(this["CollapseNotifyIcons"]));
-            }
-            set {
-                this["CollapseNotifyIcons"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool AllowFontSmoothing {
-            get {
-                return ((bool)(this["AllowFontSmoothing"]));
-            }
-            set {
-                this["AllowFontSmoothing"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("System")]
-        public string Language {
-            get {
-                return ((string)(this["Language"]));
-            }
-            set {
-                this["Language"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("3")]
-        public int Edge {
-            get {
-                return ((int)(this["Edge"]));
-            }
-            set {
-                this["Edge"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool ShowMultiMon {
-            get {
-                return ((bool)(this["ShowMultiMon"]));
-            }
-            set {
-                this["ShowMultiMon"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool UseSoftwareRendering {
-            get {
-                return ((bool)(this["UseSoftwareRendering"]));
-            }
-            set {
-                this["UseSoftwareRendering"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool MiddleMouseToClose {
-            get {
-                return ((bool)(this["MiddleMouseToClose"]));
-            }
-            set {
-                this["MiddleMouseToClose"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool ShowDesktopButton {
-            get {
-                return ((bool)(this["ShowDesktopButton"]));
-            }
-            set {
-                this["ShowDesktopButton"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool PeekAtDesktop {
-            get {
-                return ((bool)(this["PeekAtDesktop"]));
-            }
-            set {
-                this["PeekAtDesktop"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("7820ae76-23e3-4229-82c1-e41cb67d5b9c|7820ae75-23e3-4229-82c1-e41cb67d5b9c|7820ae7" +
-            "4-23e3-4229-82c1-e41cb67d5b9c|7820ae73-23e3-4229-82c1-e41cb67d5b9c")]
-        public string PinnedNotifyIcons {
-            get {
-                return ((string)(this["PinnedNotifyIcons"]));
-            }
-            set {
-                this["PinnedNotifyIcons"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
-        public string QuickLaunchOrder {
-            get {
-                return ((string)(this["QuickLaunchOrder"]));
-            }
-            set {
-                this["QuickLaunchOrder"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool ShowTaskThumbnails {
-            get {
-                return ((bool)(this["ShowTaskThumbnails"]));
-            }
-            set {
-                this["ShowTaskThumbnails"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("0")]
-        public int MultiMonMode {
-            get {
-                return ((int)(this["MultiMonMode"]));
-            }
-            set {
-                this["MultiMonMode"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("1")]
-        public double TaskbarScale {
-            get {
-                return ((double)(this["TaskbarScale"]));
-            }
-            set {
-                this["TaskbarScale"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool DebugLogging {
-            get {
-                return ((bool)(this["DebugLogging"]));
-            }
-            set {
-                this["DebugLogging"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool AutoHide {
-            get {
-                return ((bool)(this["AutoHide"]));
-            }
-            set {
-                this["AutoHide"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool LockTaskbar {
-            get {
-                return ((bool)(this["LockTaskbar"]));
-            }
-            set {
-                this["LockTaskbar"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("0")]
-        public int InvertIconsMode {
-            get {
-                return ((int)(this["InvertIconsMode"]));
-            }
-            set {
-                this["InvertIconsMode"] = value;
-            }
-        }
-    }
-}
diff --git a/RetroBar/Properties/Settings.settings b/RetroBar/Properties/Settings.settings
deleted file mode 100644
index 3be62365..00000000
--- a/RetroBar/Properties/Settings.settings
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="RetroBar.Properties" GeneratedClassName="Settings">
-  <Profiles />
-  <Settings>
-    <Setting Name="Theme" Type="System.String" Scope="User">
-      <Value Profile="(Default)">Windows 95-98</Value>
-    </Setting>
-    <Setting Name="IsFirstRun" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">True</Value>
-    </Setting>
-    <Setting Name="ShowClock" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">True</Value>
-    </Setting>
-    <Setting Name="ShowQuickLaunch" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">True</Value>
-    </Setting>
-    <Setting Name="QuickLaunchPath" Type="System.String" Scope="User">
-      <Value Profile="(Default)">%appdata%\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar</Value>
-    </Setting>
-    <Setting Name="CollapseNotifyIcons" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
-    <Setting Name="AllowFontSmoothing" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
-    <Setting Name="Language" Type="System.String" Scope="User">
-      <Value Profile="(Default)">System</Value>
-    </Setting>
-    <Setting Name="Edge" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">3</Value>
-    </Setting>
-    <Setting Name="ShowMultiMon" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
-    <Setting Name="UseSoftwareRendering" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
-    <Setting Name="MiddleMouseToClose" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
-    <Setting Name="ShowDesktopButton" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
-    <Setting Name="PeekAtDesktop" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
-    <Setting Name="PinnedNotifyIcons" Type="System.String" Scope="User">
-      <Value Profile="(Default)">7820ae76-23e3-4229-82c1-e41cb67d5b9c|7820ae75-23e3-4229-82c1-e41cb67d5b9c|7820ae74-23e3-4229-82c1-e41cb67d5b9c|7820ae73-23e3-4229-82c1-e41cb67d5b9c</Value>
-    </Setting>
-    <Setting Name="QuickLaunchOrder" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
-    <Setting Name="ShowTaskThumbnails" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
-    <Setting Name="MultiMonMode" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">0</Value>
-    </Setting>
-    <Setting Name="TaskbarScale" Type="System.Double" Scope="User">
-      <Value Profile="(Default)">1</Value>
-    </Setting>
-    <Setting Name="DebugLogging" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
-    <Setting Name="AutoHide" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
-    <Setting Name="LockTaskbar" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
-    <Setting Name="InvertIconsMode" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">0</Value>
-    </Setting>
-  </Settings>
-</SettingsFile>
\ No newline at end of file
diff --git a/RetroBar/PropertiesWindow.xaml b/RetroBar/PropertiesWindow.xaml
index c879df57..c98b59a8 100644
--- a/RetroBar/PropertiesWindow.xaml
+++ b/RetroBar/PropertiesWindow.xaml
@@ -22,6 +22,7 @@
             <converters:BoolToVisibilityConverter x:Key="boolToVisibilityConverter" />
             <converters:BoolToInvertedVisibilityConverter x:Key="boolToInvertedVisibilityConverter" />
             <converters:DoubleToPercentConverter x:Key="doubleToPercentConverter" />
+            <converters:EnumConverter x:Key="enumConverter" />
             <Style TargetType="{x:Type TextBlock}">
                 <Setter Property="VerticalAlignment"
                         Value="Center" />
@@ -197,7 +198,7 @@
                                 </Label>
                                 <ComboBox Name="cboEdgeSelect"
                                           ItemsSource="{DynamicResource location_values}"
-                                          SelectedIndex="{Binding Source={x:Static Settings:Settings.Instance}, Path=Edge, UpdateSourceTrigger=PropertyChanged}"
+                                          SelectedIndex="{Binding Source={x:Static Settings:Settings.Instance}, Path=Edge, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource enumConverter}}"
                                           SelectionChanged="cboEdgeSelect_SelectionChanged" />
                             </DockPanel>
                             <CheckBox IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=AllowFontSmoothing, UpdateSourceTrigger=PropertyChanged}">
@@ -319,7 +320,7 @@
                             </Label>
                             <ComboBox Name="cboInvertIconsMode"
                                       ItemsSource="{DynamicResource invert_system_icons_values}"
-                                      SelectedIndex="{Binding Source={x:Static Settings:Settings.Instance}, Path=InvertIconsMode, UpdateSourceTrigger=PropertyChanged}"
+                                      SelectedIndex="{Binding Source={x:Static Settings:Settings.Instance}, Path=InvertIconsMode, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource enumConverter}}"
                                       SelectionChanged="cboInvertIconsMode_SelectionChanged" />
                         </DockPanel>
                     </StackPanel>
@@ -338,7 +339,7 @@
                                 <ComboBox Name="cboMultiMonMode"
                                           IsEnabled="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowMultiMon, UpdateSourceTrigger=PropertyChanged}"
                                           ItemsSource="{DynamicResource show_tasks_on_values}"
-                                          SelectedIndex="{Binding Source={x:Static Settings:Settings.Instance}, Path=MultiMonMode, UpdateSourceTrigger=PropertyChanged}"
+                                          SelectedIndex="{Binding Source={x:Static Settings:Settings.Instance}, Path=MultiMonMode, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource enumConverter}}"
                                           SelectionChanged="cboMultiMonMode_SelectionChanged" />
                             </DockPanel>
                         </StackPanel>
diff --git a/RetroBar/PropertiesWindow.xaml.cs b/RetroBar/PropertiesWindow.xaml.cs
index 9b040c3c..eff21af0 100644
--- a/RetroBar/PropertiesWindow.xaml.cs
+++ b/RetroBar/PropertiesWindow.xaml.cs
@@ -119,19 +119,19 @@ private void UpdateWindowPosition()
         {
             switch (Settings.Instance.Edge)
             {
-                case (int)AppBarEdge.Left:
+                case AppBarEdge.Left:
                     Left = (_screen.Bounds.Left / _dpiScale) + _barSize + 10;
                     Top = (_screen.WorkingArea.Top / _dpiScale) + 10;
                     break;
-                case (int)AppBarEdge.Top:
+                case AppBarEdge.Top:
                     Left = (_screen.WorkingArea.Left / _dpiScale) + 10;
                     Top = (_screen.Bounds.Top / _dpiScale) + _barSize + 10;
                     break;
-                case (int)AppBarEdge.Right:
+                case AppBarEdge.Right:
                     Left = (_screen.Bounds.Right / _dpiScale) - _barSize - Width - 10;
                     Top = (_screen.WorkingArea.Top / _dpiScale) + 10;
                     break;
-                case (int)AppBarEdge.Bottom:
+                case AppBarEdge.Bottom:
                     Left = (_screen.WorkingArea.Left / _dpiScale) + 10;
                     Top = (_screen.Bounds.Bottom / _dpiScale) - _barSize - Height - 10;
                     break;
@@ -207,7 +207,7 @@ private void cboEdgeSelect_SelectionChanged(object sender, System.Windows.Contro
         {
             if (cboEdgeSelect.SelectedItem == null)
             {
-                cboEdgeSelect.SelectedValue = cboEdgeSelect.Items[Settings.Instance.Edge];
+                cboEdgeSelect.SelectedValue = cboEdgeSelect.Items[(int)Settings.Instance.Edge];
             }
         }
 
@@ -215,7 +215,7 @@ private void cboMultiMonMode_SelectionChanged(object sender, System.Windows.Cont
         {
             if (cboMultiMonMode.SelectedItem == null)
             {
-                cboMultiMonMode.SelectedValue = cboMultiMonMode.Items[Settings.Instance.MultiMonMode];
+                cboMultiMonMode.SelectedValue = cboMultiMonMode.Items[(int)Settings.Instance.MultiMonMode];
             }
         }
 
@@ -223,7 +223,7 @@ private void cboInvertIconsMode_SelectionChanged(object sender, System.Windows.C
         {
             if (cboInvertIconsMode.SelectedItem == null)
             {
-                cboInvertIconsMode.SelectedValue = cboInvertIconsMode.Items[Settings.Instance.InvertIconsMode];
+                cboInvertIconsMode.SelectedValue = cboInvertIconsMode.Items[(int)Settings.Instance.InvertIconsMode];
             }
         }
 
diff --git a/RetroBar/RetroBar.csproj b/RetroBar/RetroBar.csproj
index 0a807728..fa66543c 100644
--- a/RetroBar/RetroBar.csproj
+++ b/RetroBar/RetroBar.csproj
@@ -49,10 +49,6 @@
     <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net480'">
-    <Reference Include="System.Configuration" />
-  </ItemGroup>
-
   <ItemGroup>
 	<Resource Include="Resources\desktop95-sm.png" />
 	<Resource Include="Resources\desktop95-lg.png" />
@@ -63,19 +59,4 @@
     <Resource Include="Resources\start9x.png" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Properties\Settings.Designer.cs">
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-
 </Project>
\ No newline at end of file
diff --git a/RetroBar/Taskbar.xaml.cs b/RetroBar/Taskbar.xaml.cs
index 5bf68d03..61994b3b 100644
--- a/RetroBar/Taskbar.xaml.cs
+++ b/RetroBar/Taskbar.xaml.cs
@@ -193,7 +193,7 @@ private void Settings_PropertyChanged(object sender, PropertyChangedEventArgs e)
             else if (e.PropertyName == "Edge")
             {
                 PeekDuringAutoHide();
-                AppBarEdge = (AppBarEdge)Settings.Instance.Edge;
+                AppBarEdge = Settings.Instance.Edge;
                 SetScreenPosition();
             }
             else if (e.PropertyName == "Language")
@@ -549,7 +549,7 @@ private void MouseDragHook_LowLevelMouseEvent(object sender, LowLevelMouseHook.L
                     AppBarEdge newEdge = DragCoordsToScreenEdge(e.HookStruct.pt.X, e.HookStruct.pt.Y);
                     if (newEdge != AppBarEdge)
                     {
-                        Settings.Instance.Edge = (int)newEdge;
+                        Settings.Instance.Edge = newEdge;
                     }
                     break;
                 case NativeMethods.WM.LBUTTONUP:
diff --git a/RetroBar/Utilities/ManagedShellLogger.cs b/RetroBar/Utilities/ManagedShellLogger.cs
index a853394d..08e19704 100644
--- a/RetroBar/Utilities/ManagedShellLogger.cs
+++ b/RetroBar/Utilities/ManagedShellLogger.cs
@@ -29,7 +29,8 @@ private void Settings_PropertyChanged(object sender, System.ComponentModel.Prope
 
         private void SetSeverity()
         {
-            ShellLogger.Severity = Settings.Instance.DebugLogging ? LogSeverity.Debug : LogSeverity.Info;
+            // Handle null settings instance in case of an error while initializing settings
+            ShellLogger.Severity = Settings.Instance?.DebugLogging == true ? LogSeverity.Debug : LogSeverity.Info;
         }
 
         private void SetupLogging()
diff --git a/RetroBar/Utilities/Settings.cs b/RetroBar/Utilities/Settings.cs
index 1cdc6d1a..116c577a 100644
--- a/RetroBar/Utilities/Settings.cs
+++ b/RetroBar/Utilities/Settings.cs
@@ -1,562 +1,445 @@
 using ManagedShell.AppBar;
-using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Configuration;
 using System.Runtime.CompilerServices;
 
 namespace RetroBar.Utilities
 {
-    public class Settings : INotifyPropertyChanged
+    internal class Settings : INotifyPropertyChanged
     {
-        public delegate void SettingsEventHandler(object sender, EventArgs args);
-        public static event SettingsEventHandler Initializing;
-        public static event SettingsEventHandler Initialized;
-        private static bool _initialized;
-
-        // For Reference
-        // https://docs.microsoft.com/en-us/dotnet/framework/wpf/data/how-to-implement-property-change-notification
-        public event PropertyChangedEventHandler PropertyChanged;
-
         private static Settings instance;
-        private bool _upgrading;
-        private readonly Properties.Settings settings;
 
-        private Settings()
+        public static Settings Instance
         {
-            settings = Properties.Settings.Default;
-            settings.PropertyChanged += Settings_PropertyChanged;
-
-            if (IsFirstRun)
+            get
             {
-                Upgrade();
+                if (instance == null)
+                {
+                    instance = _settingsManager.Settings;
+                    _isInitializing = false;
+                }
+
+                return instance;
             }
         }
 
-        private void Settings_PropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            if (_upgrading)
-                return;
-
-            // Save the planet, one property at a time.
-            Save();
-
-            // Tell the rest of the app.
-            OnNotifyPropertyChanged(e.PropertyName);
-        }
+        private static bool _isInitializing = true;
+        private static SettingsManager<Settings> _settingsManager = new SettingsManager<Settings>(new Settings());
 
+        public event PropertyChangedEventHandler PropertyChanged;
 
-        // This method is called by the Set accessor of each property.
-        // The CallerMemberName attribute that is applied to the optional propertyName
-        // parameter causes the property name of the caller to be substituted as an argument.
-        private void OnNotifyPropertyChanged([CallerMemberName] string propertyName = "")
+        // This should not be used directly! Unfortunately it must be public for JsonSerializer.
+        public Settings()
         {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+            PropertyChanged += Settings_PropertyChanged;
         }
 
-        public static Settings Instance
+        private void Settings_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            get
+            if (_isInitializing)
             {
-                if (instance == null)
-                {
-                    // add SettingsInitializing event handler
-                    // this should be where plugins can register PropertySettings with our core
-                    Initializing?.Invoke(null, new EventArgs());
-
-                    instance = new Settings();
-                    _initialized = true;
-
-                    // add SettingsInitialized event handler
-                    // This should inform the system that all PropertySettings should be added and can now be accessed safely
-                    Initialized?.Invoke(instance, new EventArgs());
-                }
-
-                return instance;
+                return;
             }
+
+            _settingsManager.Settings = this;
         }
 
-        #region Properties
-        public bool IsFirstRun
+        private void OnPropertyChanged([CallerMemberName] string propertyName = "")
         {
-            get
-            {
-                return settings.IsFirstRun;
-            }
-            set
-            {
-                if (settings.IsFirstRun != value)
-                {
-                    settings.IsFirstRun = value;
-                }
-            }
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
+        #region Properties
+        private string _language = "System";
         public string Language
         {
             get
             {
-                return settings.Language;
+                return _language;
             }
             set
             {
-                if (settings.Language != value)
+                if (_language != value)
                 {
-                    settings.Language = value;
+                    _language = value;
+                    OnPropertyChanged();
                 }
             }
         }
 
+        private string _theme = "Windows 95-98";
         public string Theme
         {
             get
             {
-                return settings.Theme;
+                return _theme;
             }
             set
             {
-                if (settings.Theme != value)
+                if (_theme != value)
                 {
-                    settings.Theme = value;
+                    _theme = value;
+                    OnPropertyChanged();
                 }
             }
         }
 
+        private bool _showClock = true;
         public bool ShowClock
         {
             get
             {
-                return settings.ShowClock;
+                return _showClock;
             }
             set
             {
-                if (settings.ShowClock != value)
+                if (_showClock != value)
                 {
-                    settings.ShowClock = value;
+                    _showClock = value;
+                    OnPropertyChanged();
                 }
             }
         }
 
+        private bool _showDesktopButton = false;
         public bool ShowDesktopButton
         {
             get
             {
-                return settings.ShowDesktopButton;
+                return _showDesktopButton;
             }
             set
             {
-                if (settings.ShowDesktopButton != value)
+                if (_showDesktopButton != value)
                 {
-                    settings.ShowDesktopButton = value;
+                    _showDesktopButton = value;
+                    OnPropertyChanged();
                 }
             }
         }
 
+        private bool _peekAtDesktop = false;
         public bool PeekAtDesktop
         {
             get
             {
-                return settings.PeekAtDesktop;
+                return _peekAtDesktop;
             }
             set
             {
-                if (settings.PeekAtDesktop != value)
+                if (_peekAtDesktop != value)
                 {
-                    settings.PeekAtDesktop = value;
+                    _peekAtDesktop = value;
+                    OnPropertyChanged();
                 }
             }
         }
 
+        private bool _showMultiMon = false;
         public bool ShowMultiMon
         {
             get
             {
-                return settings.ShowMultiMon;
+                return _showMultiMon;
             }
             set
             {
-                if (settings.ShowMultiMon != value)
+                if (_showMultiMon != value)
                 {
-                    settings.ShowMultiMon = value;
+                    _showMultiMon = value;
+                    OnPropertyChanged();
                 }
             }
         }
 
+        private bool _showQuickLaunch = true;
         public bool ShowQuickLaunch
         {
             get
             {
-                return settings.ShowQuickLaunch;
+                return _showQuickLaunch;
             }
             set
             {
-                if (settings.ShowQuickLaunch != value)
+                if (_showQuickLaunch != value)
                 {
-                    settings.ShowQuickLaunch = value;
+                    _showQuickLaunch = value;
+                    OnPropertyChanged();
                 }
             }
         }
 
+        private string _quickLaunchPath = "%appdata%\\Microsoft\\Internet Explorer\\Quick Launch\\User Pinned\\TaskBar";
         public string QuickLaunchPath
         {
             get
             {
-                return settings.QuickLaunchPath;
+                return _quickLaunchPath;
             }
             set
             {
-                if (settings.QuickLaunchPath != value)
+                if (_quickLaunchPath != value)
                 {
-                    settings.QuickLaunchPath = value;
+                    _quickLaunchPath = value;
+                    OnPropertyChanged();
                 }
             }
         }
 
+        private bool _collapseNotifyIcons = false;
         public bool CollapseNotifyIcons
         {
             get
             {
-                return settings.CollapseNotifyIcons;
+                return _collapseNotifyIcons;
             }
             set
             {
-                if (settings.CollapseNotifyIcons != value)
+                if (_collapseNotifyIcons != value)
                 {
-                    settings.CollapseNotifyIcons = value;
+                    _collapseNotifyIcons = value;
+                    OnPropertyChanged();
                 }
             }
         }
 
+        private string[] _pinnedNotifyIcons = { "7820ae76-23e3-4229-82c1-e41cb67d5b9c", "7820ae75-23e3-4229-82c1-e41cb67d5b9c", "7820ae74-23e3-4229-82c1-e41cb67d5b9c", "7820ae73-23e3-4229-82c1-e41cb67d5b9c" };
         public string[] PinnedNotifyIcons
         {
             get
             {
-                return parseConcatString(settings.PinnedNotifyIcons, '|').ToArray();
+                return _pinnedNotifyIcons;
             }
             set
             {
-                string val = concatStringList(value, '|');
-                if (settings.PinnedNotifyIcons != val)
+                if (_pinnedNotifyIcons != value)
                 {
-                    settings.PinnedNotifyIcons = val;
+                    _pinnedNotifyIcons = value;
+                    OnPropertyChanged();
                 }
             }
         }
 
+        private bool _allowFontSmoothing = false;
         public bool AllowFontSmoothing
         {
             get
             {
-                return settings.AllowFontSmoothing;
+                return _allowFontSmoothing;
             }
             set
             {
-                if (settings.AllowFontSmoothing != value)
+                if (_allowFontSmoothing != value)
                 {
-                    settings.AllowFontSmoothing = value;
+                    _allowFontSmoothing = value;
+                    OnPropertyChanged();
                 }
             }
         }
 
+        private bool _useSoftwareRendering = false;
         public bool UseSoftwareRendering
         {
             get
             {
-                return settings.UseSoftwareRendering;
+                return _useSoftwareRendering;
             }
             set
             {
-                if (settings.UseSoftwareRendering != value)
+                if (_useSoftwareRendering != value)
                 {
-                    settings.UseSoftwareRendering = value;
+                    _useSoftwareRendering = value;
+                    OnPropertyChanged();
                 }
             }
         }
 
+        private bool _middleMouseToClose = false;
         public bool MiddleMouseToClose
         {
             get
             {
-                return settings.MiddleMouseToClose;
+                return _middleMouseToClose;
             }
             set
             {
-                if (settings.MiddleMouseToClose != value)
+                if (_middleMouseToClose != value)
                 {
-                    settings.MiddleMouseToClose = value;
+                    _middleMouseToClose = value;
+                    OnPropertyChanged();
                 }
             }
         }
 
-        /// <summary>
-        /// 0 = Left
-        /// 1 = Top
-        /// 2 = Right
-        /// 3 = Bottom
-        /// </summary>
-        public int Edge
+        private AppBarEdge _edge = AppBarEdge.Bottom;
+        public AppBarEdge Edge
         {
             get
             {
-                if (settings.Edge >= 0 && settings.Edge <= 3)
-                {
-                    return settings.Edge;
-                }
-
-                return (int)AppBarEdge.Bottom;
+                return _edge;
             }
             set
             {
-                if (settings.Edge != value && value >= 0 && value <= 3)
+                if (_edge != value)
                 {
-                    settings.Edge = value;
+                    _edge = value;
+                    OnPropertyChanged();
                 }
             }
         }
 
-        private List<string> _quickLaunchOrder;
+        private List<string> _quickLaunchOrder = new List<string>();
 
         public List<string> QuickLaunchOrder
         {
             get
             {
-                if (_quickLaunchOrder == null)
-                {
-                    _quickLaunchOrder = parseConcatString(settings.QuickLaunchOrder, '|');
-                }
-
                 return _quickLaunchOrder;
             }
             set
             {
-                _quickLaunchOrder = value;
-
-                string val = concatStringList(value, '|');
-                if (settings.QuickLaunchOrder != val)
+                if (_quickLaunchOrder != value)
                 {
-                    settings.QuickLaunchOrder = val;
+                    _quickLaunchOrder = value;
+                    OnPropertyChanged();
                 }
             }
         }
 
+        private bool _showTaskThumbnails = false;
         public bool ShowTaskThumbnails
         {
             get
             {
-                return settings.ShowTaskThumbnails;
+                return _showTaskThumbnails;
             }
             set
             {
-                if (settings.ShowTaskThumbnails != value)
+                if (_showTaskThumbnails != value)
                 {
-                    settings.ShowTaskThumbnails = value;
+                    _showTaskThumbnails = value;
+                    OnPropertyChanged();
                 }
             }
         }
 
-        /// <summary>
-        /// 0 = All taskbars
-        /// 1 = Same taskbar as window
-        /// 2 = Same taskbar as window and primary taskbar
-        /// </summary>
-        public int MultiMonMode
+        private MultiMonOption _multiMonMode = MultiMonOption.AllTaskbars;
+        public MultiMonOption MultiMonMode
         {
             get
             {
-                if (settings.MultiMonMode >= 0 && settings.MultiMonMode <= 2)
-                {
-                    return settings.MultiMonMode;
-                }
-
-                return 0;
+                return _multiMonMode;
             }
             set
             {
-                if (settings.MultiMonMode != value && value >= 0 && value <= 2)
+                if (_multiMonMode != value)
                 {
-                    settings.MultiMonMode = value;
+                    _multiMonMode = value;
+                    OnPropertyChanged();
                 }
             }
         }
 
+        private double _taskbarScale = 1.0;
         public double TaskbarScale
         {
             get
             {
-                return settings.TaskbarScale;
+                return _taskbarScale;
             }
             set
             {
-                if (settings.TaskbarScale != value)
+                if (_taskbarScale != value)
                 {
-                    settings.TaskbarScale = value;
+                    _taskbarScale = value;
+                    OnPropertyChanged();
                 }
             }
         }
 
+        private bool _debugLogging = false;
         public bool DebugLogging
         {
             get
             {
-                return settings.DebugLogging;
+                return _debugLogging;
             }
             set
             {
-                if (settings.DebugLogging != value)
+                if (_debugLogging != value)
                 {
-                    settings.DebugLogging = value;
+                    _debugLogging = value;
+                    OnPropertyChanged();
                 }
             }
         }
 
+        private bool _autoHide = false;
         public bool AutoHide
         {
             get
             {
-                return settings.AutoHide;
+                return _autoHide;
             }
             set
             {
-                if (settings.AutoHide != value)
+                if (_autoHide != value)
                 {
-                    settings.AutoHide = value;
+                    _autoHide = value;
+                    OnPropertyChanged();
                 }
             }
         }
 
+        private bool _lockTaskbar = false;
         public bool LockTaskbar
         {
             get
             {
-                return settings.LockTaskbar;
+                return _lockTaskbar;
             }
             set
             {
-                if (settings.LockTaskbar != value)
+                if (_lockTaskbar != value)
                 {
-                    settings.LockTaskbar = value;
+                    _lockTaskbar = value;
+                    OnPropertyChanged();
                 }
             }
         }
 
-        /// <summary>
-        /// 0 = When needed by theme
-        /// 1 = Always
-        /// 2 = Never
-        /// </summary>
-        public int InvertIconsMode
+        private InvertIconsOption _invertIconsMode = InvertIconsOption.WhenNeededByTheme;
+        public InvertIconsOption InvertIconsMode
         {
             get
             {
-                if (settings.InvertIconsMode >= 0 && settings.InvertIconsMode <= 2)
-                {
-                    return settings.InvertIconsMode;
-                }
-
-                return 0;
+                return _invertIconsMode;
             }
             set
             {
-                if (settings.InvertIconsMode != value && value >= 0 && value <= 2)
+                if (_invertIconsMode != value)
                 {
-                    settings.InvertIconsMode = value;
+                    _invertIconsMode = value;
+                    OnPropertyChanged();
                 }
             }
         }
         #endregion
 
-        #region Helpers
-        private List<string> parseConcatString(string concat, char separator)
+        #region Enums
+        public enum InvertIconsOption
         {
-            List<string> parsed = new List<string>();
-
-            foreach (string key in concat.Split(separator))
-            {
-                if (!string.IsNullOrEmpty(key))
-                {
-                    parsed.Add(key);
-                }
-            }
-
-            return parsed;
+            WhenNeededByTheme,
+            Always,
+            Never
         }
 
-        private string concatStringList(IEnumerable<string> list, char separator)
+        public enum MultiMonOption
         {
-            string concatenated = "";
-
-            foreach (string key in list)
-            {
-                if (!string.IsNullOrEmpty(concatenated))
-                {
-                    concatenated += separator.ToString();
-                }
-
-                concatenated += key;
-            }
-
-            return concatenated;
+            AllTaskbars,
+            SameAsWindow,
+            SameAsWindowAndPrimary
         }
         #endregion
-
-        public void Save()
-        {
-            settings.Save();
-        }
-
-        public void Upgrade()
-        {
-            _upgrading = true;
-            settings.Upgrade();
-            _upgrading = false;
-
-            if (IsFirstRun) IsFirstRun = false;
-        }
-
-        public object this[string propertyName]
-        {
-            get
-            {
-                return settings[propertyName];
-            }
-            set
-            {
-                settings[propertyName] = value;
-            }
-        }
-
-        public bool Exists(string name)
-        {
-            return settings.Properties[name] != null;
-        }
-
-        public void AddPropertySetting(string name, Type type, object defaultValue)
-        {
-            // Only allow settings to be added during initialization
-            if (!_initialized)
-            {
-                string providerName = "LocalFileSettingsProvider";
-
-                SettingsAttributeDictionary attributes = new SettingsAttributeDictionary();
-                UserScopedSettingAttribute attr = new UserScopedSettingAttribute();
-                attributes.Add(attr.TypeId, attr);
-
-                var prop = new SettingsProperty(
-                    new SettingsProperty(name
-                    , type
-                    , settings.Providers[providerName]
-                    , false
-                    , defaultValue
-                    , SettingsSerializeAs.String
-                    , attributes
-                    , false
-                    , false));
-
-                settings.Properties.Add(prop);
-                settings.Save();
-                settings.Reload();
-            }
-        }
-
     }
-}
\ No newline at end of file
+}
diff --git a/RetroBar/Utilities/SettingsManager.cs b/RetroBar/Utilities/SettingsManager.cs
new file mode 100644
index 00000000..5004b980
--- /dev/null
+++ b/RetroBar/Utilities/SettingsManager.cs
@@ -0,0 +1,84 @@
+using ManagedShell.Common.Helpers;
+using ManagedShell.Common.Logging;
+using System;
+using System.ComponentModel;
+using System.IO;
+using System.Runtime.CompilerServices;
+using System.Text.Json;
+
+namespace RetroBar.Utilities
+{
+    public class SettingsManager<T> : INotifyPropertyChanged
+    {
+        private string _fileName = $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}\\RetroBar\\settings.json";
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        private T _settings;
+        public T Settings
+        {
+            get { return _settings; }
+
+            set
+            {
+                _settings = value;
+                OnPropertyChanged();
+                saveToFile();
+            }
+        }
+
+        public SettingsManager(T defaultSettings)
+        {
+            _settings = defaultSettings;
+
+            if (!loadFromFile())
+            {
+                ShellLogger.Info("SettingsManager: Using default settings");
+            }
+        }
+
+        private bool loadFromFile()
+        {
+            try
+            {
+                if (!ShellHelper.Exists(_fileName))
+                {
+                    return false;
+                }
+
+                string jsonString = File.ReadAllText(_fileName);
+                _settings = JsonSerializer.Deserialize<T>(jsonString);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ShellLogger.Error($"SettingsManager: Error loading settings file: {ex.Message}");
+                return false;
+            }
+        }
+
+        private void saveToFile()
+        {
+            JsonSerializerOptions options = new JsonSerializerOptions()
+            {
+                IgnoreReadOnlyProperties = true,
+                WriteIndented = true
+            };
+
+            try
+            {
+                string jsonString = JsonSerializer.Serialize(Settings, options);
+                File.WriteAllText(_fileName, jsonString);
+            }
+            catch (Exception ex)
+            {
+                ShellLogger.Error($"SettingsManager: Error saving settings file: {ex.Message}");
+            }
+        }
+
+        private void OnPropertyChanged([CallerMemberName] string propertyName = "")
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+    }
+}
diff --git a/RetroBar/Utilities/WindowManager.cs b/RetroBar/Utilities/WindowManager.cs
index 13ed5d5b..3b0e37d8 100644
--- a/RetroBar/Utilities/WindowManager.cs
+++ b/RetroBar/Utilities/WindowManager.cs
@@ -138,7 +138,7 @@ private void openTaskbars()
         private void openTaskbar(AppBarScreen screen)
         {
             ShellLogger.Debug($"WindowManager: Opening taskbar on screen {screen.DeviceName}");
-            Taskbar taskbar = new Taskbar(this, _shellManager, _startMenuMonitor, _updater, screen, (AppBarEdge)Settings.Instance.Edge, Settings.Instance.AutoHide ? AppBarMode.AutoHide : AppBarMode.Normal);
+            Taskbar taskbar = new Taskbar(this, _shellManager, _startMenuMonitor, _updater, screen, Settings.Instance.Edge, Settings.Instance.AutoHide ? AppBarMode.AutoHide : AppBarMode.Normal);
             taskbar.Show();
 
             _taskbars.Add(taskbar);