sync fork & remove merge issues

config/themes.json

@@ -1,19 +1,16 @@
 {
-  "_default": {
+    "shared":{
         "CustomDialogFontSize":       "12",
         "CustomDialogFontSizeHeader": "14",
         "CustomDialogIconSize":       "25",
         "CustomDialogWidth":          "400",
         "CustomDialogHeight":         "200",
-
         "FontSize":         "12",
         "FontFamily":       "Arial",
         "FontSizeHeading":  "16",
         "HeaderFontFamily": "Consolas, Monaco",
-
         "CheckBoxBulletDecoratorSize": "14",
         "CheckBoxMargin": "15,0,0,2",
-
         "TabContentMargin":       "5",
         "TabButtonFontSize":      "14",
         "TabButtonWidth":         "100",
@@ -23,62 +20,25 @@
         "IconButtonSize":   "35",
         "SettingsIconFontSize":   "18",
         "CloseIconFontSize":      "18",
-
         "MicroWinLogoSize": "10",
         "MicrowinCheckBoxMargin": "-10,5,0,0",
-
-    "ProgressBarForegroundColor": "#2e77ff",
-    "ProgressBarBackgroundColor": "Transparent",
-    "ProgressBarTextColor": "#232629",
-
-    "ComboBoxBackgroundColor": "#F7F7F7",
-    "LabelboxForegroundColor": "#232629",
-    "MainForegroundColor": "#232629",
-    "MainBackgroundColor": "#F7F7F7",
-    "LabelBackgroundColor": "#F7F7F7",
-    "LinkForegroundColor": "#232629",
-    "LinkHoverForegroundColor": "#232629",
         "GroupBorderBackgroundColor":  "#232629",
-    "ComboBoxForegroundColor": "#232629",
-    "ScrollBarBackgroundColor": "#4A4D52",
-    "ScrollBarHoverColor": "#2E3135",
-    "ScrollBarDraggingColor": "#3A3D42",
-
         "ButtonFontSize":   "12",
         "ButtonFontFamily": "Arial",
         "ButtonWidth":      "200",
         "ButtonHeight":     "25",
         "ConfigTabButtonFontSize":      "16",
-
         "SearchBarWidth":               "200",
         "SearchBarHeight":              "25",
         "SearchBarTextBoxFontSize":     "12",
         "SearchBarClearButtonFontSize": "14",
-
-    "ButtonInstallBackgroundColor": "#F7F7F7",
-    "ButtonTweaksBackgroundColor": "#F7F7F7",
-    "ButtonConfigBackgroundColor": "#F7F7F7",
-    "ButtonUpdatesBackgroundColor": "#F7F7F7",
-    "ButtonInstallForegroundColor": "#232629",
-    "ButtonTweaksForegroundColor": "#232629",
-    "ButtonConfigForegroundColor": "#232629",
-    "ButtonUpdatesForegroundColor": "#232629",
-    "ButtonBackgroundColor": "#F5F5F5",
-    "ButtonBackgroundPressedColor": "#1A1A1A",
         "CheckboxMouseOverColor": "#999999",
-    "ButtonBackgroundMouseoverColor": "#C2C2C2",
-    "ButtonBackgroundSelectedColor": "#F0F0F0",
-    "ButtonForegroundColor": "#232629",
-    "ToggleButtonOnColor": "#2e77ff",
-
         "ButtonBorderThickness":  "1",
         "ButtonMargin":  "1",
-    "ButtonCornerRadius": "2",
+        "ButtonCornerRadius": "2"
-    "BorderColor": "#232629",
-    "BorderOpacity": "0.2",
-    "ShadowPulse": "Forever"
     },
-  "Classic": {
+    "Light": {
+        "ComboBoxForegroundColor":  "#232629",
         "ComboBoxBackgroundColor":  "#F7F7F7",
         "LabelboxForegroundColor":  "#232629",
         "MainForegroundColor":  "#232629",
@@ -86,12 +46,11 @@
         "LabelBackgroundColor":  "#F7F7F7",
         "LinkForegroundColor":  "#232629",
         "LinkHoverForegroundColor":  "#232629",
-    "GroupBorderBackgroundColor": "#232629",
-    "ComboBoxForegroundColor": "#232629",
         "ScrollBarBackgroundColor": "#4A4D52",
-    "ScrollBarHoverColor": "#2E3135",
-    "ScrollBarDraggingColor": "#3A3D42",
 
+        "ProgressBarForegroundColor": "#2e77ff",
+        "ProgressBarBackgroundColor": "Transparent",
+        "ProgressBarTextColor": "#232629",
         "ButtonInstallBackgroundColor":  "#F7F7F7",
         "ButtonTweaksBackgroundColor":  "#F7F7F7",
         "ButtonConfigBackgroundColor":  "#F7F7F7",
@@ -102,29 +61,28 @@
         "ButtonUpdatesForegroundColor":  "#232629",
         "ButtonBackgroundColor":  "#F5F5F5",
         "ButtonBackgroundPressedColor":  "#1A1A1A",
-    "CheckboxMouseOverColor": "#999999",
         "ButtonBackgroundMouseoverColor":  "#C2C2C2",
         "ButtonBackgroundSelectedColor":  "#F0F0F0",
         "ButtonForegroundColor":  "#232629",
-    "ToggleButtonOnColor": "#2e77ff"
+        "ToggleButtonOnColor":  "#2e77ff",
+        "BorderColor": "#232629",
+        "BorderOpacity": "0.2"
+
     },
-  "Matrix": {
+    "Dark": {
+        "ComboBoxForegroundColor":  "#1e3747",
         "ComboBoxBackgroundColor":  "#232629",
-    "LabelboxForegroundColor": "#f7f7f7",
+        "LabelboxForegroundColor":  "#0567ff",
         "MainForegroundColor":  "#F7F7F7",
-    "MainBackgroundColor": "#232629",
+        "MainBackgroundColor":  "#121212",
-    "LabelBackgroundColor": "#232629",
+        "LabelBackgroundColor":  "#121212",
         "LinkForegroundColor":  "#add8e6",
         "LinkHoverForegroundColor":  "#F7F7F7",
-    "ComboBoxForegroundColor": "#81a1c1",
         "ScrollBarBackgroundColor": "#2E3135",
-    "ScrollBarHoverColor": "#3B4252",
-    "ScrollBarDraggingColor": "#5E81AC",
 
         "ProgressBarForegroundColor": "#222222",
         "ProgressBarBackgroundColor": "Transparent",
         "ProgressBarTextColor": "#cccccc",
-
         "ButtonInstallBackgroundColor":  "#222222",
         "ButtonTweaksBackgroundColor":  "#333333",
         "ButtonConfigBackgroundColor":  "#444444",
@@ -139,43 +97,7 @@
         "ButtonBackgroundSelectedColor":  "#5E81AC",
         "ButtonForegroundColor":  "#F7F7F7",
         "ToggleButtonOnColor":  "#2e77ff",
-
+        "BorderColor": "#2F373D",
-    "BorderColor": "#0060CC",
+        "BorderOpacity": "0.2"
-    "BorderOpacity": "0.2",
-    "ShadowPulse": "0:0:3"
-  },
-  "Dark": {
-    "ComboBoxBackgroundColor": "#1e3747",
-    "LabelboxForegroundColor": "#0567ff",
-    "MainForegroundColor": "#F7F7F7",
-    "MainBackgroundColor": "#121212",
-    "LabelBackgroundColor": "#121212",
-    "LinkForegroundColor": "#add8e6",
-    "LinkHoverForegroundColor": "#F7F7F7",
-    "ComboBoxForegroundColor": "#f7f7f7",
-    "ScrollBarBackgroundColor": "#2E3135",
-    "ScrollBarHoverColor": "#3B4252",
-    "ScrollBarDraggingColor": "#5E81AC",
-
-    "ProgressBarForegroundColor": "#222222",
-    "ProgressBarBackgroundColor": "Transparent",
-    "ProgressBarTextColor": "#cccccc",
-
-    "ButtonInstallBackgroundColor": "#222222",
-    "ButtonTweaksBackgroundColor": "#333333",
-    "ButtonConfigBackgroundColor": "#444444",
-    "ButtonUpdatesBackgroundColor": "#555555",
-    "ButtonInstallForegroundColor": "#F7F7F7",
-    "ButtonTweaksForegroundColor": "#F7F7F7",
-    "ButtonConfigForegroundColor": "#F7F7F7",
-    "ButtonUpdatesForegroundColor": "#F7F7F7",
-    "ButtonBackgroundColor": "#1E3747",
-    "ButtonBackgroundPressedColor": "#00CFFF",
-    "ButtonBackgroundMouseoverColor": "#5E81AC",
-    "ButtonBackgroundSelectedColor": "#5E81AC",
-    "ButtonForegroundColor": "#F7F7F7",
-    "ToggleButtonOnColor": "#2e77ff",
-
-    "BorderColor": "#2F373D"
     }
 }

config/tweaks.json

@@ -2767,6 +2767,48 @@
     ],
     "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveOnedrive"
   },
+  "WPFTweaksRazerBlock": {
+    "Content": "Block Razer Software Installs",
+    "Description": "Blocks ALL Razer Software installations. The hardware works fine without any software.",
+    "category": "z__Advanced Tweaks - CAUTION",
+    "panel": "1",
+    "Order": "a031_",
+    "registry": [
+      {
+        "Path": "HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\DriverSearching",
+        "Name": "SearchOrderConfig",
+        "Value": "0",
+        "OriginalValue": "1",
+        "Type": "DWord"
+      },
+      {
+        "Path": "HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Device Installer",
+        "Name": "DisableCoInstallers",
+        "Value": "1",
+        "OriginalValue": "0",
+        "Type": "DWord"
+      }
+    ],
+    "InvokeScript": [
+      "
+          $RazerPath = \"C:\\Windows\\Installer\\Razer\"
+          Remove-Item $RazerPath -Recurse -Force
+          New-Item -Path \"C:\\Windows\\Installer\\\" -Name \"Razer\" -ItemType \"directory\"
+          $Acl = Get-Acl $RazerPath
+          $Ar = New-Object System.Security.AccessControl.FileSystemAccessRule(\"NT AUTHORITY\\SYSTEM\",\"Write\",\"ContainerInherit,ObjectInherit\",\"None\",\"Deny\")
+          $Acl.SetAccessRule($Ar)
+          Set-Acl $RazerPath $Acl
+      "
+    ],
+    "UndoScript": [
+      "
+          $RazerPath = \"C:\\Windows\\Installer\\Razer\"
+          Remove-Item $RazerPath -Recurse -Force
+          New-Item -Path \"C:\\Windows\\Installer\\\" -Name \"Razer\" -ItemType \"directory\"
+      "
+    ],
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/RazerBlock"
+  },
   "WPFTweaksDisableNotifications": {
     "Content": "Disable Notification Tray/Calendar",
     "Description": "Disables all Notifications INCLUDING Calendar",

functions/private/Get-WinUtilToggleStatus.ps1

@@ -16,136 +16,72 @@ Function Get-WinUtilToggleStatus {
     if($ToggleSwitch -eq "WPFToggleDarkMode") {
         $app = (Get-ItemProperty -path 'HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize').AppsUseLightTheme
         $system = (Get-ItemProperty -path 'HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize').SystemUsesLightTheme
-        if($app -eq 0 -and $system -eq 0) {
+        return $app -eq 0 -and $system -eq 0
-            return $true
-        } else {
-            return $false
-        }
     }
     if($ToggleSwitch -eq "WPFToggleBingSearch") {
         $bingsearch = (Get-ItemProperty -path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Search').BingSearchEnabled
-        if($bingsearch -eq 0) {
+        return $bingsearch -ne 0
-            return $false
-        } else {
-            return $true
-        }
     }
     if($ToggleSwitch -eq "WPFToggleNumLock") {
         $numlockvalue = (Get-ItemProperty -path 'HKCU:\Control Panel\Keyboard').InitialKeyboardIndicators
-        if($numlockvalue -eq 2) {
+        return $numlockvalue -eq 2
-            return $true
-        } else {
-            return $false
-        }
     }
     if($ToggleSwitch -eq "WPFToggleVerboseLogon") {
         $VerboseStatusvalue = (Get-ItemProperty -path 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System').VerboseStatus
-        if($VerboseStatusvalue -eq 1) {
+        return $VerboseStatusvalue -eq 1
-            return $true
-        } else {
-            return $false
-        }
     }
     if($ToggleSwitch -eq "WPFToggleShowExt") {
         $hideextvalue = (Get-ItemProperty -path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced').HideFileExt
-        if($hideextvalue -eq 0) {
+        return $hideextvalue -eq 0
-            return $true
-        } else {
-            return $false
-        }
     }
     if($ToggleSwitch -eq "WPFToggleSnapWindow") {
         $hidesnap = (Get-ItemProperty -path 'HKCU:\Control Panel\Desktop').WindowArrangementActive
-        if($hidesnap -eq 0) {
+        return $hidesnap -ne 0
-            return $false
-        } else {
-            return $true
-        }
     }
     if($ToggleSwitch -eq "WPFToggleSnapFlyout") {
         $hidesnap = (Get-ItemProperty -path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced').EnableSnapAssistFlyout
-        if($hidesnap -eq 0) {
+        return $hidesnap -ne 0
-            return $false
-        } else {
-            return $true
-        }
     }
     if($ToggleSwitch -eq "WPFToggleSnapSuggestion") {
         $hidesnap = (Get-ItemProperty -path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced').SnapAssist
-        if($hidesnap -eq 0) {
+        return $hidesnap -ne 0
-            return $false
-        } else {
-            return $true
-        }
     }
     if($ToggleSwitch -eq "WPFToggleMouseAcceleration") {
         $MouseSpeed = (Get-ItemProperty -path 'HKCU:\Control Panel\Mouse').MouseSpeed
         $MouseThreshold1 = (Get-ItemProperty -path 'HKCU:\Control Panel\Mouse').MouseThreshold1
         $MouseThreshold2 = (Get-ItemProperty -path 'HKCU:\Control Panel\Mouse').MouseThreshold2
 
-        if($MouseSpeed -eq 1 -and $MouseThreshold1 -eq 6 -and $MouseThreshold2 -eq 10) {
+        return $MouseSpeed -eq 1 -and $MouseThreshold1 -eq 6 -and $MouseThreshold2 -eq 10
-            return $true
-        } else {
-            return $false
-        }
     }
     if($ToggleSwitch -eq "WPFToggleTaskbarSearch") {
         $SearchButton = (Get-ItemProperty -path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Search").SearchboxTaskbarMode
-        if($SearchButton -eq 0) {
+        return $SearchButton -ne 0
-            return $false
-        } else {
-            return $true
-        }
     }
     if ($ToggleSwitch -eq "WPFToggleStickyKeys") {
         $StickyKeys = (Get-ItemProperty -path 'HKCU:\Control Panel\Accessibility\StickyKeys').Flags
-        if($StickyKeys -eq 58) {
+        return $StickyKeys -ne 58
-            return $false
-        } else {
-            return $true
-        }
     }
     if ($ToggleSwitch -eq "WPFToggleTaskView") {
         $TaskView = (Get-ItemProperty -path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced').ShowTaskViewButton
-        if($TaskView -eq 0) {
+        return $TaskView -ne 0
-            return $false
-        } else {
-            return $true
-        }
     }
 
     if ($ToggleSwitch -eq "WPFToggleHiddenFiles") {
         $HiddenFiles = (Get-ItemProperty -path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced').Hidden
-        if($HiddenFiles -eq 0) {
+        return $HiddenFiles -ne 0
-            return $false
-        } else {
-            return $true
-        }
     }
 
     if ($ToggleSwitch -eq "WPFToggleTaskbarWidgets") {
         $TaskbarWidgets = (Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced").TaskBarDa
-        if($TaskbarWidgets -eq 0) {
+        return $TaskbarWidgets -ne 0
-            return $false
-        } else {
-            return $true
-        }
     }
     if ($ToggleSwitch -eq "WPFToggleTaskbarAlignment") {
         $TaskbarAlignment = (Get-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced").TaskbarAl
-        if($TaskbarAlignment -eq 0) {
+        return $TaskbarAlignment -ne 0
-            return $false
-        } else {
-            return $true
-        }
     }
     if ($ToggleSwitch -eq "WPFToggleDetailedBSoD") {
         $DetailedBSoD1 = (Get-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\CrashControl').DisplayParameters
         $DetailedBSoD2 = (Get-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\CrashControl').DisableEmoticon
-        if (($DetailedBSoD1 -eq 0) -or ($DetailedBSoD2 -eq 0) -or !$DetailedBSoD1 -or !$DetailedBSoD2) {
+        return !(($DetailedBSoD1 -eq 0) -or ($DetailedBSoD2 -eq 0) -or !$DetailedBSoD1 -or !$DetailedBSoD2)
-            return $false
-        } else {
-            return $true
-        }
     }
 }

functions/private/Invoke-WinUtilDarkMode.ps1

@@ -21,6 +21,7 @@ Function Invoke-WinUtilDarkMode {
         $Path = "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize"
         Set-ItemProperty -Path $Path -Name AppsUseLightTheme -Value $DarkMoveValue
         Set-ItemProperty -Path $Path -Name SystemUsesLightTheme -Value $DarkMoveValue
+        Invoke-WinUtilExplorerRefresh
     } catch [System.Security.SecurityException] {
         Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
     } catch [System.Management.Automation.ItemNotFoundException] {

functions/private/Invoke-WinUtilExplorerRefresh.ps1

@@ -0,0 +1,33 @@
+function Invoke-WinUtilExplorerRefresh {
+    <#
+    .SYNOPSIS
+        Refreshes the Windows Explorer
+    #>
+
+    Invoke-WPFRunspace -DebugPreference $DebugPreference -ScriptBlock {
+        # Send the WM_SETTINGCHANGE message to all windows
+        Add-Type -TypeDefinition @"
+using System;
+using System.Runtime.InteropServices;
+public class Win32 {
+    [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = false)]
+    public static extern IntPtr SendMessageTimeout(
+        IntPtr hWnd,
+        uint Msg,
+        IntPtr wParam,
+        string lParam,
+        uint fuFlags,
+        uint uTimeout,
+        out IntPtr lpdwResult);
+}
+"@
+
+        $HWND_BROADCAST = [IntPtr]0xffff
+        $WM_SETTINGCHANGE = 0x1A
+        $SMTO_ABORTIFHUNG = 0x2
+        $timeout = 100
+
+        # Send the broadcast message to all windows
+        [Win32]::SendMessageTimeout($HWND_BROADCAST, $WM_SETTINGCHANGE, [IntPtr]::Zero, "ImmersiveColorSet", $SMTO_ABORTIFHUNG, $timeout, [ref]([IntPtr]::Zero))
+    }
+}

functions/private/Invoke-WinUtilMicroWin-Helper.ps1

@@ -47,6 +47,7 @@ function Remove-Features() {
             $_.FeatureName -NotLike "*NetFx*" -AND
             $_.FeatureName -NotLike "*Media*" -AND
             $_.FeatureName -NotLike "*NFS*" -AND
+            $_.FeatureName -NotLike "*SearchEngine*" -AND
             $_.State -ne "Disabled"
         }
 

functions/private/Invoke-WinutilThemeChange.ps1

@@ -0,0 +1,180 @@
+function Invoke-WinutilThemeChange {
+    <#
+    .SYNOPSIS
+        Toggles between light and dark themes for a Windows utility application.
+
+    .DESCRIPTION
+        This function toggles the theme of the user interface between 'Light' and 'Dark' modes,
+        modifying various UI elements such as colors, margins, corner radii, font families, etc.
+        If the '-init' switch is used, it initializes the theme based on the system's current dark mode setting.
+
+    .PARAMETER init
+        A switch parameter. If set to $true, the function initializes the theme based on the system’s current dark mode setting.
+
+    .EXAMPLE
+        Invoke-WinutilThemeChange
+        # Toggles the theme between 'Light' and 'Dark'.
+
+    .EXAMPLE
+        Invoke-WinutilThemeChange -init
+        # Initializes the theme based on the system's dark mode and applies the shared theme.
+    #>
+    param (
+        [switch]$init = $false,
+        [string]$theme
+    )
+
+    function Set-WinutilTheme {
+        <#
+        .SYNOPSIS
+            Applies the specified theme to the application's user interface.
+
+        .DESCRIPTION
+            This internal function applies the given theme by setting the relevant properties
+            like colors, font families, corner radii, etc., in the UI. It uses the
+            'Set-ThemeResourceProperty' helper function to modify the application's resources.
+
+        .PARAMETER currentTheme
+            The name of the theme to be applied. Common values are "Light", "Dark", or "shared".
+        #>
+        param (
+            [string]$currentTheme
+        )
+
+        function Set-ThemeResourceProperty {
+            <#
+            .SYNOPSIS
+                Sets a specific UI property in the application's resources.
+
+            .DESCRIPTION
+                This helper function sets a property (e.g., color, margin, corner radius) in the
+                application's resources, based on the provided type and value. It includes
+                error handling to manage potential issues while setting a property.
+
+            .PARAMETER Name
+                The name of the resource property to modify (e.g., "MainBackgroundColor", "ButtonBackgroundMouseoverColor").
+
+            .PARAMETER Value
+                The value to assign to the resource property (e.g., "#FFFFFF" for a color).
+
+            .PARAMETER Type
+                The type of the resource, such as "ColorBrush", "CornerRadius", "GridLength", or "FontFamily".
+            #>
+            param($Name, $Value, $Type)
+            try {
+                # Set the resource property based on its type
+                $sync.Form.Resources[$Name] = switch ($Type) {
+                    "ColorBrush" { [Windows.Media.SolidColorBrush]::new($Value) }
+                    "Color" {
+                        # Convert hex string to RGB values
+                        $hexColor = $Value.TrimStart("#")
+                        $r = [Convert]::ToInt32($hexColor.Substring(0,2), 16)
+                        $g = [Convert]::ToInt32($hexColor.Substring(2,2), 16)
+                        $b = [Convert]::ToInt32($hexColor.Substring(4,2), 16)
+                        [Windows.Media.Color]::FromRgb($r, $g, $b)
+                    }
+                    "CornerRadius" { [System.Windows.CornerRadius]::new($Value) }
+                    "GridLength" { [System.Windows.GridLength]::new($Value) }
+                    "Thickness" {
+                        # Parse the Thickness value (supports 1, 2, or 4 inputs)
+                        $values = $Value -split ","
+                        switch ($values.Count) {
+                            1 { [System.Windows.Thickness]::new([double]$values[0]) }
+                            2 { [System.Windows.Thickness]::new([double]$values[0], [double]$values[1]) }
+                            4 { [System.Windows.Thickness]::new([double]$values[0], [double]$values[1], [double]$values[2], [double]$values[3]) }
+                        }
+                    }
+                    "FontFamily" { [Windows.Media.FontFamily]::new($Value) }
+                    "Double" { [double]$Value }
+                    default { $Value }
+                }
+            }
+            catch {
+                # Log a warning if there's an issue setting the property
+                Write-Warning "Failed to set property $($Name): $_"
+            }
+        }
+
+        # Retrieve all theme properties from the theme configuration
+        $themeProperties = $sync.configs.themes.$currentTheme.PSObject.Properties
+        foreach ($_ in $themeProperties) {
+            # Apply properties that deal with colors
+            if ($_.Name -like "*color*") {
+                Set-ThemeResourceProperty -Name $_.Name -Value $_.Value -Type "ColorBrush"
+                # For certain color properties, also set complementary values (e.g., BorderColor -> CBorderColor) This is required because e.g DropShadowEffect requires a <Color> and not a <SolidColorBrush> object
+                if ($_.Name -in @("BorderColor", "ButtonBackgroundMouseoverColor")) {
+                    Set-ThemeResourceProperty -Name "C$($_.Name)" -Value $_.Value -Type "Color"
+                }
+            }
+            # Apply corner radius properties
+            elseif ($_.Name -like "*Radius*") {
+                Set-ThemeResourceProperty -Name $_.Name -Value $_.Value -Type "CornerRadius"
+            }
+            # Apply row height properties
+            elseif ($_.Name -like "*RowHeight*") {
+                Set-ThemeResourceProperty -Name $_.Name -Value $_.Value -Type "GridLength"
+            }
+            # Apply thickness or margin properties
+            elseif (($_.Name -like "*Thickness*") -or ($_.Name -like "*margin")) {
+                Set-ThemeResourceProperty -Name $_.Name -Value $_.Value -Type "Thickness"
+            }
+            # Apply font family properties
+            elseif ($_.Name -like "*FontFamily*") {
+                Set-ThemeResourceProperty -Name $_.Name -Value $_.Value -Type "FontFamily"
+            }
+            # Apply any other properties as doubles (numerical values)
+            else {
+                Set-ThemeResourceProperty -Name $_.Name -Value $_.Value -Type "Double"
+            }
+        }
+    }
+
+    $LightPreferencePath = "$env:LOCALAPPDATA\winutil\LightTheme.ini"
+    $DarkPreferencePath = "$env:LOCALAPPDATA\winutil\DarkTheme.ini"
+
+    if ($init) {
+        Set-WinutilTheme -currentTheme "shared"
+        if (Test-Path $LightPreferencePath) {
+            $theme = "Light"
+        }
+        elseif (Test-Path $DarkPreferencePath) {
+            $theme = "Dark"
+        }
+        else {
+            $theme = "Auto"
+        }
+    }
+
+    switch ($theme) {
+        "Auto" {
+            $systemUsesDarkMode = Get-WinUtilToggleStatus WPFToggleDarkMode
+            if ($systemUsesDarkMode) {
+                Set-WinutilTheme  -currentTheme "Dark"
+            }
+            else{
+                Set-WinutilTheme  -currentTheme "Light"
+            }
+
+
+            $themeButtonIcon = [char]0xF08C
+            Remove-Item $LightPreferencePath -Force -ErrorAction SilentlyContinue
+            Remove-Item $DarkPreferencePath -Force -ErrorAction SilentlyContinue
+        }
+        "Dark" {
+            Set-WinutilTheme  -currentTheme $theme
+            $themeButtonIcon = [char]0xE708
+            $null = New-Item $DarkPreferencePath -Force
+            Remove-Item $LightPreferencePath -Force -ErrorAction SilentlyContinue
+           }
+        "Light" {
+            Set-WinutilTheme  -currentTheme $theme
+            $themeButtonIcon = [char]0xE706
+            $null = New-Item $LightPreferencePath -Force
+            Remove-Item $DarkPreferencePath -Force -ErrorAction SilentlyContinue
+        }
+    }
+
+    # Update the theme selector button with the appropriate icon
+    $ThemeButton = $sync.Form.FindName("ThemeButton")
+    $ThemeButton.Content = [string]$themeButtonIcon
+}

functions/private/Set-WinUtilUITheme.ps1

@@ -1,83 +0,0 @@
-function Set-WinUtilUITheme {
-    <#
-        .SYNOPSIS
-            Sets the theme of the XAML file
-
-        .PARAMETER inputXML
-            A string representing the XAML object to modify
-
-        .PARAMETER customThemeName
-            The name of the custom theme to set the XAML to. Defaults to 'matrix'
-
-        .PARAMETER defaultThemeName
-            The name of the default theme to use when setting the XAML. Defaults to '_default'
-
-        .EXAMPLE
-            $returnVal = Set-WinUtilUITheme -inputXAML $inputXAML
-            if ($returnVal[0] -eq "") {
-                Write-Host "Failed to process inputXML"
-            } else {
-                $inputXML = $returnVal[0]
-            }
-            # to know which theme this function has used, access the second item in returned value.
-            Write-Host "Theme used in processing: $($returnVal[1])"
-    #>
-
-    param (
-        [Parameter(Mandatory, position=0)]
-        [string]$inputXML,
-
-        [Parameter(position=1)]
-        [string]$customThemeName = 'matrix',
-
-        [Parameter(position=2)]
-        [string]$defaultThemeName = '_default'
-    )
-
-    try {
-        # Note:
-        #    Reason behind not caching the '$sync.configs.themes` object into a variable,
-        #    because this code can modify the themes object.. meaning it's better to access it
-        #    using the more verbose way, rather than introduce possible bugs into the code, just for the sake of readability.
-        #
-        if (-NOT $sync.configs.themes) {
-            throw [GenericException]::new("[Set-WinUtilTheme] Did not find 'config.themes' inside `$sync variable.")
-        }
-
-        if (-NOT $sync.configs.themes.$defaultThemeName) {
-            throw [GenericException]::new("[Set-WinUtilTheme] Did not find '$defaultThemeName' theme in the themes config file.")
-        }
-
-        $themeToUse = $customThemeName
-        if ($sync.configs.themes.$themeToUse) {
-            # Loop through every default theme option, and modify the custom theme in $sync variable,
-            # so that it has full options available for other functions to use.
-            foreach ($option in $sync.configs.themes.$defaultThemeName.PSObject.Properties) {
-                $optionName = $option.Name
-                $optionValue = $option.Value
-                if (-NOT $sync.configs.themes.$themeToUse.$optionName) {
-                    $sync.configs.themes.$themeToUse | Add-Member -MemberType NoteProperty -Name $optionName -Value $optionValue
-                }
-            }
-        } else {
-            Write-Debug "[Set-WinUtilTheme] Theme '$customThemeName' was not found, using '$defaultThemeName' instead."
-            $themeToUse = $defaultThemeName
-        }
-
-        foreach ($property in $sync.configs.themes.$themeToUse.PSObject.Properties) {
-            $key = $property.Name
-            $value = $property.Value
-            # Add curly braces around the key
-            $formattedKey = "{$key}"
-            # Replace the key with the value in the input XML
-            $inputXML = $inputXML.Replace($formattedKey, $value)
-        }
-    }
-    catch {
-        Write-Host "[Set-WinUtilTheme] Unable to apply theme" -ForegroundColor Red
-        Write-Host "$($psitem.Exception.Message)" -ForegroundColor Red
-        $inputXML = "" # Make inputXML equal an empty string, indicating something went wrong to the function caller.
-    }
-
-    return @($inputXML, $themeToUse);
-}

functions/private/Show-CustomDialog.ps1

@@ -33,25 +33,25 @@ function Show-CustomDialog {
     #>
     param(
         [string]$Message,
-        [int]$Width = 300,
+        [int]$Width = $sync.Form.Resources.CustomDialogWidth,
-        [int]$Height = 200,
+        [int]$Height = $sync.Form.Resources.CustomDialogHeight,
-        [int]$FontSize = 10,
+        [int]$FontSize = $sync.Form.Resources.CustomDialogFontSize,
-        [int]$HeaderFontSize = 14,
+        [int]$HeaderFontSize = $sync.Form.Resources.CustomDialogFontSizeHeader,
-        [int]$IconSize = 25,
+        [int]$IconSize = $sync.Form.Resources.CustomDialogLogoSize,
         [bool]$EnableScroll = $false
     )
 
     Add-Type -AssemblyName PresentationFramework
 
     # Define theme colors
-    $foregroundColor = $sync.configs.themes.$ctttheme.MainForegroundColor
+    $foregroundColor = $sync.Form.Resources.MainForegroundColor
-    $backgroundColor = $sync.configs.themes.$ctttheme.MainBackgroundColor
+    $backgroundColor = $sync.Form.Resources.MainBackgroundColor
     $font = New-Object Windows.Media.FontFamily("Consolas")
-    $borderColor = $sync.configs.themes.$ctttheme.BorderColor # ButtonInstallBackgroundColor
+    $borderColor = $sync.Form.Resources.BorderColor # ButtonInstallBackgroundColor
-    $buttonBackgroundColor = $sync.configs.themes.$ctttheme.ButtonInstallBackgroundColor
+    $buttonBackgroundColor = $sync.Form.Resources.ButtonInstallBackgroundColor
-    $buttonForegroundColor = $sync.configs.themes.$ctttheme.ButtonInstallForegroundColor
+    $buttonForegroundColor = $sync.Form.Resources.ButtonInstallForegroundColor
     $shadowColor = [Windows.Media.ColorConverter]::ConvertFromString("#AAAAAAAA")
-    $logocolor = $sync.configs.themes.$ctttheme.LabelboxForegroundColor
+    $logocolor = $sync.Form.Resources.LabelboxForegroundColor
 
     # Create a custom dialog window
     $dialog = New-Object Windows.Window
@@ -162,7 +162,7 @@ function Show-CustomDialog {
         $hyperlink.NavigateUri = New-Object System.Uri($match.Groups[1].Value)
         $hyperlink.Inlines.Add($match.Groups[2].Value)
         $hyperlink.TextDecorations = [Windows.TextDecorations]::None  # Remove underline
-        $hyperlink.Foreground = $sync.configs.themes.$ctttheme.LinkForegroundColor
+        $hyperlink.Foreground = $sync.Form.Resources.LinkForegroundColor
 
         $hyperlink.Add_Click({
             param($sender, $args)
@@ -170,11 +170,11 @@ function Show-CustomDialog {
         })
         $hyperlink.Add_MouseEnter({
             param($sender, $args)
-            $sender.Foreground = $sync.configs.themes.$ctttheme.LinkHoverForegroundColor
+            $sender.Foreground = $sync.Form.Resources.LinkHoverForegroundColor
         })
         $hyperlink.Add_MouseLeave({
             param($sender, $args)
-            $sender.Foreground = $sync.configs.themes.$ctttheme.LinkForegroundColor
+            $sender.Foreground = $sync.Form.Resources.LinkForegroundColor
         })
 
         $messageTextBlock.Inlines.Add($hyperlink)

functions/public/Invoke-WPFButton.ps1

@@ -19,7 +19,6 @@ function Invoke-WPFButton {
     }
 
     Switch -Wildcard ($Button) {
-
         "WPFTab?BT" {Invoke-WPFTab $Button}
         "WPFInstall" {Invoke-WPFInstall}
         "WPFUninstall" {Invoke-WPFUnInstall}

functions/public/Invoke-WPFUIElements.ps1

@@ -27,7 +27,7 @@ function Invoke-WPFUIElements {
 
     $window = $sync["Form"]
 
-    $theme = $sync.configs.themes.$ctttheme
+    $theme = $sync.Form.Resources
     $borderstyle = $window.FindResource("BorderStyle")
     $HoverTextBlockStyle = $window.FindResource("HoverTextBlockStyle")
     $ColorfulToggleSwitchStyle = $window.FindResource("ColorfulToggleSwitchStyle")
@@ -186,7 +186,7 @@ function Invoke-WPFUIElements {
                         $label.ToolTip = $entryInfo.Description
                         $label.HorizontalAlignment = "Left"
                         $label.FontSize = $theme.FontSize
-                        $label.Foreground = $theme.MainForegroundColor
+                        $label.SetResourceReference([Windows.Controls.Control]::ForegroundProperty, "MainForegroundColor")
                         $dockPanel.Children.Add($label) | Out-Null
                         $stackPanel.Children.Add($dockPanel) | Out-Null
 
@@ -207,14 +207,14 @@ function Invoke-WPFUIElements {
                         $toggleButton.HorizontalAlignment = "Left"
                         $toggleButton.Height = $theme.TabButtonHeight
                         $toggleButton.Width = $theme.TabButtonWidth
-                        $toggleButton.Background = $theme.ButtonInstallBackgroundColor
+                        $toggleButton.SetResourceReference([Windows.Controls.Control]::BackgroundProperty, "ButtonInstallBackgroundColor")
-                        $toggleButton.Foreground = [Windows.Media.Brushes]::White
+                        $toggleButton.SetResourceReference([Windows.Controls.Control]::ForegroundProperty, "MainForegroundColor")
                         $toggleButton.FontWeight = [Windows.FontWeights]::Bold
 
                         $textBlock = New-Object Windows.Controls.TextBlock
                         $textBlock.FontSize = $theme.TabButtonFontSize
                         $textBlock.Background = [Windows.Media.Brushes]::Transparent
-                        $textBlock.Foreground = $theme.ButtonInstallForegroundColor
+                        $textBlock.SetResourceReference([Windows.Controls.Control]::ForegroundProperty, "ButtonInstallForegroundColor")
 
                         $underline = New-Object Windows.Documents.Underline
                         $underline.Inlines.Add($entryInfo.name -replace "(.).*", "`$1")

functions/public/Invoke-WPFUltimatePerformance.ps1

@@ -50,14 +50,14 @@ Function Invoke-WPFUltimatePerformance {
 
         } elseif ($State -eq "Disable") {
             # Check if the Ultimate Performance plan is installed by GUID
-            $installedPlan = powercfg -list | Select-String -Pattern $ultimateGUID
+            $installedPlan = (powercfg -list | Select-String -Pattern "ChrisTitus - Ultimate Power Plan").Line.Split()[3]
 
             if ($installedPlan) {
                 # Extract the GUID of the installed Ultimate Performance plan
                 $ultimatePlanGUID = $installedPlan.Line.Split()[3]
 
                 # Set a different power plan as active before deleting the Ultimate Performance plan
-                $balancedPlanGUID = (powercfg -list | Select-String -Pattern "Balanced").Line.Split()[3]
+                $balancedPlanGUID = 381b4222-f694-41f0-9685-ff5bb260df2e
                 powercfg -setactive $balancedPlanGUID
 
                 # Delete the Ultimate Performance plan by GUID

scripts/main.ps1

@@ -52,29 +52,6 @@ $sync.runspace.Open()
 
 $inputXML = $inputXML -replace 'mc:Ignorable="d"', '' -replace "x:N", 'N' -replace '^<Win.*', '<Window'
 
-$defaulttheme = '_default'
-if ((Get-WinUtilToggleStatus WPFToggleDarkMode) -eq $True) {
-    if (Invoke-WinUtilGPU -eq $True) {
-        $ctttheme = 'Matrix'
-    } else {
-        $ctttheme = 'Dark'
-    }
-} else {
-    $ctttheme = 'Classic'
-}
-
-$returnVal = Set-WinUtilUITheme -inputXML $inputXML -customThemeName $ctttheme -defaultThemeName $defaulttheme
-if ($returnVal[0] -eq "") {
-    Write-Host "Failed to statically apply theming to xaml content using Set-WinUtilTheme, please check previous Error/Warning messages." -ForegroundColor Red
-    Write-Host "Quitting winutil..." -ForegroundColor Red
-    $sync.runspace.Dispose()
-    $sync.runspace.Close()
-    [System.GC]::Collect()
-    exit 1
-}
-$inputXML = $returnVal[0]
-$ctttheme = $returnVal[1]
-
 [void][System.Reflection.Assembly]::LoadWithPartialName('presentationframework')
 [xml]$XAML = $inputXML
 
@@ -103,7 +80,7 @@ if (-NOT ($readerOperationSuccessful)) {
     [System.GC]::Collect()
     exit 1
 }
-
+Invoke-WinutilThemeChange -init $true
 # Load the configuration files
 #Invoke-WPFUIElements -configVariable $sync.configs.nav -targetGridName "WPFMainGrid"
 Invoke-WPFUIElements -configVariable $sync.configs.applications -targetGridName "appspanel" -columncount 5
@@ -248,24 +225,34 @@ $commonKeyEvents = {
 $sync["Form"].Add_PreViewKeyDown($commonKeyEvents)
 
 $sync["Form"].Add_MouseLeftButtonDown({
-    if ($sync["SettingsPopup"].IsOpen) {
+    # Hide Settings and Theme Popup on click anywhere else
-        $sync["SettingsPopup"].IsOpen = $false
+    if ($sync.SettingsButton.IsOpen -or
+        $sync.ThemePopup.IsOpen) {
+            $sync.SettingsPopup.IsOpen = $false
+            $sync.ThemePopup.IsOpen = $false
         }
     $sync["Form"].DragMove()
 })
 
 $sync["Form"].Add_MouseDoubleClick({
+    if ($_.OriginalSource -is [System.Windows.Controls.Grid] -or
+        $_.OriginalSource -is [System.Windows.Controls.StackPanel]) {
             if ($sync["Form"].WindowState -eq [Windows.WindowState]::Normal) {
-        $sync["Form"].WindowState = [Windows.WindowState]::Maximized;
+                $sync["Form"].WindowState = [Windows.WindowState]::Maximized
-    } else {
+            }
-        $sync["Form"].WindowState = [Windows.WindowState]::Normal;
+            else{
+                $sync["Form"].WindowState = [Windows.WindowState]::Normal
+            }
     }
 })
 
 $sync["Form"].Add_Deactivated({
     Write-Debug "WinUtil lost focus"
-    if ($sync["SettingsPopup"].IsOpen) {
+    # Hide Settings and Theme Popup on Winutil Focus Loss
-        $sync["SettingsPopup"].IsOpen = $false
+    if ($sync.SettingsButton.IsOpen -or
+        $sync.ThemePopup.IsOpen) {
+            $sync.SettingsPopup.IsOpen = $false
+            $sync.ThemePopup.IsOpen = $false
     }
 })
 
@@ -478,15 +465,47 @@ Set-WinUtilTaskbaritem -overlay "logo"
 $sync["Form"].Add_Activated({
     Set-WinUtilTaskbaritem -overlay "logo"
 })
+# Define event handler for ThemeButton click
+$sync["ThemeButton"].Add_Click({
+    if ($sync.ThemePopup.IsOpen) {
+        $sync.ThemePopup.IsOpen = $false
+    }
+    else{
+        $sync.ThemePopup.IsOpen = $true
+    }
+    $sync.SettingsPopup.IsOpen = $false
+})
+
+# Define event handlers for menu items
+$sync["AutoThemeMenuItem"].Add_Click({
+    $sync.ThemePopup.IsOpen = $false
+    Invoke-WinutilThemeChange -theme "Auto"
+    $_.Handled = $false
+  })
+  # Define event handlers for menu items
+$sync["DarkThemeMenuItem"].Add_Click({
+    $sync.ThemePopup.IsOpen = $false
+    Invoke-WinutilThemeChange -theme "Dark"
+    $_.Handled = $false
+  })
+# Define event handlers for menu items
+$sync["LightThemeMenuItem"].Add_Click({
+    $sync.ThemePopup.IsOpen = $false
+    Invoke-WinutilThemeChange -theme "Light"
+    $_.Handled = $false
+  })
+
 
 # Define event handler for button click
 $sync["SettingsButton"].Add_Click({
     Write-Debug "SettingsButton clicked"
-    if ($sync["SettingsPopup"].IsOpen) {
+    if ($sync.Settings.IsOpen) {
-        $sync["SettingsPopup"].IsOpen = $false
+        $sync.Settings.IsOpen = $false
-    } else {
-        $sync["SettingsPopup"].IsOpen = $true
     }
+    else{
+        $sync.Settings.IsOpen = $true
+    }
+    $sync.Settings.IsOpen = $false
     $_.Handled = $false
 })
 
@@ -518,12 +537,8 @@ MicroWin : <a href="https://github.com/KonTy">@KonTy</a>
 GitHub   : <a href="https://github.com/ChrisTitusTech/winutil">ChrisTitusTech/winutil</a>
 Version  : <a href="https://github.com/ChrisTitusTech/winutil/releases/tag/$($sync.version)">$($sync.version)</a>
 "@
-    $FontSize = $sync.configs.themes.$ctttheme.CustomDialogFontSize
+
-    $HeaderFontSize = $sync.configs.themes.$ctttheme.CustomDialogFontSizeHeader
+    Show-CustomDialog -Message $authorInfo -LogoSize $LogoSize
-    $LogoSize = $sync.configs.themes.$ctttheme.CustomDialogLogoSize
-    $Width = $sync.configs.themes.$ctttheme.CustomDialogWidth
-    $Height = $sync.configs.themes.$ctttheme.CustomDialogHeight
-    Show-CustomDialog -Message $authorInfo -Width $Width -Height $Height -FontSize $FontSize -HeaderFontSize $HeaderFontSize -LogoSize $LogoSize
 })
 
 $sync["SponsorMenuItem"].Add_Click({
@@ -544,12 +559,8 @@ $sync["SponsorMenuItem"].Add_Click({
         $authorInfo += "An error occurred while fetching or processing the sponsors: $_`n"
     }
 
-    $FontSize = $sync.configs.themes.$ctttheme.CustomDialogFontSize
+    Show-CustomDialog -Message $authorInfo -EnableScroll $true
-    $HeaderFontSize = $sync.configs.themes.$ctttheme.CustomDialogFontSizeHeader
-    $LogoSize = $sync.configs.themes.$ctttheme.CustomDialogLogoSize
-    $Width = $sync.configs.themes.$ctttheme.CustomDialogWidth
-    $Height = $sync.configs.themes.$ctttheme.CustomDialogHeight
-    Show-CustomDialog -Message $authorInfo -Width $Width -Height $Height -FontSize $FontSize -HeaderFontSize $HeaderFontSize -LogoSize $LogoSize -EnableScroll $true
 })
+
 $sync["Form"].ShowDialog() | out-null
 Stop-Transcript

xaml/inputXML.xaml

@@ -5,7 +5,6 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:WinUtility"
         mc:Ignorable="d"
-        Background="{MainBackgroundColor}"
         WindowStartupLocation="CenterScreen"
         UseLayoutRounding="True"
         WindowStyle="None"
@@ -18,24 +17,25 @@
         <WindowChrome CaptionHeight="0" CornerRadius="10"/>
     </WindowChrome.WindowChrome>
     <Window.Resources>
+
     <Style TargetType="ToolTip">
-        <Setter Property="Background" Value="{MainBackgroundColor}"/>
+        <Setter Property="Background" Value="{DynamicResource MainBackgroundColor}"/>
-        <Setter Property="Foreground" Value="{MainForegroundColor}"/>
+        <Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}"/>
-        <Setter Property="BorderBrush" Value="{ButtonBackgroundSelectedColor}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ButtonBackgroundSelectedColor}"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="Padding" Value="5"/>
-        <Setter Property="FontSize" Value="{FontSize}"/>
+        <Setter Property="FontSize" Value="{DynamicResource FontSize}"/>
-        <Setter Property="FontFamily" Value="{FontFamily}"/>
+        <Setter Property="FontFamily" Value="{DynamicResource FontFamily}"/>
     </Style>
     <ItemsPanelTemplate x:Key="MenuItemPanelTemplate">
         <StackPanel Margin="-20,0,0,0" Background="{MainBackgroundColor}"/>
     </ItemsPanelTemplate>
 
     <Style TargetType="{x:Type MenuItem}">
-        <Setter Property="Background" Value="{MainBackgroundColor}"/>
+        <Setter Property="Background" Value="{DynamicResource MainBackgroundColor}"/>
-        <Setter Property="Foreground" Value="{MainForegroundColor}"/>
+        <Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}"/>
-        <Setter Property="FontSize" Value="{FontSize}"/>
+        <Setter Property="FontSize" Value="{DynamicResource FontSize}"/>
-        <Setter Property="FontFamily" Value="{FontFamily}"/>
+        <Setter Property="FontFamily" Value="{DynamicResource FontFamily}"/>
         <Setter Property="Padding" Value="5,2,5,2"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="ItemsPanel" Value="{StaticResource MenuItemPanelTemplate}"/>
@@ -48,7 +48,7 @@
                 <ControlTemplate TargetType="{x:Type Thumb}">
                     <Grid x:Name="Grid">
                         <Rectangle HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Width="Auto" Height="Auto" Fill="Transparent" />
-                        <Border x:Name="Rectangle1" CornerRadius="5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Width="Auto" Height="Auto"  Background="{TemplateBinding Background}" />
+                        <Border x:Name="Rectangle1" CornerRadius="5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Width="Auto" Height="Auto"  Background="{DynamicResource ScrollBarBackgroundColor}" />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="Tag" Value="Horizontal">
@@ -62,11 +62,11 @@
     </Style>
 
     <Style TargetType="TextBlock" x:Key="HoverTextBlockStyle">
-        <Setter Property="Foreground" Value="{LinkForegroundColor}" />
+        <Setter Property="Foreground" Value="{DynamicResource LinkForegroundColor}" />
         <Setter Property="TextDecorations" Value="Underline" />
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Foreground" Value="{LinkHoverForegroundColor}" />
+                <Setter Property="Foreground" Value="{DynamicResource LinkHoverForegroundColor}" />
                 <Setter Property="TextDecorations" Value="Underline" />
                 <Setter Property="Cursor" Value="Hand" />
             </Trigger>
@@ -74,11 +74,11 @@
     </Style>
 
     <Style TargetType="Button" x:Key="HoverButtonStyle">
-        <Setter Property="Foreground" Value="{MainForegroundColor}" />
+        <Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}" />
         <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="FontSize" Value="{ButtonFontSize}" />
+        <Setter Property="FontSize" Value="{DynamicResource ButtonFontSize}" />
-        <Setter Property="TextElement.FontFamily" Value="{ButtonFontFamily}"/>
+        <Setter Property="TextElement.FontFamily" Value="{DynamicResource ButtonFontFamily}"/>
-        <Setter Property="Background" Value="{MainBackgroundColor}" />
+        <Setter Property="Background" Value="{DynamicResource MainBackgroundColor}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
@@ -88,7 +88,7 @@
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter Property="FontWeight" Value="Bold" />
-                            <Setter Property="Foreground" Value="{MainForegroundColor}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}" />
                             <Setter Property="Cursor" Value="Hand" />
                         </Trigger>
                     </ControlTemplate.Triggers>
@@ -100,8 +100,8 @@
     <!--ScrollBars-->
     <Style x:Key="{x:Type ScrollBar}" TargetType="{x:Type ScrollBar}">
         <Setter Property="Stylus.IsFlicksEnabled" Value="false" />
-        <Setter Property="Foreground" Value="{ScrollBarBackgroundColor}" />
+        <Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}" />
-        <Setter Property="Background" Value="{MainBackgroundColor}" />
+        <Setter Property="Background" Value="{DynamicResource MainBackgroundColor}" />
         <Setter Property="Width" Value="6" />
         <Setter Property="Template">
             <Setter.Value>
@@ -126,10 +126,10 @@
 
                     <ControlTemplate.Triggers>
                         <Trigger SourceName="Thumb" Property="IsMouseOver" Value="true">
-                            <Setter Value="{ScrollBarHoverColor}" TargetName="Thumb" Property="Background" />
+                            <Setter Value="{DynamicResource ButtonBackgroundMouseoverColor}" TargetName="Thumb" Property="Background" />
                         </Trigger>
                         <Trigger SourceName="Thumb" Property="IsDragging" Value="true">
-                            <Setter Value="{ScrollBarDraggingColor}" TargetName="Thumb" Property="Background" />
+                            <Setter Value="{DynamicResource ButtonBackgroundSelectedColor}" TargetName="Thumb" Property="Background" />
                         </Trigger>
 
                         <Trigger Property="IsEnabled" Value="false">
@@ -158,8 +158,8 @@
         </Setter>
         </Style>
         <Style TargetType="ComboBox">
-            <Setter Property="Foreground" Value="{ComboBoxForegroundColor}" />
+            <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundColor}" />
-            <Setter Property="Background" Value="{ComboBoxBackgroundColor}" />
+            <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundColor}" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="ComboBox">
@@ -198,35 +198,37 @@
             </Setter>
         </Style>
         <Style TargetType="Label">
-            <Setter Property="Foreground" Value="{LabelboxForegroundColor}"/>
+            <Setter Property="Foreground" Value="{DynamicResource LabelboxForegroundColor}"/>
-            <Setter Property="Background" Value="{LabelBackgroundColor}"/>
+            <Setter Property="Background" Value="{DynamicResource LabelBackgroundColor}"/>
+            <Setter Property="FontFamily" Value="{DynamicResource FontFamily}"/>
         </Style>
 
         <!-- TextBlock template -->
         <Style TargetType="TextBlock">
-            <Setter Property="FontSize" Value="{FontSize}"/>
+            <Setter Property="FontSize" Value="{DynamicResource FontSize}"/>
-            <Setter Property="Foreground" Value="{LabelboxForegroundColor}"/>
+            <Setter Property="Foreground" Value="{DynamicResource LabelboxForegroundColor}"/>
-            <Setter Property="Background" Value="{LabelBackgroundColor}"/>
+            <Setter Property="Background" Value="{DynamicResource LabelBackgroundColor}"/>
         </Style>
         <!-- Toggle button template x:Key="TabToggleButton" -->
         <Style TargetType="{x:Type ToggleButton}">
-            <Setter Property="Margin" Value="{ButtonMargin}"/>
+            <Setter Property="Margin" Value="{DynamicResource ButtonMargin}"/>
             <Setter Property="Content" Value=""/>
+            <Setter Property="FontFamily" Value="{DynamicResource FontFamily}"/>
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="ToggleButton">
                         <Grid>
                             <Border x:Name="ButtonGlow"
                                         Background="{TemplateBinding Background}"
-                                        BorderBrush="{ButtonForegroundColor}"
+                                        BorderBrush="{DynamicResource ButtonForegroundColor}"
-                                        BorderThickness="{ButtonBorderThickness}"
+                                        BorderThickness="{DynamicResource ButtonBorderThickness}"
-                                        CornerRadius="{ButtonCornerRadius}">
+                                        CornerRadius="{DynamicResource ButtonCornerRadius}">
                                 <Grid>
                                     <Border x:Name="BackgroundBorder"
                                         Background="{TemplateBinding Background}"
-                                        BorderBrush="{ButtonBackgroundColor}"
+                                        BorderBrush="{DynamicResource ButtonBackgroundColor}"
-                                        BorderThickness="{ButtonBorderThickness}"
+                                        BorderThickness="{DynamicResource ButtonBorderThickness}"
-                                        CornerRadius="{ButtonCornerRadius}">
+                                        CornerRadius="{DynamicResource ButtonCornerRadius}">
                                         <ContentPresenter
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
@@ -237,10 +239,10 @@
                         </Grid>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="BackgroundBorder" Property="Background" Value="{ButtonBackgroundMouseoverColor}"/>
+                                <Setter TargetName="BackgroundBorder" Property="Background" Value="{DynamicResource ButtonBackgroundMouseoverColor}"/>
                                 <Setter Property="Effect">
                                     <Setter.Value>
-                                        <DropShadowEffect Opacity="1" ShadowDepth="5" Color="{ButtonBackgroundMouseoverColor}" Direction="-100" BlurRadius="15"/>
+                                        <DropShadowEffect Opacity="1" ShadowDepth="5" Color="{DynamicResource CButtonBackgroundMouseoverColor}" Direction="-100" BlurRadius="15"/>
                                     </Setter.Value>
                                 </Setter>
                                 <Setter Property="Panel.ZIndex" Value="2000"/>
@@ -248,16 +250,16 @@
                             <Trigger Property="IsChecked" Value="True">
                                 <Setter Property="BorderBrush" Value="Pink"/>
                                 <Setter Property="BorderThickness" Value="2"/>
-                                <Setter TargetName="BackgroundBorder" Property="Background" Value="{ButtonBackgroundSelectedColor}"/>
+                                <Setter TargetName="BackgroundBorder" Property="Background" Value="{DynamicResource ButtonBackgroundSelectedColor}"/>
                                 <Setter Property="Effect">
                                     <Setter.Value>
-                                        <DropShadowEffect Opacity="1" ShadowDepth="2" Color="{ButtonBackgroundMouseoverColor}" Direction="-111" BlurRadius="10"/>
+                                        <DropShadowEffect Opacity="1" ShadowDepth="2" Color="{DynamicResource CButtonBackgroundMouseoverColor}" Direction="-111" BlurRadius="10"/>
                                     </Setter.Value>
                                 </Setter>
                             </Trigger>
                             <Trigger Property="IsChecked" Value="False">
                                 <Setter Property="BorderBrush" Value="Transparent"/>
-                                <Setter Property="BorderThickness" Value="{ButtonBorderThickness}"/>
+                                <Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThickness}"/>
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -266,12 +268,13 @@
         </Style>
         <!-- Button Template -->
         <Style TargetType="Button">
-            <Setter Property="Margin" Value="{ButtonMargin}"/>
+            <Setter Property="Margin" Value="{DynamicResource ButtonMargin}"/>
-            <Setter Property="Foreground" Value="{ButtonForegroundColor}"/>
+            <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundColor}"/>
-            <Setter Property="Background" Value="{ButtonBackgroundColor}"/>
+            <Setter Property="Background" Value="{DynamicResource ButtonBackgroundColor}"/>
-            <Setter Property="Height" Value="{ButtonHeight}"/>
+            <Setter Property="Height" Value="{DynamicResource ButtonHeight}"/>
-            <Setter Property="Width" Value="{ButtonWidth}"/>
+            <Setter Property="Width" Value="{DynamicResource ButtonWidth}"/>
-            <Setter Property="FontSize" Value="{ButtonFontSize}"/>
+            <Setter Property="FontSize" Value="{DynamicResource ButtonFontSize}"/>
+            <Setter Property="FontFamily" Value="{DynamicResource FontFamily}"/>
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
@@ -279,20 +282,20 @@
                             <Border x:Name="BackgroundBorder"
                                     Background="{TemplateBinding Background}"
                                     BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="{ButtonBorderThickness}"
+                                    BorderThickness="{DynamicResource ButtonBorderThickness}"
-                                    CornerRadius="{ButtonCornerRadius}">
+                                    CornerRadius="{DynamicResource ButtonCornerRadius}">
                                 <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10,2,10,2"/>
                             </Border>
                         </Grid>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsPressed" Value="True">
-                                <Setter TargetName="BackgroundBorder" Property="Background" Value="{ButtonBackgroundPressedColor}"/>
+                                <Setter TargetName="BackgroundBorder" Property="Background" Value="{DynamicResource ButtonBackgroundPressedColor}"/>
                             </Trigger>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="BackgroundBorder" Property="Background" Value="{ButtonBackgroundMouseoverColor}"/>
+                                <Setter TargetName="BackgroundBorder" Property="Background" Value="{DynamicResource ButtonBackgroundMouseoverColor}"/>
                             </Trigger>
                             <Trigger Property="IsEnabled" Value="False">
-                                <Setter TargetName="BackgroundBorder" Property="Background" Value="{ButtonBackgroundSelectedColor}"/>
+                                <Setter TargetName="BackgroundBorder" Property="Background" Value="{DynamicResource ButtonBackgroundSelectedColor}"/>
                                 <Setter Property="Foreground" Value="DimGray"/>
                             </Trigger>
                         </ControlTemplate.Triggers>
@@ -301,13 +304,13 @@
             </Setter>
         </Style>
         <Style x:Key="SearchBarClearButtonStyle" TargetType="Button">
-            <Setter Property="FontFamily" Value="Arial"/>
+            <Setter Property="FontFamily" Value="{DynamicResource FontFamily}"/>
-            <Setter Property="FontSize" Value="{SearchBarClearButtonFontSize}"/>
+            <Setter Property="FontSize" Value="{DynamicResource SearchBarClearButtonFontSize}"/>
             <Setter Property="Content" Value="X"/>
-            <Setter Property="Height" Value="{SearchBarClearButtonFontSize}"/>
+            <Setter Property="Height" Value="{DynamicResource SearchBarClearButtonFontSize}"/>
-            <Setter Property="Width" Value="{SearchBarClearButtonFontSize}"/>
+            <Setter Property="Width" Value="{DynamicResource SearchBarClearButtonFontSize}"/>
             <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="Foreground" Value="{MainForegroundColor}"/>
+            <Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}"/>
             <Setter Property="Padding" Value="0"/>
             <Setter Property="BorderBrush" Value="Transparent"/>
             <Setter Property="BorderThickness" Value="0"/>
@@ -322,27 +325,28 @@
         </Style>
         <!-- Checkbox template -->
         <Style TargetType="CheckBox">
-            <Setter Property="Foreground" Value="{MainForegroundColor}"/>
+            <Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}"/>
-            <Setter Property="Background" Value="{MainBackgroundColor}"/>
+            <Setter Property="Background" Value="{DynamicResource MainBackgroundColor}"/>
-            <Setter Property="FontSize" Value="{FontSize}" />
+            <Setter Property="FontSize" Value="{DynamicResource FontSize}" />
-            <Setter Property="TextElement.FontFamily" Value="{FontFamily}"/>
+            <Setter Property="FontFamily" Value="{DynamicResource FontFamily}"/>
+            <Setter Property="TextElement.FontFamily" Value="{DynamicResource FontFamily}"/>
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="CheckBox">
-                        <Grid Background="{TemplateBinding Background}" Margin="{CheckBoxMargin}">
+                        <Grid Background="{TemplateBinding Background}" Margin="{DynamicResource CheckBoxMargin}">
                             <BulletDecorator Background="Transparent">
                                 <BulletDecorator.Bullet>
-                                    <Grid Width="{CheckBoxBulletDecoratorSize}" Height="{CheckBoxBulletDecoratorSize}">
+                                    <Grid Width="{DynamicResource CheckBoxBulletDecoratorSize}" Height="{DynamicResource CheckBoxBulletDecoratorSize}">
                                         <Border x:Name="Border"
                                                 BorderBrush="{TemplateBinding BorderBrush}"
-                                                Background="{ButtonBackgroundColor}"
+                                                Background="{DynamicResource ButtonBackgroundColor}"
                                                 BorderThickness="1"
-                                                Width="{Binding Path={CheckBoxBulletDecoratorSize}-2}"
+                                                Width="{DynamicResource CheckBoxBulletDecoratorSize *0.85}"
-                                                Height="{Binding Path={CheckBoxBulletDecoratorSize}-2}"
+                                                Height="{DynamicResource CheckBoxBulletDecoratorSize *0.85}"
                                                 Margin="2"
                                                 SnapsToDevicePixels="True"/>
                                         <Path x:Name="CheckMark"
-                                              Stroke="{ToggleButtonOnColor}"
+                                              Stroke="{DynamicResource ToggleButtonOnColor}"
                                               StrokeThickness="2"
                                               Data="M 0 5 L 5 10 L 12 0"
                                               Visibility="Collapsed"/>
@@ -359,8 +363,8 @@
                                 <Setter TargetName="CheckMark" Property="Visibility" Value="Visible"/>
                             </Trigger>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <!--Setter TargetName="Border" Property="Background" Value="{ButtonBackgroundPressedColor}"/-->
+                                <!--Setter TargetName="Border" Property="Background" Value="{DynamicResource ButtonBackgroundPressedColor}"/-->
-                                <Setter Property="Foreground" Value="{ButtonBackgroundPressedColor}"/>
+                                <Setter Property="Foreground" Value="{DynamicResource ButtonBackgroundPressedColor}"/>
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -452,7 +456,7 @@
                         <Border Grid.Column="1" x:Name="Border" CornerRadius="8"
                                 BorderThickness="1"
                                 Width="34" Height="17">
-                            <Ellipse x:Name="Ellipse" Fill="{MainForegroundColor}" Stretch="Uniform"
+                            <Ellipse x:Name="Ellipse" Fill="{DynamicResource MainForegroundColor}" Stretch="Uniform"
                                     Margin="2,2,2,1"
                                     HorizontalAlignment="Left" Width="10.8"
                                     RenderTransformOrigin="0.5, 0.5">
@@ -465,8 +469,8 @@
 
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Border" Property="BorderBrush" Value="{MainForegroundColor}" />
+                                <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource MainForegroundColor}" />
-                                <Setter TargetName="Border" Property="Background" Value="{LinkHoverForegroundColor}"/>
+                                <Setter TargetName="Border" Property="Background" Value="{DynamicResource LinkHoverForegroundColor}"/>
                                 <Setter Property="Cursor" Value="Hand" />
                                 <Setter Property="Panel.ZIndex" Value="1000"/>
                                 <Trigger.EnterActions>
@@ -495,29 +499,19 @@
                                 </Trigger.ExitActions>
                             </Trigger>
                             <Trigger Property="ToggleButton.IsChecked" Value="False">
-                                <Setter TargetName="Border" Property="Background" Value="{MainBackgroundColor}" />
+                                <Setter TargetName="Border" Property="Background" Value="{DynamicResource MainBackgroundColor}" />
                                 <Setter TargetName="Border" Property="BorderBrush" Value="#707070" />
                                 <Setter TargetName="Ellipse" Property="Fill" Value="#707070" />
                             </Trigger>
 
                             <Trigger Property="ToggleButton.IsChecked" Value="True">
-                                <Setter TargetName="Border" Property="Background" Value="{MainBackgroundColor}" />
+                                <Setter TargetName="Border" Property="Background" Value="{DynamicResource ToggleButtonOnColor}" />
-                                <Setter TargetName="Border" Property="BorderBrush" Value="{MainForegroundColor}" />
+                                <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource ToggleButtonOnColor}" />
-                                <Setter TargetName="Ellipse" Property="Fill" Value="{MainForegroundColor}" />
+                                <Setter TargetName="Ellipse" Property="Fill" Value="White" />
 
                                 <Trigger.EnterActions>
                                     <BeginStoryboard>
                                         <Storyboard>
-                                            <ColorAnimation Storyboard.TargetName="Border"
-                                                    Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
-                                                    To="{ToggleButtonOnColor}" Duration="0:0:0.1" />
-                                            <ColorAnimation Storyboard.TargetName="Border"
-                                                    Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Color)"
-                                                    To="{ToggleButtonOnColor}" Duration="0:0:0.1" />
-
-                                            <ColorAnimation Storyboard.TargetName="Ellipse"
-                                                    Storyboard.TargetProperty="(Fill).(SolidColorBrush.Color)"
-                                                    To="White" Duration="0:0:0.1" />
                                             <ThicknessAnimation Storyboard.TargetName="Ellipse"
                                                     Storyboard.TargetProperty="Margin"
                                                     To="18,2,2,2" Duration="0:0:0.1" />
@@ -527,14 +521,9 @@
                                 <Trigger.ExitActions>
                                     <BeginStoryboard>
                                         <Storyboard>
-                                            <ColorAnimation Storyboard.TargetName="Border"
-                                                    Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
-                                                    To="{MainBackgroundColor}" Duration="0:0:0.1" />
-
                                             <ThicknessAnimation Storyboard.TargetName="Ellipse"
                                                     Storyboard.TargetProperty="Margin"
                                                     To="2,2,2,1" Duration="0:0:0.1" />
-
                                         </Storyboard>
                                     </BeginStoryboard>
                                 </Trigger.ExitActions>
@@ -547,8 +536,9 @@
         </Style>
 
         <Style x:Key="labelfortweaks" TargetType="{x:Type Label}">
-            <Setter Property="Foreground" Value="{MainForegroundColor}" />
+            <Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}" />
-            <Setter Property="Background" Value="{MainBackgroundColor}" />
+            <Setter Property="Background" Value="{DynamicResource MainBackgroundColor}" />
+            <Setter Property="FontFamily" Value="{DynamicResource FontFamily}"/>
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
                     <Setter Property="Foreground" Value="White" />
@@ -557,45 +547,26 @@
         </Style>
 
         <Style x:Key="BorderStyle" TargetType="Border">
-            <Setter Property="Background" Value="{MainBackgroundColor}"/>
+            <Setter Property="Background" Value="{DynamicResource MainBackgroundColor}"/>
-            <Setter Property="BorderBrush" Value="{BorderColor}"/>
+            <Setter Property="BorderBrush" Value="{DynamicResource BorderColor}"/>
             <Setter Property="BorderThickness" Value="1"/>
             <Setter Property="CornerRadius" Value="5"/>
             <Setter Property="Padding" Value="5"/>
             <Setter Property="Margin" Value="5"/>
             <Setter Property="Effect">
                 <Setter.Value>
-                    <DropShadowEffect ShadowDepth="5" BlurRadius="5" Opacity="{BorderOpacity}" Color="{BorderColor}"/>
+                    <DropShadowEffect ShadowDepth="5" BlurRadius="5" Opacity="{DynamicResource BorderOpacity}" Color="{DynamicResource CBorderColor}"/>
                 </Setter.Value>
             </Setter>
-            <Style.Triggers>
-                <EventTrigger RoutedEvent="Loaded">
-                    <BeginStoryboard>
-                        <Storyboard RepeatBehavior="Forever">
-                            <!-- <DoubleAnimation
-                                Storyboard.TargetProperty="Effect.(DropShadowEffect.ShadowDepth)"
-                                From="6" To="15" Duration="{ShadowPulse}" AutoReverse="True"/> -->
-                            <!-- <DoubleAnimation
-                                Storyboard.TargetProperty="Effect.(DropShadowEffect.Direction)"
-                                From="0" To="360" Duration="Forever"/> -->
-                            <DoubleAnimation
-                                Storyboard.TargetProperty="Effect.(DropShadowEffect.Opacity)"
-                                From="0.5" To="0.94" Duration="{ShadowPulse}" AutoReverse="True"/>
-                            <DoubleAnimation
-                                Storyboard.TargetProperty="Effect.(DropShadowEffect.BlurRadius)"
-                                From="5" To="15" Duration="{ShadowPulse}" AutoReverse="True"/>
-                        </Storyboard>
-                    </BeginStoryboard>
-                </EventTrigger>
-            </Style.Triggers>
         </Style>
 
         <Style TargetType="TextBox">
-            <Setter Property="Background" Value="{MainBackgroundColor}"/>
+            <Setter Property="Background" Value="{DynamicResource MainBackgroundColor}"/>
-            <Setter Property="BorderBrush" Value="{MainForegroundColor}"/>
+            <Setter Property="BorderBrush" Value="{DynamicResource MainForegroundColor}"/>
             <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Foreground" Value="{MainForegroundColor}"/>
+            <Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}"/>
-            <Setter Property="FontSize" Value="{FontSize}"/>
+            <Setter Property="FontSize" Value="{DynamicResource FontSize}"/>
+            <Setter Property="FontFamily" Value="{DynamicResource FontFamily}"/>
             <Setter Property="Padding" Value="5"/>
             <Setter Property="HorizontalAlignment" Value="Stretch"/>
             <Setter Property="VerticalAlignment" Value="Center"/>
@@ -608,11 +579,11 @@
                                 <Setter Property="Template">
                                     <Setter.Value>
                                         <ControlTemplate TargetType="ContextMenu">
-                                            <Border Background="{MainBackgroundColor}" BorderBrush="{MainForegroundColor}" BorderThickness="1" CornerRadius="5" Padding="5">
+                                            <Border Background="{DynamicResource MainBackgroundColor}" BorderBrush="{DynamicResource BorderColor}" BorderThickness="1" CornerRadius="5" Padding="5">
                                                 <StackPanel>
-                                                    <MenuItem Command="Cut" Header="Cut"/>
+                                                    <MenuItem Command="Cut" Header="Cut" Foreground="{DynamicResource MainForegroundColor}"/>
-                                                    <MenuItem Command="Copy" Header="Copy"/>
+                                                    <MenuItem Command="Copy" Header="Copy" Foreground="{DynamicResource MainForegroundColor}"/>
-                                                    <MenuItem Command="Paste" Header="Paste"/>
+                                                    <MenuItem Command="Paste" Header="Paste" Foreground="{DynamicResource MainForegroundColor}"/>
                                                 </StackPanel>
                                             </Border>
                                         </ControlTemplate>
@@ -639,16 +610,17 @@
             </Setter>
             <Setter Property="Effect">
                 <Setter.Value>
-                    <DropShadowEffect ShadowDepth="5" BlurRadius="5" Opacity="{BorderOpacity}" Color="{BorderColor}"/>
+                    <DropShadowEffect ShadowDepth="5" BlurRadius="5" Opacity="{DynamicResource BorderOpacity}" Color="{DynamicResource CBorderColor}"/>
                 </Setter.Value>
             </Setter>
         </Style>
         <Style TargetType="PasswordBox">
-            <Setter Property="Background" Value="{MainBackgroundColor}"/>
+            <Setter Property="Background" Value="{DynamicResource MainBackgroundColor}"/>
-            <Setter Property="BorderBrush" Value="{MainForegroundColor}"/>
+            <Setter Property="BorderBrush" Value="{DynamicResource MainForegroundColor}"/>
             <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Foreground" Value="{MainForegroundColor}"/>
+            <Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}"/>
-            <Setter Property="FontSize" Value="{FontSize}"/>
+            <Setter Property="FontSize" Value="{DynamicResource FontSize}"/>
+            <Setter Property="FontFamily" Value="{DynamicResource FontFamily}"/>
             <Setter Property="Padding" Value="5"/>
             <Setter Property="HorizontalAlignment" Value="Stretch"/>
             <Setter Property="VerticalAlignment" Value="Center"/>
@@ -669,7 +641,7 @@
             </Setter>
             <Setter Property="Effect">
                 <Setter.Value>
-                    <DropShadowEffect ShadowDepth="5" BlurRadius="5" Opacity="{BorderOpacity}" Color="{BorderColor}"/>
+                    <DropShadowEffect ShadowDepth="5" BlurRadius="5" Opacity="{DynamicResource BorderOpacity}" Color="{DynamicResource CBorderColor}"/>
                 </Setter.Value>
             </Setter>
         </Style>
@@ -686,63 +658,64 @@
             </Style.Triggers>
         </Style>
     </Window.Resources>
-    <Grid Background="{MainBackgroundColor}" ShowGridLines="False" Name="WPFMainGrid" Width="Auto" Height="Auto" HorizontalAlignment="Stretch">
+    <Grid Background="{DynamicResource MainBackgroundColor}" ShowGridLines="False" Name="WPFMainGrid" Width="Auto" Height="Auto" HorizontalAlignment="Stretch">
         <Grid.RowDefinitions>
-            <RowDefinition Height="{TabRowHeightInPixels}px"/>
+            <RowDefinition Height="{DynamicResource TabRowHeightInPixels}"/>
             <RowDefinition Height=".9*"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
-        <DockPanel HorizontalAlignment="Stretch" Background="{MainBackgroundColor}" SnapsToDevicePixels="True" Grid.Row="0" Width="Auto">
+        <DockPanel HorizontalAlignment="Stretch" Background="{DynamicResource MainBackgroundColor}" SnapsToDevicePixels="True" Grid.Row="0" Width="Auto">
-            <StackPanel Name="NavLogoPanel" Orientation="Horizontal" HorizontalAlignment="Left" Background="{MainBackgroundColor}" SnapsToDevicePixels="True" Margin="10,0,20,0">
+            <StackPanel Name="NavLogoPanel" Orientation="Horizontal" HorizontalAlignment="Left" Background="{DynamicResource MainBackgroundColor}" SnapsToDevicePixels="True" Margin="10,0,20,0">
             </StackPanel>
-            <ToggleButton HorizontalAlignment="Left" Height="{TabButtonHeight}" Width="{TabButtonWidth}"
+            <ToggleButton HorizontalAlignment="Left" Height="{DynamicResource TabButtonHeight}" Width="{DynamicResource TabButtonWidth}"
-                Background="{ButtonInstallBackgroundColor}" Foreground="white" FontWeight="Bold" Name="WPFTab1BT">
+                Background="{DynamicResource ButtonInstallBackgroundColor}" Foreground="white" FontWeight="Bold" Name="WPFTab1BT">
                 <ToggleButton.Content>
-                    <TextBlock FontSize="{TabButtonFontSize}" Background="Transparent" Foreground="{ButtonInstallForegroundColor}" >
+                    <TextBlock FontSize="{DynamicResource TabButtonFontSize}" Background="Transparent" Foreground="{DynamicResource ButtonInstallForegroundColor}" >
                         <Underline>I</Underline>nstall
                     </TextBlock>
                 </ToggleButton.Content>
             </ToggleButton>
-            <ToggleButton HorizontalAlignment="Left" Height="{TabButtonHeight}" Width="{TabButtonWidth}"
+            <ToggleButton HorizontalAlignment="Left" Height="{DynamicResource TabButtonHeight}" Width="{DynamicResource TabButtonWidth}"
-                Background="{ButtonTweaksBackgroundColor}" Foreground="{ButtonTweaksForegroundColor}" FontWeight="Bold" Name="WPFTab2BT">
+                Background="{DynamicResource ButtonTweaksBackgroundColor}" Foreground="{DynamicResource ButtonTweaksForegroundColor}" FontWeight="Bold" Name="WPFTab2BT">
                 <ToggleButton.Content>
-                    <TextBlock FontSize="{TabButtonFontSize}" Background="Transparent" Foreground="{ButtonTweaksForegroundColor}">
+                    <TextBlock FontSize="{DynamicResource TabButtonFontSize}" Background="Transparent" Foreground="{DynamicResource ButtonTweaksForegroundColor}">
                         <Underline>T</Underline>weaks
                     </TextBlock>
                 </ToggleButton.Content>
             </ToggleButton>
-            <ToggleButton HorizontalAlignment="Left" Height="{TabButtonHeight}" Width="{TabButtonWidth}"
+            <ToggleButton HorizontalAlignment="Left" Height="{DynamicResource TabButtonHeight}" Width="{DynamicResource TabButtonWidth}"
-                Background="{ButtonConfigBackgroundColor}" Foreground="{ButtonConfigForegroundColor}" FontWeight="Bold" Name="WPFTab3BT">
+                Background="{DynamicResource ButtonConfigBackgroundColor}" Foreground="{DynamicResource ButtonConfigForegroundColor}" FontWeight="Bold" Name="WPFTab3BT">
                 <ToggleButton.Content>
-                    <TextBlock FontSize="{TabButtonFontSize}" Background="Transparent" Foreground="{ButtonConfigForegroundColor}">
+                    <TextBlock FontSize="{DynamicResource TabButtonFontSize}" Background="Transparent" Foreground="{DynamicResource ButtonConfigForegroundColor}">
                         <Underline>C</Underline>onfig
                     </TextBlock>
                 </ToggleButton.Content>
             </ToggleButton>
-            <ToggleButton HorizontalAlignment="Left" Height="{TabButtonHeight}" Width="{TabButtonWidth}"
+            <ToggleButton HorizontalAlignment="Left" Height="{DynamicResource TabButtonHeight}" Width="{DynamicResource TabButtonWidth}"
-                Background="{ButtonUpdatesBackgroundColor}" Foreground="{ButtonUpdatesForegroundColor}" FontWeight="Bold" Name="WPFTab4BT">
+                Background="{DynamicResource ButtonUpdatesBackgroundColor}" Foreground="{DynamicResource ButtonUpdatesForegroundColor}" FontWeight="Bold" Name="WPFTab4BT">
                 <ToggleButton.Content>
-                    <TextBlock FontSize="{TabButtonFontSize}" Background="Transparent" Foreground="{ButtonUpdatesForegroundColor}">
+                    <TextBlock FontSize="{DynamicResource TabButtonFontSize}" Background="Transparent" Foreground="{DynamicResource ButtonUpdatesForegroundColor}">
                         <Underline>U</Underline>pdates
                     </TextBlock>
                 </ToggleButton.Content>
             </ToggleButton>
-            <ToggleButton HorizontalAlignment="Left" Height="{TabButtonHeight}" Width="{TabButtonWidth}"
+            <ToggleButton HorizontalAlignment="Left" Height="{DynamicResource TabButtonHeight}" Width="{DynamicResource TabButtonWidth}"
-                Background="{ButtonUpdatesBackgroundColor}" Foreground="{ButtonUpdatesForegroundColor}" FontWeight="Bold" Name="WPFTab5BT">
+                Background="{DynamicResource ButtonUpdatesBackgroundColor}" Foreground="{DynamicResource ButtonUpdatesForegroundColor}" FontWeight="Bold" Name="WPFTab5BT">
                 <ToggleButton.Content>
-                    <TextBlock FontSize="{TabButtonFontSize}" Background="Transparent" Foreground="{ButtonUpdatesForegroundColor}">
+                    <TextBlock FontSize="{DynamicResource TabButtonFontSize}" Background="Transparent" Foreground="{DynamicResource ButtonUpdatesForegroundColor}">
                         <Underline>M</Underline>icroWin
                     </TextBlock>
                 </ToggleButton.Content>
             </ToggleButton>
-            <Grid Background="{MainBackgroundColor}" ShowGridLines="False" Width="Auto" Height="Auto" HorizontalAlignment="Stretch">
+            <Grid Background="{DynamicResource MainBackgroundColor}" ShowGridLines="False" Width="Auto" Height="Auto" HorizontalAlignment="Stretch">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/> <!-- Main content area -->
                     <ColumnDefinition Width="Auto"/><!-- Space for options button -->
                     <ColumnDefinition Width="Auto"/><!-- Space for close button -->
                     <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
 
                 <!--
@@ -756,13 +729,13 @@
                 -->
                 <TextBox
                     Grid.Column="0"
-                    Width="{SearchBarWidth}"
+                    Width="{DynamicResource SearchBarWidth}"
-                    Height="{SearchBarHeight}"
+                    Height="{DynamicResource SearchBarHeight}"
-                    FontSize="{SearchBarTextBoxFontSize}"
+                    FontSize="{DynamicResource SearchBarTextBoxFontSize}"
                     VerticalAlignment="Center" HorizontalAlignment="Left"
                     BorderThickness="1"
                     Name="SearchBar"
-                    Foreground="{MainForegroundColor}" Background="{MainBackgroundColor}"
+                    Foreground="{DynamicResource MainForegroundColor}" Background="{DynamicResource MainBackgroundColor}"
                     Padding="3,3,30,0"
                     Margin="5,0,0,0"
                     ToolTip="Press Ctrl-F and type app name to filter application list below. Press Esc to reset the filter">
@@ -771,8 +744,7 @@
                     Grid.Column="0"
                     VerticalAlignment="Center" HorizontalAlignment="Left"
                     FontFamily="Segoe MDL2 Assets"
-                    Foreground="{ButtonBackgroundSelectedColor}"
+                    FontSize="{DynamicResource DynamicResource IconFontSize}"
-                    FontSize="{IconFontSize}"
                     Margin="180,0,0,0">&#xE721;
                 </TextBlock>
                 <!--
@@ -794,8 +766,8 @@
                     Minimum="0"
                     Maximum="100"
                     Width="250"
-                    Height="{SearchBarHeight}"
+                    Height="{DynamicResource SearchBarHeight}"
-                    Foreground="{ProgressBarForegroundColor}" Background="{ProgressBarBackgroundColor}" BorderBrush="{ProgressBarForegroundColor}"
+                    Foreground="{DynamicResource ProgressBarForegroundColor}" Background="{DynamicResource ProgressBarBackgroundColor}" BorderBrush="{DynamicResource ProgressBarForegroundColor}"
                     Visibility="Collapsed"
                     VerticalAlignment="Center" HorizontalAlignment="Left"
                     Margin="2,0,0,0" BorderThickness="1" Padding="6,2,2,2"
@@ -804,9 +776,9 @@
                 <Label
                     Grid.Column="1"
                     Width="250"
-                    Height="{SearchBarHeight}"
+                    Height="{DynamicResource SearchBarHeight}"
                     VerticalAlignment="Center" HorizontalAlignment="Left"
-                    FontSize="{SearchBarTextBoxFontSize}"
+                    FontSize="{DynamicResource SearchBarTextBoxFontSize}"
                     Background="Transparent"
                     Visibility="Collapsed"
                     Margin="2,0,0,0" BorderThickness="0" Padding="6,2,2,2"
@@ -814,54 +786,92 @@
                     <TextBlock
                         TextTrimming="CharacterEllipsis"
                         Background="Transparent"
-                        Foreground="{ProgressBarTextColor}">
+                        Foreground="{DynamicResource ProgressBarTextColor}">
                     </TextBlock>
                 </Label>
+                <Button Name="ThemeButton"
+                    Style="{StaticResource HoverButtonStyle}"
+                    Grid.Column="2" BorderBrush="Transparent"
+                    Background="{DynamicResource MainBackgroundColor}"
+                    Foreground="{DynamicResource MainForegroundColor}"
+                    FontSize="{DynamicResource SettingsIconFontSize}"
+                    Width="{DynamicResource IconButtonSize}" Height="{DynamicResource IconButtonSize}"
+                    HorizontalAlignment="Right" VerticalAlignment="Top"
+                    Margin="0,5,5,0"
+                    FontFamily="Segoe MDL2 Assets"
+                    Content="N/A"
+                    ToolTip="Change the Winutil UI Theme"
+                />
+                <Popup Grid.Column="2" Name="ThemePopup"
+                    IsOpen="False"
+                    PlacementTarget="{Binding ElementName=ThemeButton}" Placement="Bottom"
+                    HorizontalAlignment="Right" VerticalAlignment="Top">
+                    <Border Background="{DynamicResource MainBackgroundColor}" BorderBrush="{DynamicResource MainForegroundColor}" BorderThickness="1" CornerRadius="0" Margin="0">
+                        <StackPanel Background="{DynamicResource MainBackgroundColor}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                            <MenuItem FontSize="{DynamicResource ButtonFontSize}" Header="Auto" Name="AutoThemeMenuItem" Foreground="{DynamicResource MainForegroundColor}">
+                                <MenuItem.ToolTip>
+                                    <ToolTip Content="Follow the Windows Theme"/>
+                                </MenuItem.ToolTip>
+                            </MenuItem>
+                            <MenuItem FontSize="{DynamicResource ButtonFontSize}" Header="Dark" Name="DarkThemeMenuItem" Foreground="{DynamicResource MainForegroundColor}">
+                                <MenuItem.ToolTip>
+                                    <ToolTip Content="Use Dark Theme"/>
+                                </MenuItem.ToolTip>
+                            </MenuItem>
+                            <MenuItem FontSize="{DynamicResource ButtonFontSize}" Header="Light" Name="LightThemeMenuItem" Foreground="{DynamicResource MainForegroundColor}">
+                                <MenuItem.ToolTip>
+                                    <ToolTip Content="Use Light Theme"/>
+                                </MenuItem.ToolTip>
+                            </MenuItem>
+                        </StackPanel>
+                    </Border>
+                </Popup>
+
 
                 <Button Name="SettingsButton"
                     Style="{StaticResource HoverButtonStyle}"
-                    Grid.Column="2" BorderBrush="Transparent"
+                    Grid.Column="3" BorderBrush="Transparent"
-                    Background="{MainBackgroundColor}"
+                    Background="{DynamicResource MainBackgroundColor}"
-                    Foreground="{MainForegroundColor}"
+                    Foreground="{DynamicResource MainForegroundColor}"
-                    FontSize="{SettingsIconFontSize}"
+                    FontSize="{DynamicResource SettingsIconFontSize}"
-                    Width="{IconButtonSize}" Height="{IconButtonSize}"
+                    Width="{DynamicResource IconButtonSize}" Height="{DynamicResource IconButtonSize}"
                     HorizontalAlignment="Right" VerticalAlignment="Top"
                     Margin="5,5,5,0"
                     FontFamily="Segoe MDL2 Assets"
                     Content="&#xE713;"/>
-                <Popup Grid.Column="2" Name="SettingsPopup"
+                <Popup Grid.Column="3" Name="SettingsPopup"
                     IsOpen="False"
                     PlacementTarget="{Binding ElementName=SettingsButton}" Placement="Bottom"
                     HorizontalAlignment="Right" VerticalAlignment="Top">
-                    <Border Background="{MainBackgroundColor}" BorderBrush="{MainForegroundColor}" BorderThickness="1" CornerRadius="0" Margin="0">
+                    <Border Background="{DynamicResource MainBackgroundColor}" BorderBrush="{DynamicResource MainForegroundColor}" BorderThickness="1" CornerRadius="0" Margin="0">
-                        <StackPanel Background="{MainBackgroundColor}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                        <StackPanel Background="{DynamicResource MainBackgroundColor}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                            <MenuItem FontSize="{ButtonFontSize}" Header="Import" Name="ImportMenuItem" Foreground="{MainForegroundColor}">
+                            <MenuItem FontSize="{DynamicResource ButtonFontSize}" Header="Import" Name="ImportMenuItem" Foreground="{DynamicResource MainForegroundColor}">
                                 <MenuItem.ToolTip>
                                     <ToolTip Content="Import Configuration from exported file."/>
                                 </MenuItem.ToolTip>
                             </MenuItem>
-                            <MenuItem FontSize="{ButtonFontSize}" Header="Export" Name="ExportMenuItem" Foreground="{MainForegroundColor}">
+                            <MenuItem FontSize="{DynamicResource ButtonFontSize}" Header="Export" Name="ExportMenuItem" Foreground="{DynamicResource MainForegroundColor}">
                                 <MenuItem.ToolTip>
                                     <ToolTip Content="Export Selected Elements and copy execution command to clipboard."/>
                                 </MenuItem.ToolTip>
                             </MenuItem>
                             <Separator/>
-                            <MenuItem FontSize="{ButtonFontSize}" Header="About" Name="AboutMenuItem" Foreground="{MainForegroundColor}"/>
+                            <MenuItem FontSize="{DynamicResource ButtonFontSize}" Header="About" Name="AboutMenuItem" Foreground="{DynamicResource MainForegroundColor}"/>
-                            <MenuItem FontSize="{ButtonFontSize}" Header="Sponsors" Name="SponsorMenuItem" Foreground="{MainForegroundColor}"/>
+                            <MenuItem FontSize="{DynamicResource ButtonFontSize}" Header="Sponsors" Name="SponsorMenuItem" Foreground="{DynamicResource MainForegroundColor}"/>
                         </StackPanel>
                     </Border>
                 </Popup>
 
             <Button
-                Grid.Column="3"
+                Grid.Column="4"
                 Content="&#xD7;" BorderThickness="0"
                 BorderBrush="Transparent"
-                Background="{MainBackgroundColor}"
+                Background="{DynamicResource MainBackgroundColor}"
-                Width="{IconButtonSize}" Height="{IconButtonSize}"
+                Width="{DynamicResource IconButtonSize}" Height="{DynamicResource IconButtonSize}"
                 HorizontalAlignment="Right" VerticalAlignment="Top"
                 Margin="0,5,5,0"
-                FontFamily="Arial"
+                FontFamily="{DynamicResource FontFamily}"
-                Foreground="{MainForegroundColor}" FontSize="{CloseIconFontSize}" Name="WPFCloseButton" />
+                Foreground="{DynamicResource MainForegroundColor}" FontSize="{DynamicResource CloseIconFontSize}" Name="WPFCloseButton" />
             </Grid>
 
         </DockPanel>
@@ -874,7 +884,7 @@
                         <RowDefinition Height="45px"/>
                         <RowDefinition Height="0.95*"/>
                     </Grid.RowDefinitions>
-                    <StackPanel Background="{MainBackgroundColor}" Orientation="Horizontal" Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.Column="0" Grid.ColumnSpan="3" Margin="{TabContentMargin}">
+                    <StackPanel Background="{DynamicResource MainBackgroundColor}" Orientation="Horizontal" Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.Column="0" Grid.ColumnSpan="3" Margin="{DynamicResource TabContentMargin}">
                         <Button Name="WPFInstall" Content=" Install/Upgrade Selected" Margin="2" />
                         <Button Name="WPFInstallUpgrade" Content=" Upgrade All" Margin="2"/>
                         <Button Name="WPFUninstall" Content=" Uninstall Selected" Margin="2"/>
@@ -885,13 +895,13 @@
                         </CheckBox>
                     </StackPanel>
 
-                    <ScrollViewer x:Name="scrollViewer" Grid.Row="1" Grid.Column="0" Margin="{TabContentMargin}" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"
+                    <ScrollViewer x:Name="scrollViewer" Grid.Row="1" Grid.Column="0" Margin="{DynamicResource TabContentMargin}" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"
                                 BorderBrush="Transparent" BorderThickness="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                         <Grid Name="appspanel" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                         </Grid>
                     </ScrollViewer>
 
-                    <Rectangle Grid.Row="1" Grid.Column="0" Width="22" Height="22" Fill="{MainBackgroundColor}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Style="{StaticResource ScrollVisibilityRectangle}"/>
+                    <Rectangle Grid.Row="1" Grid.Column="0" Width="22" Height="22" Fill="{DynamicResource MainBackgroundColor}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Style="{StaticResource ScrollVisibilityRectangle}"/>
 
                 </Grid>
             </TabItem>
@@ -903,7 +913,7 @@
                         <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
 
-                    <ScrollViewer VerticalScrollBarVisibility="Auto" Grid.Row="0" Margin="{TabContentMargin}">
+                    <ScrollViewer VerticalScrollBarVisibility="Auto" Grid.Row="0" Margin="{DynamicResource TabContentMargin}">
                         <Grid Background="Transparent">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="45px"/>
@@ -911,8 +921,8 @@
                                 <RowDefinition Height="Auto"/>
                             </Grid.RowDefinitions>
 
-                            <StackPanel Background="{MainBackgroundColor}" Orientation="Horizontal" HorizontalAlignment="Left" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="5">
+                            <StackPanel Background="{DynamicResource MainBackgroundColor}" Orientation="Horizontal" HorizontalAlignment="Left" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="5">
-                                <Label Content="Recommended Selections:" FontSize="{FontSize}" VerticalAlignment="Center" Margin="2"/>
+                                <Label Content="Recommended Selections:" FontSize="{DynamicResource FontSize}" VerticalAlignment="Center" Margin="2"/>
                                 <Button Name="WPFstandard" Content=" Standard " Margin="2"/>
                                 <Button Name="WPFminimal" Content=" Minimal " Margin="2"/>
                                 <Button Name="WPFClearTweaksSelection" Content=" Clear " Margin="2"/>
@@ -924,7 +934,7 @@
                             </Grid>
 
                             <Border Grid.ColumnSpan="2" Grid.Row="2" Grid.Column="0" Style="{StaticResource BorderStyle}">
-                                <StackPanel Background="{MainBackgroundColor}" Orientation="Horizontal" HorizontalAlignment="Left">
+                                <StackPanel Background="{DynamicResource MainBackgroundColor}" Orientation="Horizontal" HorizontalAlignment="Left">
                                     <TextBlock Padding="10">
                                         Note: Hover over items to get a better description. Please be careful as many of these tweaks will heavily modify your system.
                                         <LineBreak/>Recommended selections are for normal users and if you are unsure do NOT check anything else!
@@ -933,7 +943,7 @@
                             </Border>
                         </Grid>
                     </ScrollViewer>
-                    <Border Grid.Row="1" Background="{MainBackgroundColor}" BorderBrush="{BorderColor}" BorderThickness="1" CornerRadius="5" HorizontalAlignment="Stretch" Padding="10">
+                    <Border Grid.Row="1" Background="{DynamicResource MainBackgroundColor}" BorderBrush="{DynamicResource BorderColor}" BorderThickness="1" CornerRadius="5" HorizontalAlignment="Stretch" Padding="10">
                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Grid.Column="0">
                             <Button Name="WPFTweaksbutton" Content="Run Tweaks" Margin="5"/>
                             <Button Name="WPFUndoall" Content="Undo Selected Tweaks" Margin="5"/>
@@ -942,13 +952,13 @@
                 </Grid>
             </TabItem>
             <TabItem Header="Config" Visibility="Collapsed" Name="WPFTab3">
-                <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="{TabContentMargin}">
+                <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="{DynamicResource TabContentMargin}">
                     <Grid Name="featurespanel" Grid.Row="1" Background="Transparent">
                     </Grid>
                 </ScrollViewer>
             </TabItem>
             <TabItem Header="Updates" Visibility="Collapsed" Name="WPFTab4">
-                <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="{TabContentMargin}">
+                <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="{DynamicResource TabContentMargin}">
                 <Grid Background="Transparent">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
@@ -956,21 +966,21 @@
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
                     <Border Grid.Row="0" Grid.Column="0" Style="{StaticResource BorderStyle}">
-                        <StackPanel Background="{MainBackgroundColor}" SnapsToDevicePixels="True">
+                        <StackPanel Background="{DynamicResource MainBackgroundColor}" SnapsToDevicePixels="True">
-                            <Button Name="WPFUpdatesdefault" FontSize="{ConfigTabButtonFontSize}" Height="Auto" Width="Auto" Content="Default (Out of Box) Settings" Margin="20,4,20,10" Padding="10"/>
+                            <Button Name="WPFUpdatesdefault" FontSize="{DynamicResource ConfigTabButtonFontSize}" Height="Auto" Width="Auto" Content="Default (Out of Box) Settings" Margin="20,4,20,10" Padding="10"/>
-                            <TextBlock Foreground="{ComboBoxForegroundColor}" Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300">This is the default settings that come with Windows. <LineBreak/><LineBreak/> No modifications are made and will remove any custom windows update settings.<LineBreak/><LineBreak/>Note: If you still encounter update errors, reset all updates in the config tab. That will restore ALL Microsoft Update Services from their servers and reinstall them to default settings.</TextBlock>
+                            <TextBlock Foreground="{DynamicResource ComboBoxForegroundColor}" Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300">This is the default settings that come with Windows. <LineBreak/><LineBreak/> No modifications are made and will remove any custom windows update settings.<LineBreak/><LineBreak/>Note: If you still encounter update errors, reset all updates in the config tab. That will restore ALL Microsoft Update Services from their servers and reinstall them to default settings.</TextBlock>
                         </StackPanel>
                     </Border>
                     <Border Grid.Row="0" Grid.Column="1" Style="{StaticResource BorderStyle}">
-                        <StackPanel Background="{MainBackgroundColor}" SnapsToDevicePixels="True">
+                        <StackPanel Background="{DynamicResource MainBackgroundColor}" SnapsToDevicePixels="True">
-                            <Button Name="WPFUpdatessecurity" FontSize="{ConfigTabButtonFontSize}" Height="Auto" Width="Auto" Content="Security (Recommended) Settings" Margin="20,4,20,10" Padding="10"/>
+                            <Button Name="WPFUpdatessecurity" FontSize="{DynamicResource ConfigTabButtonFontSize}" Height="Auto" Width="Auto" Content="Security (Recommended) Settings" Margin="20,4,20,10" Padding="10"/>
-                            <TextBlock Foreground="{ComboBoxForegroundColor}" Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300">This is my recommended setting I use on all computers.<LineBreak/><LineBreak/> It will delay feature updates by 2 years and will install security updates 4 days after release.<LineBreak/><LineBreak/>Feature Updates: Adds features and often bugs to systems when they are released. You want to delay these as long as possible.<LineBreak/><LineBreak/>Security Updates: Typically these are pressing security flaws that need to be patched quickly. You only want to delay these a couple of days just to see if they are safe and don't break other systems. You don't want to go without these for ANY extended periods of time.</TextBlock>
+                            <TextBlock Foreground="{DynamicResource ComboBoxForegroundColor}" Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300">This is my recommended setting I use on all computers.<LineBreak/><LineBreak/> It will delay feature updates by 2 years and will install security updates 4 days after release.<LineBreak/><LineBreak/>Feature Updates: Adds features and often bugs to systems when they are released. You want to delay these as long as possible.<LineBreak/><LineBreak/>Security Updates: Typically these are pressing security flaws that need to be patched quickly. You only want to delay these a couple of days just to see if they are safe and don't break other systems. You don't want to go without these for ANY extended periods of time.</TextBlock>
                         </StackPanel>
                     </Border>
                     <Border Grid.Row="0" Grid.Column="2" Style="{StaticResource BorderStyle}">
-                        <StackPanel Background="{MainBackgroundColor}" SnapsToDevicePixels="True">
+                        <StackPanel Background="{DynamicResource MainBackgroundColor}" SnapsToDevicePixels="True">
-                            <Button Name="WPFUpdatesdisable" FontSize="{ConfigTabButtonFontSize}" Height="Auto" Width="Auto" Content="Disable ALL Updates (NOT RECOMMENDED!)" Margin="20,4,20,10" Padding="10,10,10,10"/>
+                            <Button Name="WPFUpdatesdisable" FontSize="{DynamicResource ConfigTabButtonFontSize}" Height="Auto" Width="Auto" Content="Disable ALL Updates (NOT RECOMMENDED!)" Margin="20,4,20,10" Padding="10,10,10,10"/>
-                            <TextBlock Foreground="{ComboBoxForegroundColor}" Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300">This completely disables ALL Windows Updates and is NOT RECOMMENDED.<LineBreak/><LineBreak/> However, it can be suitable if you use your system for a select purpose and do not actively browse the internet. <LineBreak/><LineBreak/>Note: Your system will be easier to hack and infect without security updates.</TextBlock>
+                            <TextBlock Foreground="{DynamicResource ComboBoxForegroundColor}" Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300">This completely disables ALL Windows Updates and is NOT RECOMMENDED.<LineBreak/><LineBreak/> However, it can be suitable if you use your system for a select purpose and do not actively browse the internet. <LineBreak/><LineBreak/>Note: Your system will be easier to hack and infect without security updates.</TextBlock>
                             <TextBlock Text=" " Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300"/>
                         </StackPanel>
                         </Border>
@@ -978,7 +988,7 @@
                 </ScrollViewer>
             </TabItem>
             <TabItem Header="MicroWin" Visibility="Collapsed" Name="WPFTab5">
-                <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="{TabContentMargin}">
+                <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="{DynamicResource TabContentMargin}">
                 <Grid Width="Auto" Height="Auto">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
@@ -991,28 +1001,28 @@
                         Style="{StaticResource BorderStyle}"
                         VerticalAlignment="Stretch"
                         HorizontalAlignment="Stretch">
-                    <StackPanel Name="MicrowinMain" Background="{MainBackgroundColor}" SnapsToDevicePixels="True" Grid.Column="0" Grid.Row="0">
+                    <StackPanel Name="MicrowinMain" Background="{DynamicResource MainBackgroundColor}" SnapsToDevicePixels="True" Grid.Column="0" Grid.Row="0">
                         <StackPanel Background="Transparent" SnapsToDevicePixels="True" Margin="1">
-                            <CheckBox x:Name="WPFMicrowinDownloadFromGitHub" Content="Download oscdimg.exe from CTT Github repo" IsChecked="False" Margin="{MicrowinCheckBoxMargin}" />
+                            <CheckBox x:Name="WPFMicrowinDownloadFromGitHub" Content="Download oscdimg.exe from CTT Github repo" IsChecked="False" Margin="{DynamicResource MicrowinCheckBoxMargin}" />
-                            <TextBlock Margin="5" Padding="1" TextWrapping="Wrap" Foreground="{ComboBoxForegroundColor}">
+                            <TextBlock Margin="5" Padding="1" TextWrapping="Wrap" Foreground="{DynamicResource ComboBoxForegroundColor}">
                                 Choose a Windows ISO file that you've downloaded <LineBreak/>
                                 Check the status in the console
                             </TextBlock>
-                            <CheckBox x:Name="WPFMicrowinISOScratchDir" Content="Use ISO directory for ScratchDir " IsChecked="False" Margin="{MicrowinCheckBoxMargin}"
+                            <CheckBox x:Name="WPFMicrowinISOScratchDir" Content="Use ISO directory for ScratchDir " IsChecked="False" Margin="{DynamicResource MicrowinCheckBoxMargin}"
                                 ToolTip="Use ISO directory for ScratchDir " />
                             <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*" /> <!-- Takes the remaining space -->
                                 <ColumnDefinition Width="30" /> <!-- Fixed width for Button -->
                             </Grid.ColumnDefinitions>
-                                <TextBox Name="MicrowinScratchDirBox" Background="Transparent" BorderBrush="{MainForegroundColor}"
+                                <TextBox Name="MicrowinScratchDirBox" Background="Transparent" BorderBrush="{DynamicResource MainForegroundColor}"
                                         Text="Scratch"
                                         Margin="2"
                                         IsReadOnly="False"
                                         ToolTip="Alt Path For Scratch Directory"
                                         Grid.Column="0"
                                         VerticalAlignment="Center"
-                                        Foreground="{LabelboxForegroundColor}">
+                                        Foreground="{DynamicResource LabelboxForegroundColor}">
                                 </TextBox>
                                 <Button Name="MicrowinScratchDirBT"
                                     Width="Auto"
@@ -1025,16 +1035,16 @@
                                     </Button.Content>
                                 </Button>
                             </Grid>
-                            <TextBox Name="MicrowinFinalIsoLocation" Background="Transparent" BorderBrush="{MainForegroundColor}"
+                            <TextBox Name="MicrowinFinalIsoLocation" Background="Transparent" BorderBrush="{DynamicResource MainForegroundColor}"
                                 Text="ISO location will be printed here"
                                 Margin="2"
                                 IsReadOnly="True"
                                 TextWrapping="Wrap"
-                                Foreground="{LabelboxForegroundColor}"
+                                Foreground="{DynamicResource LabelboxForegroundColor}"
                             />
                             <Button Name="WPFGetIso" Margin="2" Padding="15">
                                 <Button.Content>
-                                    <TextBlock Background="Transparent" Foreground="{ButtonForegroundColor}">
+                                    <TextBlock Background="Transparent" Foreground="{DynamicResource ButtonForegroundColor}">
                                         Select Windows <Underline>I</Underline>SO
                                     </TextBlock>
                                 </Button.Content>
@@ -1044,44 +1054,44 @@
                         <StackPanel Name="MicrowinOptionsPanel" HorizontalAlignment="Left" SnapsToDevicePixels="True" Margin="1" Visibility="Hidden">
                             <TextBlock Margin="6" Padding="1" TextWrapping="Wrap">Choose Windows SKU</TextBlock>
                             <ComboBox x:Name = "MicrowinWindowsFlavors" Margin="1" />
-                            <Rectangle Fill="{MainForegroundColor}" Height="2" HorizontalAlignment="Stretch" Margin="0,10,0,10"/>
+                            <Rectangle Fill="{DynamicResource MainForegroundColor}" Height="2" HorizontalAlignment="Stretch" Margin="0,10,0,10"/>
-                            <CheckBox Name="MicrowinInjectDrivers" Content="Inject drivers (I KNOW WHAT I'M DOING)" Margin="{MicrowinCheckBoxMargin}" IsChecked="False" ToolTip="Path to unpacked drivers all sys and inf files for devices that need drivers"/>
+                            <CheckBox Name="MicrowinInjectDrivers" Content="Inject drivers (I KNOW WHAT I'M DOING)" Margin="{DynamicResource MicrowinCheckBoxMargin}" IsChecked="False" ToolTip="Path to unpacked drivers all sys and inf files for devices that need drivers"/>
-                            <TextBox Name="MicrowinDriverLocation" Background="Transparent" BorderThickness="1" BorderBrush="{MainForegroundColor}"
+                            <TextBox Name="MicrowinDriverLocation" Background="Transparent" BorderThickness="1" BorderBrush="{DynamicResource MainForegroundColor}"
                                 Margin="6"
                                 Text=""
                                 IsReadOnly="False"
                                 TextWrapping="Wrap"
-                                Foreground="{LabelboxForegroundColor}"
+                                Foreground="{DynamicResource LabelboxForegroundColor}"
                                 ToolTip="Path to unpacked drivers all sys and inf files for devices that need drivers"
                             />
-                            <CheckBox Name="MicrowinImportDrivers" Content="Import drivers from current system" Margin="{MicrowinCheckBoxMargin}" IsChecked="False" ToolTip="Export all third-party drivers from your system and inject them to the MicroWin image"/>
+                            <CheckBox Name="MicrowinImportDrivers" Content="Import drivers from current system" Margin="{DynamicResource MicrowinCheckBoxMargin}" IsChecked="False" ToolTip="Export all third-party drivers from your system and inject them to the MicroWin image"/>
-                            <Rectangle Fill="{MainForegroundColor}" Height="2" HorizontalAlignment="Stretch" Margin="0,10,0,10"/>
+                            <Rectangle Fill="{DynamicResource MainForegroundColor}" Height="2" HorizontalAlignment="Stretch" Margin="0,10,0,10"/>
-                            <CheckBox Name="WPFMicrowinCopyToUsb" Content="Copy to Ventoy" Margin="{MicrowinCheckBoxMargin}" IsChecked="False" ToolTip="Copy to USB disk with a label Ventoy"/>
+                            <CheckBox Name="WPFMicrowinCopyToUsb" Content="Copy to Ventoy" Margin="{DynamicResource MicrowinCheckBoxMargin}" IsChecked="False" ToolTip="Copy to USB disk with a label Ventoy"/>
-                            <Rectangle Fill="{MainForegroundColor}" Height="2" HorizontalAlignment="Stretch" Margin="0,10,0,10"/>
+                            <Rectangle Fill="{DynamicResource MainForegroundColor}" Height="2" HorizontalAlignment="Stretch" Margin="0,10,0,10"/>
                             <TextBlock Margin="6" Padding="1" TextWrapping="Wrap"><Bold>Custom user settings (leave empty for default user)</Bold></TextBlock>
                             <TextBlock Margin="6" Padding="1" TextWrapping="Wrap">User name (20 characters max.):</TextBlock>
-                            <TextBox Name="MicrowinUserName" Background="Transparent" BorderThickness="1" BorderBrush="{MainForegroundColor}"
+                            <TextBox Name="MicrowinUserName" Background="Transparent" BorderThickness="1" BorderBrush="{DynamicResource MainForegroundColor}"
                                 Margin="6"
                                 Text=""
                                 IsReadOnly="False"
                                 TextWrapping="Wrap"
-                                Foreground="{LabelboxForegroundColor}"
+                                Foreground="{DynamicResource LabelboxForegroundColor}"
                                 MaxLength="20"
                             />
                             <TextBlock Margin="6" Padding="1" TextWrapping="Wrap">Password (characters will not be shown for your security):</TextBlock>
-                            <PasswordBox Name="MicrowinUserPassword" Background="Transparent" BorderThickness="1" BorderBrush="{MainForegroundColor}"
+                            <PasswordBox Name="MicrowinUserPassword" Background="Transparent" BorderThickness="1" BorderBrush="{DynamicResource MainForegroundColor}"
                                 Margin="6"
                                 PasswordChar="*"
-                                Foreground="{LabelboxForegroundColor}"
+                                Foreground="{DynamicResource LabelboxForegroundColor}"
                             />
-                            <Rectangle Fill="{MainForegroundColor}" Height="2" HorizontalAlignment="Stretch" Margin="0,10,0,10"/>
+                            <Rectangle Fill="{DynamicResource MainForegroundColor}" Height="2" HorizontalAlignment="Stretch" Margin="0,10,0,10"/>
                             <Button Name="WPFMicrowin" Content="Start the process" Margin="2" Padding="15"/>
                         </StackPanel>
                         <StackPanel HorizontalAlignment="Left" SnapsToDevicePixels="True" Margin="1" Visibility="Collapsed">
-                            <TextBlock Name="MicrowinIsoDrive" VerticalAlignment="Center"  Margin="1" Padding="1" TextWrapping="WrapWithOverflow" Foreground="{ComboBoxForegroundColor}"/>
+                            <TextBlock Name="MicrowinIsoDrive" VerticalAlignment="Center"  Margin="1" Padding="1" TextWrapping="WrapWithOverflow" Foreground="{DynamicResource ComboBoxForegroundColor}"/>
-                            <TextBlock Name="MicrowinIsoLocation" VerticalAlignment="Center"  Margin="1" Padding="1" TextWrapping="WrapWithOverflow" Foreground="{ComboBoxForegroundColor}"/>
+                            <TextBlock Name="MicrowinIsoLocation" VerticalAlignment="Center"  Margin="1" Padding="1" TextWrapping="WrapWithOverflow" Foreground="{DynamicResource ComboBoxForegroundColor}"/>
-                            <TextBlock Name="MicrowinMountDir" VerticalAlignment="Center"  Margin="1" Padding="1" TextWrapping="WrapWithOverflow" Foreground="{ComboBoxForegroundColor}"/>
+                            <TextBlock Name="MicrowinMountDir" VerticalAlignment="Center"  Margin="1" Padding="1" TextWrapping="WrapWithOverflow" Foreground="{DynamicResource ComboBoxForegroundColor}"/>
-                            <TextBlock Name="MicrowinScratchDir" VerticalAlignment="Center"  Margin="1" Padding="1" TextWrapping="WrapWithOverflow" Foreground="{ComboBoxForegroundColor}"/>
+                            <TextBlock Name="MicrowinScratchDir" VerticalAlignment="Center"  Margin="1" Padding="1" TextWrapping="WrapWithOverflow" Foreground="{DynamicResource ComboBoxForegroundColor}"/>
                         </StackPanel>
                     </StackPanel>
                     </Border>
@@ -1090,12 +1100,12 @@
                         VerticalAlignment="Stretch"
                         HorizontalAlignment="Stretch"
                         Grid.Row="0" Grid.Column="1">
-                        <StackPanel HorizontalAlignment="Left" Background="{MainBackgroundColor}" SnapsToDevicePixels="True" Visibility="Visible">
+                        <StackPanel HorizontalAlignment="Left" Background="{DynamicResource MainBackgroundColor}" SnapsToDevicePixels="True" Visibility="Visible">
 
                             <Grid Name = "BusyMessage" Visibility="Collapsed">
                               <TextBlock Name = "BusyText" Text="NBusy" Padding="22,2,1,1" />
                               <TextBlock VerticalAlignment="Center" HorizontalAlignment="Left" FontFamily="Segoe MDL2 Assets"
-                                  FontSize="{IconFontSize}" Margin="16,0,0,0">&#xE701;</TextBlock>
+                                  FontSize="{DynamicResource IconFontSize}" Margin="16,0,0,0">&#xE701;</TextBlock>
                             </Grid>
 
                             <TextBlock x:Name = "asciiTextBlock"
@@ -1105,7 +1115,7 @@
                                 VerticalAlignment = "Top"
                                 Height = "Auto"
                                 Width = "Auto"
-                                FontSize = "{MicroWinLogoSize}"
+                                FontSize = "{DynamicResource MicroWinLogoSize}"
                                 FontFamily = "Courier New"
                             >
   /\/\  (_)  ___  _ __   ___  / / /\ \ \(_) _ __
@@ -1120,7 +1130,7 @@
                                 TextWrapping="WrapWithOverflow"
                                 Height = "Auto"
                                 Width = "Auto"
-                                Foreground="{ComboBoxForegroundColor}">
+                                Foreground="{DynamicResource ComboBoxForegroundColor}">
                                 <Bold>MicroWin features:</Bold><LineBreak/>
                                 - Remove Telemetry and Tracking <LineBreak/>
                                 - Fast Install using either the "User" local account or the account of your choosing <LineBreak/>
@@ -1150,7 +1160,7 @@
                                 Height = "Auto"
                                 Width = "Auto"
                                 VerticalAlignment = "Top"
-                                Foreground = "{ComboBoxForegroundColor}"
+                                Foreground = "{DynamicResource ComboBoxForegroundColor}"
                                 xml:space = "preserve"
                             >
 <Bold>Example:</Bold>