From b001842a614839a5bd818731aaf3ed95f2165ddd Mon Sep 17 00:00:00 2001
From: "Mr.k" <mineshtine28546271@gmail.com>
Date: Mon, 7 Oct 2024 16:57:08 +0300
Subject: [PATCH 01/11] Add @CodingWonders to the About page for his
 contribution and determination to make WinUtil (and MicroWin) the best
 software it can be!

---
 scripts/main.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/main.ps1 b/scripts/main.ps1
index 873aab4de4..af853a7eb4 100644
--- a/scripts/main.ps1
+++ b/scripts/main.ps1
@@ -591,7 +591,7 @@ $sync["AboutMenuItem"].Add_Click({
     $authorInfo = @"
 Author   : <a href="https://github.com/ChrisTitusTech">@christitustech</a>
 Runspace : <a href="https://github.com/DeveloperDurp">@DeveloperDurp</a>
-MicroWin : <a href="https://github.com/KonTy">@KonTy</a>
+MicroWin : <a href="https://github.com/KonTy">@KonTy</a>, <a href="https://github.com/CodingWonders">@CodingWonders</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>
 "@

From cb21a39f6221f6151335c98c1682df54af1cfc21 Mon Sep 17 00:00:00 2001
From: "Mr.k" <mineshtine28546271@gmail.com>
Date: Mon, 7 Oct 2024 16:58:54 +0300
Subject: [PATCH 02/11] Remove the 'LogoSize' Parameter for About page - Make
 every sponsor in the sponsors list a link to ChrisTitusTech's Sponsors web
 link

---
 scripts/main.ps1 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/main.ps1 b/scripts/main.ps1
index af853a7eb4..1457e43d0d 100644
--- a/scripts/main.ps1
+++ b/scripts/main.ps1
@@ -596,7 +596,7 @@ GitHub   : <a href="https://github.com/ChrisTitusTech/winutil">ChrisTitusTech/wi
 Version  : <a href="https://github.com/ChrisTitusTech/winutil/releases/tag/$($sync.version)">$($sync.version)</a>
 "@
 
-    Show-CustomDialog -Message $authorInfo -LogoSize $LogoSize
+    Show-CustomDialog -Message $authorInfo
 })
 
 $sync["SponsorMenuItem"].Add_Click({
@@ -612,7 +612,9 @@ $sync["SponsorMenuItem"].Add_Click({
         $sponsors = Invoke-WinUtilSponsors
 
         # Append the sponsors to the authorInfo
-        $sponsors | ForEach-Object { $authorInfo += "$_`n" }
+        foreach ($sponsor in $sponsors) {
+            $authorInfo += "<a href=`"https://github.com/sponsors/ChrisTitusTech`">$sponsor</a>`n"
+        }
     } catch {
         $authorInfo += "An error occurred while fetching or processing the sponsors: $_`n"
     }

From ce5ebca87a1ec7cf8fb4e748fd42e49af405515d Mon Sep 17 00:00:00 2001
From: "Mr.k" <mineshtine28546271@gmail.com>
Date: Mon, 7 Oct 2024 17:01:42 +0300
Subject: [PATCH 03/11] Change Theme Option name from 'ConfigTabButtonFontSize'
 to 'ConfigUpdateButtonFontSize' - Lower its value from 16 to 14

---
 config/themes.json | 2 +-
 xaml/inputXML.xaml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/themes.json b/config/themes.json
index 18f55b5649..5335a4b313 100644
--- a/config/themes.json
+++ b/config/themes.json
@@ -27,7 +27,7 @@
         "ButtonFontFamily": "Arial",
         "ButtonWidth":      "200",
         "ButtonHeight":     "25",
-        "ConfigTabButtonFontSize":      "16",
+        "ConfigUpdateButtonFontSize":   "14",
         "SearchBarWidth":               "200",
         "SearchBarHeight":              "26",
         "SearchBarTextBoxFontSize":     "12",
diff --git a/xaml/inputXML.xaml b/xaml/inputXML.xaml
index d2baa01660..d10d12f989 100644
--- a/xaml/inputXML.xaml
+++ b/xaml/inputXML.xaml
@@ -1004,19 +1004,19 @@
                     </Grid.ColumnDefinitions>
                     <Border Grid.Row="0" Grid.Column="0" Style="{StaticResource BorderStyle}">
                         <StackPanel Background="{DynamicResource MainBackgroundColor}" SnapsToDevicePixels="True">
-                            <Button Name="WPFUpdatesdefault" FontSize="{DynamicResource ConfigTabButtonFontSize}" Height="Auto" Width="Auto" Content="Default (Out of Box) Settings" Margin="20,4,20,10" Padding="10"/>
+                            <Button Name="WPFUpdatesdefault" FontSize="{DynamicResource ConfigUpdateButtonFontSize}" Height="Auto" Width="Auto" Content="Default (Out of Box) Settings" Margin="20,4,20,10" Padding="10"/>
                             <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="{DynamicResource MainBackgroundColor}" SnapsToDevicePixels="True">
-                            <Button Name="WPFUpdatessecurity" FontSize="{DynamicResource ConfigTabButtonFontSize}" Height="Auto" Width="Auto" Content="Security (Recommended) Settings" Margin="20,4,20,10" Padding="10"/>
+                            <Button Name="WPFUpdatessecurity" FontSize="{DynamicResource ConfigUpdateButtonFontSize}" Height="Auto" Width="Auto" Content="Security (Recommended) Settings" Margin="20,4,20,10" Padding="10"/>
                             <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="{DynamicResource MainBackgroundColor}" SnapsToDevicePixels="True">
-                            <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"/>
+                            <Button Name="WPFUpdatesdisable" FontSize="{DynamicResource ConfigUpdateButtonFontSize}" Height="Auto" Width="Auto" Content="Disable ALL Updates (NOT RECOMMENDED!)" Margin="20,4,20,10" Padding="10,10,10,10"/>
                             <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>

From 12446c5b831c5569c2eaa7127094163b03a5042d Mon Sep 17 00:00:00 2001
From: "Mr.k" <mineshtine28546271@gmail.com>
Date: Mon, 7 Oct 2024 17:02:57 +0300
Subject: [PATCH 04/11] Change Theme Option name from 'FontSizeHeading' to
 'HeadingFontSize' for consistency

---
 config/themes.json                        | 2 +-
 functions/public/Invoke-WPFUIElements.ps1 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/themes.json b/config/themes.json
index 5335a4b313..2ed412ef4f 100644
--- a/config/themes.json
+++ b/config/themes.json
@@ -7,7 +7,7 @@
         "CustomDialogHeight":         "200",
         "FontSize":         "12",
         "FontFamily":       "Arial",
-        "FontSizeHeading":  "16",
+        "HeadingFontSize":  "16",
         "HeaderFontFamily": "Consolas, Monaco",
         "CheckBoxBulletDecoratorSize": "14",
         "CheckBoxMargin": "15,0,0,2",
diff --git a/functions/public/Invoke-WPFUIElements.ps1 b/functions/public/Invoke-WPFUIElements.ps1
index 3851536d19..7ae7f09420 100644
--- a/functions/public/Invoke-WPFUIElements.ps1
+++ b/functions/public/Invoke-WPFUIElements.ps1
@@ -142,7 +142,7 @@ function Invoke-WPFUIElements {
 
             $label = New-Object Windows.Controls.Label
             $label.Content = $category -replace ".*__", ""
-            $label.FontSize = $theme.FontSizeHeading
+            $label.FontSize = $theme.HeadingFontSize
             $label.FontFamily = $theme.HeaderFontFamily
             $stackPanel.Children.Add($label) | Out-Null
 

From 46e457dde89e8c74b1508fd32dcd2c6c953df8e2 Mon Sep 17 00:00:00 2001
From: "Mr.k" <mineshtine28546271@gmail.com>
Date: Mon, 7 Oct 2024 17:07:31 +0300
Subject: [PATCH 05/11] Update 'LinkForegroundColor' for Light Theme to be
 lighter which'll make link hover color more noticeable

---
 config/themes.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/themes.json b/config/themes.json
index 2ed412ef4f..3ddf5a45a1 100644
--- a/config/themes.json
+++ b/config/themes.json
@@ -44,7 +44,7 @@
         "MainForegroundColor":  "#232629",
         "MainBackgroundColor":  "#F7F7F7",
         "LabelBackgroundColor":  "#F7F7F7",
-        "LinkForegroundColor":  "#232629",
+        "LinkForegroundColor":  "#484848",
         "LinkHoverForegroundColor":  "#232629",
         "ScrollBarBackgroundColor": "#4A4D52",
         "ScrollBarHoverColor": "#5A5D62",

From 15024434d99dd4a236c33ed7842fe4c3fd07113b Mon Sep 17 00:00:00 2001
From: "Mr.k" <mineshtine28546271@gmail.com>
Date: Mon, 7 Oct 2024 17:19:42 +0300
Subject: [PATCH 06/11] Update 'Show-CustomDialog' Private Function

- Made a lot of theming/styling choices for Custom Dialogs exposed as parameters.
- Update the documentation for these new parameters in 'Show-CustomDialog' Function.
- Add a Link Hover Effect using 'Add_EVENT' methods (This can be tweaks/tuned-down if needed).
- Made use of 'Title' Parameter for 'Show-CustomDialog' Function inside 'scripts/main.ps1' script, to change Dialog Window Title.
- Now you can change the Logo Size of WinUtil through the 'LogoSize' Theming Option (the option was there, but not used in implementation).
---
 config/themes.json                      |   2 +-
 functions/private/Show-CustomDialog.ps1 | 111 +++++++++++++++++-------
 scripts/main.ps1                        |   4 +-
 3 files changed, 83 insertions(+), 34 deletions(-)

diff --git a/config/themes.json b/config/themes.json
index 3ddf5a45a1..dd2fb93af6 100644
--- a/config/themes.json
+++ b/config/themes.json
@@ -2,7 +2,7 @@
     "shared":{
         "CustomDialogFontSize":       "12",
         "CustomDialogFontSizeHeader": "14",
-        "CustomDialogIconSize":       "25",
+        "CustomDialogLogoSize":       "25",
         "CustomDialogWidth":          "400",
         "CustomDialogHeight":         "200",
         "FontSize":         "12",
diff --git a/functions/private/Show-CustomDialog.ps1 b/functions/private/Show-CustomDialog.ps1
index 654cb41ec5..e4fa3a00f4 100644
--- a/functions/private/Show-CustomDialog.ps1
+++ b/functions/private/Show-CustomDialog.ps1
@@ -6,6 +6,9 @@ function Show-CustomDialog {
     .DESCRIPTION
     This function creates a custom dialog box with the specified message and additional elements such as an image, heading, and an OK button. The dialog box is designed with a green border, rounded corners, and a black background.
 
+    .PARAMETER Title
+    The Title to use for the dialog window's Title Bar, this will not be visible by the user, as window styling is set to None.
+
     .PARAMETER Message
     The message to be displayed in the dialog box.
 
@@ -16,60 +19,102 @@ function Show-CustomDialog {
     The height of the custom dialog window.
 
     .PARAMETER FontSize
-    The Font Size for text shown inside the custom dialog window.
+    The Font Size of message shown inside custom dialog window.
 
     .PARAMETER HeaderFontSize
-    The Font Size for the Header of the custom dialog window.
+    The Font Size for the Header of custom dialog window.
+
+    .PARAMETER LogoSize
+    The Size of the Logo used inside the custom dialog window.
+
+    .PARAMETER ForegroundColor
+    The Foreground Color of dialog window title & message.
+
+    .PARAMETER BackgroundColor
+    The Background Color of dialog window.
+
+    .PARAMETER BorderColor
+    The Color for dialog window border.
+
+    .PARAMETER ButtonBackgroundColor
+    The Background Color for Buttons in dialog window.
+
+    .PARAMETER ButtonForegroundColor
+    The Foreground Color for Buttons in dialog window.
+
+    .PARAMETER ShadowColor
+    The Color used when creating the Drop-down Shadow effect for dialog window.
+
+    .PARAMETER LogoColor
+    The Color of WinUtil Text found next to WinUtil's Logo inside dialog window.
+
+    .PARAMETER LinkForegroundColor
+    The Foreground Color for Links inside dialog window.
 
-    .PARAMETER IconSize
-    The Size to use for Icon inside the custom dialog window.
+    .PARAMETER LinkHoverForegroundColor
+    The Foreground Color for Links when the mouse pointer hovers over them inside dialog window.
 
     .PARAMETER EnableScroll
     A flag indicating whether to enable scrolling if the content exceeds the window size.
 
     .EXAMPLE
-    Show-CustomDialog -Message "This is a custom dialog with a message and an image above." -Width 300 -Height 200
+    Show-CustomDialog -Title "My Custom Dialog" -Message "This is a custom dialog with a message and an image above." -Width 300 -Height 200
+
+    Makes a new Custom Dialog with the title 'My Custom Dialog' and a message 'This is a custom dialog with a message and an image above.', with dimensions of 300 by 200 pixels.
+    Other styling options are grabbed from '$sync.Form.Resources' global variable.
+
+    .EXAMPLE
+    $foregroundColor = New-Object System.Windows.Media.SolidColorBrush("#0088e5")
+    $backgroundColor = New-Object System.Windows.Media.SolidColorBrush("#1e1e1e")
+    $linkForegroundColor = New-Object System.Windows.Media.SolidColorBrush("#0088e5")
+    $linkHoverForegroundColor = New-Object System.Windows.Media.SolidColorBrush("#005289")
+    Show-CustomDialog -Title "My Custom Dialog" -Message "This is a custom dialog with a message and an image above." -Width 300 -Height 200 -ForegroundColor $foregroundColor -BackgroundColor $backgroundColor -LinkForegroundColor $linkForegroundColor -LinkHoverForegroundColor $linkHoverForegroundColor
+
+    Makes a new Custom Dialog with the title 'My Custom Dialog' and a message 'This is a custom dialog with a message and an image above.', with dimensions of 300 by 200 pixels, with a link foreground (and general foreground) colors of '#0088e5', background color of '#1e1e1e', and Link Color on Hover of '005289', all of which are in Hexadecimal (the '#' Symbol is required by SolidColorBrush Constructor).
+    Other styling options are grabbed from '$sync.Form.Resources' global variable.
 
     #>
     param(
+        [string]$Title,
         [string]$Message,
         [int]$Width = $sync.Form.Resources.CustomDialogWidth,
         [int]$Height = $sync.Form.Resources.CustomDialogHeight,
+
+        [System.Windows.Media.FontFamily]$FontFamily = $sync.Form.Resources.FontFamily,
         [int]$FontSize = $sync.Form.Resources.CustomDialogFontSize,
         [int]$HeaderFontSize = $sync.Form.Resources.CustomDialogFontSizeHeader,
-        [int]$IconSize = $sync.Form.Resources.CustomDialogLogoSize,
+        [int]$LogoSize = $sync.Form.Resources.CustomDialogLogoSize,
+
+        [System.Windows.Media.Color]$ShadowColor = "#AAAAAAAA",
+        [System.Windows.Media.SolidColorBrush]$LogoColor = $sync.Form.Resources.LabelboxForegroundColor,
+        [System.Windows.Media.SolidColorBrush]$BorderColor = $sync.Form.Resources.BorderColor,
+        [System.Windows.Media.SolidColorBrush]$ForegroundColor = $sync.Form.Resources.MainForegroundColor,
+        [System.Windows.Media.SolidColorBrush]$BackgroundColor = $sync.Form.Resources.MainBackgroundColor,
+        [System.Windows.Media.SolidColorBrush]$ButtonForegroundColor = $sync.Form.Resources.ButtonInstallForegroundColor,
+        [System.Windows.Media.SolidColorBrush]$ButtonBackgroundColor = $sync.Form.Resources.ButtonInstallBackgroundColor,
+        [System.Windows.Media.SolidColorBrush]$LinkForegroundColor = $sync.Form.Resources.LinkForegroundColor,
+        [System.Windows.Media.SolidColorBrush]$LinkHoverForegroundColor = $sync.Form.Resources.LinkHoverForegroundColor,
+
         [bool]$EnableScroll = $false
     )
 
-    Add-Type -AssemblyName PresentationFramework
-
-    # Define theme colors
-    $foregroundColor = $sync.Form.Resources.MainForegroundColor
-    $backgroundColor = $sync.Form.Resources.MainBackgroundColor
-    $font = New-Object Windows.Media.FontFamily("Consolas")
-    $borderColor = $sync.Form.Resources.BorderColor # ButtonInstallBackgroundColor
-    $buttonBackgroundColor = $sync.Form.Resources.ButtonInstallBackgroundColor
-    $buttonForegroundColor = $sync.Form.Resources.ButtonInstallForegroundColor
-    $shadowColor = [Windows.Media.ColorConverter]::ConvertFromString("#AAAAAAAA")
-    $logocolor = $sync.Form.Resources.LabelboxForegroundColor
-
     # Create a custom dialog window
     $dialog = New-Object Windows.Window
-    $dialog.Title = "About"
+    $dialog.Title = $Title
     $dialog.Height = $Height
     $dialog.Width = $Width
     $dialog.Margin = New-Object Windows.Thickness(10)  # Add margin to the entire dialog box
     $dialog.WindowStyle = [Windows.WindowStyle]::None  # Remove title bar and window controls
     $dialog.ResizeMode = [Windows.ResizeMode]::NoResize  # Disable resizing
     $dialog.WindowStartupLocation = [Windows.WindowStartupLocation]::CenterScreen  # Center the window
-    $dialog.Foreground = $foregroundColor
-    $dialog.Background = $backgroundColor
-    $dialog.FontFamily = $font
+    $dialog.Foreground = $ForegroundColor
+    $dialog.Background = $BackgroundColor
+    $dialog.FontFamily = $FontFamily
     $dialog.FontSize = $FontSize
 
     # Create a Border for the green edge with rounded corners
     $border = New-Object Windows.Controls.Border
-    $border.BorderBrush = $borderColor
+    $border.BorderBrush = $BorderColor
     $border.BorderThickness = New-Object Windows.Thickness(1)  # Adjust border thickness as needed
     $border.CornerRadius = New-Object Windows.CornerRadius(10)  # Adjust the radius for rounded corners
 
@@ -89,7 +134,7 @@ function Show-CustomDialog {
     $grid = New-Object Windows.Controls.Grid
     $border.Child = $grid
 
-    # Add the following line to show gridlines
+    # Uncomment the following line to show gridlines
     #$grid.ShowGridLines = $true
 
     # Add the following line to set the background color of the grid
@@ -102,7 +147,6 @@ function Show-CustomDialog {
     $border.HorizontalAlignment = [Windows.HorizontalAlignment]::Stretch
     $border.VerticalAlignment = [Windows.VerticalAlignment]::Stretch
 
-
     # Set up Row Definitions
     $row0 = New-Object Windows.Controls.RowDefinition
     $row0.Height = [Windows.GridLength]::Auto
@@ -129,17 +173,18 @@ function Show-CustomDialog {
     [Windows.Controls.Grid]::SetRow($stackPanel, 0)  # Set the row to the second row (0-based index)
 
     # Add SVG path to the stack panel
-    $stackPanel.Children.Add((Invoke-WinUtilAssets -Type "logo" -Size 25))
+    $stackPanel.Children.Add((Invoke-WinUtilAssets -Type "logo" -Size $LogoSize))
 
     # Add "Winutil" text
     $winutilTextBlock = New-Object Windows.Controls.TextBlock
     $winutilTextBlock.Text = "Winutil"
     $winutilTextBlock.FontSize = $HeaderFontSize
-    $winutilTextBlock.Foreground = $logocolor
+    $winutilTextBlock.Foreground = $LogoColor
     $winutilTextBlock.Margin = New-Object Windows.Thickness(10, 10, 10, 5)  # Add margins around the text block
     $stackPanel.Children.Add($winutilTextBlock)
     # Add TextBlock for information with text wrapping and margins
     $messageTextBlock = New-Object Windows.Controls.TextBlock
+    $messageTextBlock.FontSize = $FontSize
     $messageTextBlock.TextWrapping = [Windows.TextWrapping]::Wrap  # Enable text wrapping
     $messageTextBlock.HorizontalAlignment = [Windows.HorizontalAlignment]::Left
     $messageTextBlock.VerticalAlignment = [Windows.VerticalAlignment]::Top
@@ -162,7 +207,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.Form.Resources.LinkForegroundColor
+        $hyperlink.Foreground = $LinkForegroundColor
 
         $hyperlink.Add_Click({
             param($sender, $args)
@@ -170,11 +215,15 @@ function Show-CustomDialog {
         })
         $hyperlink.Add_MouseEnter({
             param($sender, $args)
-            $sender.Foreground = $sync.Form.Resources.LinkHoverForegroundColor
+            $sender.Foreground = $LinkHoverForegroundColor
+            $sender.FontSize = ($FontSize + ($FontSize / 4))
+            $sender.FontWeight = "SemiBold"
         })
         $hyperlink.Add_MouseLeave({
             param($sender, $args)
-            $sender.Foreground = $sync.Form.Resources.LinkForegroundColor
+            $sender.Foreground = $LinkForegroundColor
+            $sender.FontSize = $FontSize
+            $sender.FontWeight = "Normal"
         })
 
         $messageTextBlock.Inlines.Add($hyperlink)
@@ -218,7 +267,7 @@ function Show-CustomDialog {
     $okButton.Margin = New-Object Windows.Thickness(0, 0, 0, 10)
     $okButton.Background = $buttonBackgroundColor
     $okButton.Foreground = $buttonForegroundColor
-    $okButton.BorderBrush = $borderColor
+    $okButton.BorderBrush = $BorderColor
     $okButton.Add_Click({
         $dialog.Close()
     })
diff --git a/scripts/main.ps1 b/scripts/main.ps1
index 1457e43d0d..5f5af4862d 100644
--- a/scripts/main.ps1
+++ b/scripts/main.ps1
@@ -596,7 +596,7 @@ GitHub   : <a href="https://github.com/ChrisTitusTech/winutil">ChrisTitusTech/wi
 Version  : <a href="https://github.com/ChrisTitusTech/winutil/releases/tag/$($sync.version)">$($sync.version)</a>
 "@
 
-    Show-CustomDialog -Message $authorInfo
+    Show-CustomDialog -Title "About" -Message $authorInfo
 })
 
 $sync["SponsorMenuItem"].Add_Click({
@@ -619,7 +619,7 @@ $sync["SponsorMenuItem"].Add_Click({
         $authorInfo += "An error occurred while fetching or processing the sponsors: $_`n"
     }
 
-    Show-CustomDialog -Message $authorInfo -EnableScroll $true
+    Show-CustomDialog -Title "Sponsors" -Message $authorInfo -EnableScroll $true
 })
 
 $sync["Form"].ShowDialog() | out-null

From d535e7ebca62277b888fece1ef4993d0571d87d7 Mon Sep 17 00:00:00 2001
From: "Mr.k" <mineshtine28546271@gmail.com>
Date: Mon, 7 Oct 2024 17:42:22 +0300
Subject: [PATCH 07/11] Preprocessing result

---
 functions/private/Set-WinUtilRegistry.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions/private/Set-WinUtilRegistry.ps1 b/functions/private/Set-WinUtilRegistry.ps1
index 397ce84c1c..d2141800c1 100644
--- a/functions/private/Set-WinUtilRegistry.ps1
+++ b/functions/private/Set-WinUtilRegistry.ps1
@@ -36,7 +36,7 @@ function Set-WinUtilRegistry {
         }
 
         Write-Host "Set $Path\$Name to $Value"
-        if ($Value -ne "<RemoveEntry>"){
+        if ($Value -ne "<RemoveEntry>") {
             Set-ItemProperty -Path $Path -Name $Name -Type $Type -Value $Value -Force -ErrorAction Stop | Out-Null
         }
         else{

From 2b2b11e4f218e6d2d0f459a902252300216f04c6 Mon Sep 17 00:00:00 2001
From: "Mr.k" <mineshtine28546271@gmail.com>
Date: Fri, 25 Oct 2024 12:34:13 +0300
Subject: [PATCH 08/11] Fix Settings Popup not closing after losing focus - Add
 trivial null checks for better debugging of UI code

---
 scripts/main.ps1 | 80 ++++++++++++++++++++++++++++++------------------
 1 file changed, 51 insertions(+), 29 deletions(-)

diff --git a/scripts/main.ps1 b/scripts/main.ps1
index 5f5af4862d..072465f60c 100644
--- a/scripts/main.ps1
+++ b/scripts/main.ps1
@@ -254,12 +254,12 @@ $commonKeyEvents = {
 $sync["Form"].Add_PreViewKeyDown($commonKeyEvents)
 
 $sync["Form"].Add_MouseLeftButtonDown({
-    # Hide Settings and Theme Popup on click anywhere else
-    if ($sync.SettingsButton.IsOpen -or
-        $sync.ThemePopup.IsOpen) {
-            $sync.SettingsPopup.IsOpen = $false
-            $sync.ThemePopup.IsOpen = $false
-        }
+    if ($sync.SettingsPopup -eq $null -or
+        $sync.ThemePopup -eq $null) {
+        Write-Host "Either Settings or Theme Popup is null, this's not allowed to happen in the first place. Please double check your UI code." -ForegroundColor Red
+    }
+    $sync.SettingsPopup.IsOpen = $false
+    $sync.ThemePopup.IsOpen = $false
     $sync["Form"].DragMove()
 })
 
@@ -277,12 +277,12 @@ $sync["Form"].Add_MouseDoubleClick({
 
 $sync["Form"].Add_Deactivated({
     Write-Debug "WinUtil lost focus"
-    # Hide Settings and Theme Popup on Winutil Focus Loss
-    if ($sync.SettingsButton.IsOpen -or
-        $sync.ThemePopup.IsOpen) {
-            $sync.SettingsPopup.IsOpen = $false
-            $sync.ThemePopup.IsOpen = $false
+    if ($sync.SettingsPopup -eq $null -or
+        $sync.ThemePopup -eq $null) {
+        Write-Host "Either Settings or Theme Popup is null, this's not allowed to happen in the first place. Please double check your UI code." -ForegroundColor Red
     }
+    $sync.SettingsPopup.IsOpen = $false
+    $sync.ThemePopup.IsOpen = $false
 })
 
 $sync["Form"].Add_ContentRendered({
@@ -525,29 +525,39 @@ $sync["Form"].Add_Activated({
 })
 # Define event handler for ThemeButton click
 $sync["ThemeButton"].Add_Click({
-    if ($sync.ThemePopup.IsOpen) {
-        $sync.ThemePopup.IsOpen = $false
-    }
-    else{
-        $sync.ThemePopup.IsOpen = $true
+    if ($sync.SettingsPopup -eq $null -or
+        $sync.ThemePopup -eq $null) {
+        Write-Host "Either Settings or Theme Popup is null, this's not allowed to happen in the first place. Please double check your UI code." -ForegroundColor Red
     }
+    # Hide the settings popup and toggle the themes popup
+    $sync.ThemePopup.IsOpen = -not $sync.ThemePopup.IsOpen
     $sync.SettingsPopup.IsOpen = $false
+    $_.Handled = $false
 })
 
 # Define event handlers for menu items
 $sync["AutoThemeMenuItem"].Add_Click({
+    if ($sync.ThemePopup -eq $null) {
+        Write-Host "Theme Popup is null, this's not allowed to happen in the first place. Please double check your UI code." -ForegroundColor Red
+    }
     $sync.ThemePopup.IsOpen = $false
     Invoke-WinutilThemeChange -theme "Auto"
     $_.Handled = $false
   })
   # Define event handlers for menu items
 $sync["DarkThemeMenuItem"].Add_Click({
+    if ($sync.ThemePopup -eq $null) {
+        Write-Host "Theme Popup is null, this's not allowed to happen in the first place. Please double check your UI code." -ForegroundColor Red
+    }
     $sync.ThemePopup.IsOpen = $false
     Invoke-WinutilThemeChange -theme "Dark"
     $_.Handled = $false
   })
 # Define event handlers for menu items
 $sync["LightThemeMenuItem"].Add_Click({
+    if ($sync.ThemePopup -eq $null) {
+        Write-Host "Theme Popup is null, this's not allowed to happen in the first place. Please double check your UI code." -ForegroundColor Red
+    }
     $sync.ThemePopup.IsOpen = $false
     Invoke-WinutilThemeChange -theme "Light"
     $_.Handled = $false
@@ -557,29 +567,35 @@ $sync["LightThemeMenuItem"].Add_Click({
 # Define event handler for button click
 $sync["SettingsButton"].Add_Click({
     Write-Debug "SettingsButton clicked"
-    if ($sync.SettingsPopup.IsOpen) {
-        $sync.SettingsPopup.IsOpen = $false
-    }
-    else{
-        $sync.SettingsPopup.IsOpen = $true
+    if ($sync.SettingsPopup -eq $null -or
+        $sync.ThemePopup -eq $null) {
+        Write-Host "Either Settings or Theme Popup is null, this's not allowed to happen in the first place. Please double check your UI code." -ForegroundColor Red
     }
+    # Hide the themes popup and toggle the settings popup
+    $sync.SettingsPopup.IsOpen = -not $sync.SettingsPopup.IsOpen
     $sync.ThemePopup.IsOpen = $false
     $_.Handled = $false
 })
 
 # Define event handlers for menu items
 $sync["ImportMenuItem"].Add_Click({
-  # Handle Import menu item click
-  Write-Debug "Import clicked"
-  $sync["SettingsPopup"].IsOpen = $false
-  Invoke-WPFImpex -type "import"
-  $_.Handled = $false
+    # Handle Import menu item click
+    Write-Debug "Import clicked"
+    if ($sync.SettingsPopup -eq $null) {
+        Write-Host "Either Settings is null, this's not allowed to happen in the first place. Please double check your UI code." -ForegroundColor Red
+    }
+    $sync.SettingsPopup.IsOpen = $false
+    Invoke-WPFImpex -type "import"
+    $_.Handled = $false
 })
 
 $sync["ExportMenuItem"].Add_Click({
     # Handle Export menu item click
     Write-Debug "Export clicked"
-    $sync["SettingsPopup"].IsOpen = $false
+    if ($sync.SettingsPopup -eq $null) {
+        Write-Host "Either Settings is null, this's not allowed to happen in the first place. Please double check your UI code." -ForegroundColor Red
+    }
+    $sync.SettingsPopup.IsOpen = $false
     Invoke-WPFImpex -type "export"
     $_.Handled = $false
 })
@@ -587,7 +603,10 @@ $sync["ExportMenuItem"].Add_Click({
 $sync["AboutMenuItem"].Add_Click({
     # Handle Export menu item click
     Write-Debug "About clicked"
-    $sync["SettingsPopup"].IsOpen = $false
+    if ($sync.SettingsPopup -eq $null) {
+        Write-Host "Either Settings is null, this's not allowed to happen in the first place. Please double check your UI code." -ForegroundColor Red
+    }
+    $sync.SettingsPopup.IsOpen = $false
     $authorInfo = @"
 Author   : <a href="https://github.com/ChrisTitusTech">@christitustech</a>
 Runspace : <a href="https://github.com/DeveloperDurp">@DeveloperDurp</a>
@@ -602,7 +621,10 @@ Version  : <a href="https://github.com/ChrisTitusTech/winutil/releases/tag/$($sy
 $sync["SponsorMenuItem"].Add_Click({
     # Handle Export menu item click
     Write-Debug "Sponsors clicked"
-    $sync["SettingsPopup"].IsOpen = $false
+    if ($sync.SettingsPopup -eq $null) {
+        Write-Host "Either Settings is null, this's not allowed to happen in the first place. Please double check your UI code." -ForegroundColor Red
+    }
+    $sync.SettingsPopup.IsOpen = $false
     $authorInfo = @"
 <a href="https://github.com/sponsors/ChrisTitusTech">Current sponsors for ChrisTitusTech:</a>
 "@

From 411bc66d7eb12f9a2a7b4529e6869afa20a1329e Mon Sep 17 00:00:00 2001
From: "Mr.k" <mineshtine28546271@gmail.com>
Date: Fri, 25 Oct 2024 12:36:37 +0300
Subject: [PATCH 09/11] Remove unnecessary whitespace indentation in 'main.ps1'
 script

---
 scripts/main.ps1 | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/scripts/main.ps1 b/scripts/main.ps1
index 072465f60c..e361a88edb 100644
--- a/scripts/main.ps1
+++ b/scripts/main.ps1
@@ -31,23 +31,20 @@ $sync.runspace.Open()
 
 # Create classes for different exceptions
 
-    class WingetFailedInstall : Exception {
-        [string]$additionalData
-
-        WingetFailedInstall($Message) : base($Message) {}
-    }
-
-    class ChocoFailedInstall : Exception {
-        [string]$additionalData
-
-        ChocoFailedInstall($Message) : base($Message) {}
-    }
+class WingetFailedInstall : Exception {
+    [string]$additionalData
+    WingetFailedInstall($Message) : base($Message) {}
+}
 
-    class GenericException : Exception {
-        [string]$additionalData
+class ChocoFailedInstall : Exception {
+    [string]$additionalData
+    ChocoFailedInstall($Message) : base($Message) {}
+}
 
-        GenericException($Message) : base($Message) {}
-    }
+class GenericException : Exception {
+    [string]$additionalData
+    GenericException($Message) : base($Message) {}
+}
 
 
 $inputXML = $inputXML -replace 'mc:Ignorable="d"', '' -replace "x:N", 'N' -replace '^<Win.*', '<Window'
@@ -543,8 +540,8 @@ $sync["AutoThemeMenuItem"].Add_Click({
     $sync.ThemePopup.IsOpen = $false
     Invoke-WinutilThemeChange -theme "Auto"
     $_.Handled = $false
-  })
-  # Define event handlers for menu items
+})
+# Define event handlers for menu items
 $sync["DarkThemeMenuItem"].Add_Click({
     if ($sync.ThemePopup -eq $null) {
         Write-Host "Theme Popup is null, this's not allowed to happen in the first place. Please double check your UI code." -ForegroundColor Red
@@ -552,7 +549,7 @@ $sync["DarkThemeMenuItem"].Add_Click({
     $sync.ThemePopup.IsOpen = $false
     Invoke-WinutilThemeChange -theme "Dark"
     $_.Handled = $false
-  })
+})
 # Define event handlers for menu items
 $sync["LightThemeMenuItem"].Add_Click({
     if ($sync.ThemePopup -eq $null) {
@@ -561,7 +558,7 @@ $sync["LightThemeMenuItem"].Add_Click({
     $sync.ThemePopup.IsOpen = $false
     Invoke-WinutilThemeChange -theme "Light"
     $_.Handled = $false
-  })
+})
 
 
 # Define event handler for button click

From fb214795317a91b52ae7426707a1439d3f506f81 Mon Sep 17 00:00:00 2001
From: "Mr.k" <mineshtine28546271@gmail.com>
Date: Sat, 26 Oct 2024 17:12:52 +0300
Subject: [PATCH 10/11] Add a new 'Invoke-WPFPopup' Function to Better Handle
 Showing/Hiding/Toggling of Popups

---
 functions/public/Invoke-WPFPopup.ps1 | 91 +++++++++++++++++++++++++++
 scripts/main.ps1                     | 92 ++++++----------------------
 2 files changed, 109 insertions(+), 74 deletions(-)
 create mode 100644 functions/public/Invoke-WPFPopup.ps1

diff --git a/functions/public/Invoke-WPFPopup.ps1 b/functions/public/Invoke-WPFPopup.ps1
new file mode 100644
index 0000000000..ea8942d1e1
--- /dev/null
+++ b/functions/public/Invoke-WPFPopup.ps1
@@ -0,0 +1,91 @@
+function Invoke-WPFPopup {
+    param (
+        [Parameter(position=0)]
+        [ValidateSet("Show","Hide","Toggle", ErrorMessage="Action '{0}' is not part of the valid set '{1}'.")]
+        [string]$Action = "",
+
+        [Parameter(position=1)]
+        [string[]]$Popups = @(),
+
+        [Parameter(position=2)]
+        [ValidateScript({
+            $PossibleActions = @("Show", "Hide", "Toggle")
+            [hashtable]$UnExpectedPairs = @{}
+            Foreach ($pair in $_.GetEnumerator()) {
+                $key = $pair.Name
+                $value = $pair.Value
+                if (-not ($value -in $PossibleActions)) {
+                    $UnExpectedPairs.Add("$key", "$value")
+                }
+            }
+
+            if ($UnExpectedPairs.Count -gt 0) {
+                $UnExpectedPairsAsString = "@{"
+                Foreach ($pair in $UnExpectedPairs.GetEnumerator()) { $UnExpectedPairsAsString += "`"$($pair.Name)`" = `"$($pair.Value)`"; " }
+                $UnExpectedPairsAsString = $UnExpectedPairsAsString -replace (';\s*$', '')
+                $UnExpectedPairsAsString += "}"
+                throw "Found Unexpected pair(s), these Popup & Action pair(s) are: $UnExpectedPairsAsString"
+            }
+
+            # Return true for passing validation checks
+            $true
+        })]
+        [hashtable]$PopupActionTable = @{}
+    )
+
+    if ($PopupActionTable.Count -eq 0 -and $Action -eq "" -and $Popups.Count -eq 0) {
+        throw [GenericException]::new("No Parameter was provided, please use either 'PopupActionTable' on its own, or use 'Action' and 'Popups' on their own, depending on your use case.")
+    }
+    if ($PopupActionTable.Count -gt 0 -and ($Action -ne "" -or $Popups.Count -gt 0)) {
+        throw [GenericException]::new("Only use 'PopupActionTable' on its own, or use 'Action' and 'Popups' on their own, depending on your use case.")
+    }
+
+    $PopupsNotFound = [System.Collections.Generic.List[string]]::new($Popups.Count)
+
+    if ($PopupActionTable.Count -gt 0) {
+        Foreach ($popupActionPair in $PopupActionTable.GetEnumerator()) {
+            $popup = $popupActionPair.Name + "Popup"
+            $action = $popupActionPair.Value
+            if ($sync.$popup -eq $null) {
+                $PopupsNotFound.Add("$popup") | Out-Null
+                continue
+            }
+            switch ($action) {
+                'Show' { $actionAsBool = $true }
+                'Hide' { $actionAsBool = $false }
+                'Toggle' { $actionAsBool = -not $sync.$popup.IsOpen }
+                default { throw [GenericException]::new("Action can only be `"Show`" or `"Hide`" or `"Toggle`".") }
+            }
+            $sync.$popup.IsOpen = $actionAsBool
+        }
+    } else {
+        if ($Action -eq "" -or $Popups.Count -eq 0) {
+            throw [GenericException]::new("Please provide both the 'Action' and 'Popups' Parameters, with the appropriate values foreach parameter.")
+        }
+        Foreach ($popup in $Popups) {
+            $popup += "Popup"
+            if ($sync.$popup -eq $null) {
+                $PopupsNotFound.Add("$popup") | Out-Null
+                continue
+            }
+            switch ($action) {
+                'Show' { $actionAsBool = $true }
+                'Hide' { $actionAsBool = $false }
+                'Toggle' { $actionAsBool = -not $sync.$popup.IsOpen }
+                default { throw [GenericException]::new("Action can only be `"Show`" or `"Hide`" or `"Toggle`".") }
+            }
+            $sync.$popup.IsOpen = $actionAsBool
+        }
+    }
+
+    if ($PopupsNotFound.Count -gt 0) {
+        $PopupsNotFoundAsString = "@("
+        Foreach ($popupNotFound in $PopupsNotFound) {
+            $PopupsNotFoundAsString += "$popupNotFound"
+            $PopupsNotFoundAsString += ", "
+        }
+        $PopupsNotFoundAsString = $PopupsNotFoundAsString -replace (',\s*$', '')
+        $PopupsNotFoundAsString += ")"
+        throw [GenericException]::new("Could not find $PopupsNotFoundAsString Popups in `$sync variable.")
+    }
+}
diff --git a/scripts/main.ps1 b/scripts/main.ps1
index e361a88edb..b865d5e437 100644
--- a/scripts/main.ps1
+++ b/scripts/main.ps1
@@ -251,12 +251,7 @@ $commonKeyEvents = {
 $sync["Form"].Add_PreViewKeyDown($commonKeyEvents)
 
 $sync["Form"].Add_MouseLeftButtonDown({
-    if ($sync.SettingsPopup -eq $null -or
-        $sync.ThemePopup -eq $null) {
-        Write-Host "Either Settings or Theme Popup is null, this's not allowed to happen in the first place. Please double check your UI code." -ForegroundColor Red
-    }
-    $sync.SettingsPopup.IsOpen = $false
-    $sync.ThemePopup.IsOpen = $false
+    Invoke-WPFPopup -Action "Hide" -Popups @("Settings", "Theme")
     $sync["Form"].DragMove()
 })
 
@@ -274,12 +269,7 @@ $sync["Form"].Add_MouseDoubleClick({
 
 $sync["Form"].Add_Deactivated({
     Write-Debug "WinUtil lost focus"
-    if ($sync.SettingsPopup -eq $null -or
-        $sync.ThemePopup -eq $null) {
-        Write-Host "Either Settings or Theme Popup is null, this's not allowed to happen in the first place. Please double check your UI code." -ForegroundColor Red
-    }
-    $sync.SettingsPopup.IsOpen = $false
-    $sync.ThemePopup.IsOpen = $false
+    Invoke-WPFPopup -Action "Hide" -Popups @("Settings", "Theme")
 })
 
 $sync["Form"].Add_ContentRendered({
@@ -520,90 +510,53 @@ Set-WinUtilTaskbaritem -overlay "logo"
 $sync["Form"].Add_Activated({
     Set-WinUtilTaskbaritem -overlay "logo"
 })
-# Define event handler for ThemeButton click
+
 $sync["ThemeButton"].Add_Click({
-    if ($sync.SettingsPopup -eq $null -or
-        $sync.ThemePopup -eq $null) {
-        Write-Host "Either Settings or Theme Popup is null, this's not allowed to happen in the first place. Please double check your UI code." -ForegroundColor Red
-    }
-    # Hide the settings popup and toggle the themes popup
-    $sync.ThemePopup.IsOpen = -not $sync.ThemePopup.IsOpen
-    $sync.SettingsPopup.IsOpen = $false
+    Write-Debug "ThemeButton clicked"
+    Invoke-WPFPopup -PopupActionTable @{ "Settings" = "Hide"; "Theme" = "Toggle" }
     $_.Handled = $false
 })
-
-# Define event handlers for menu items
 $sync["AutoThemeMenuItem"].Add_Click({
-    if ($sync.ThemePopup -eq $null) {
-        Write-Host "Theme Popup is null, this's not allowed to happen in the first place. Please double check your UI code." -ForegroundColor Red
-    }
-    $sync.ThemePopup.IsOpen = $false
+    Write-Debug "About clicked"
+    Invoke-WPFPopup -Action "Hide" -Popups @("Theme")
     Invoke-WinutilThemeChange -theme "Auto"
     $_.Handled = $false
 })
-# Define event handlers for menu items
 $sync["DarkThemeMenuItem"].Add_Click({
-    if ($sync.ThemePopup -eq $null) {
-        Write-Host "Theme Popup is null, this's not allowed to happen in the first place. Please double check your UI code." -ForegroundColor Red
-    }
-    $sync.ThemePopup.IsOpen = $false
+    Write-Debug "Dark Theme clicked"
+    Invoke-WPFPopup -Action "Hide" -Popups @("Theme")
     Invoke-WinutilThemeChange -theme "Dark"
     $_.Handled = $false
 })
-# Define event handlers for menu items
 $sync["LightThemeMenuItem"].Add_Click({
-    if ($sync.ThemePopup -eq $null) {
-        Write-Host "Theme Popup is null, this's not allowed to happen in the first place. Please double check your UI code." -ForegroundColor Red
-    }
-    $sync.ThemePopup.IsOpen = $false
+    Write-Debug "Light Theme clicked"
+    Invoke-WPFPopup -Action "Hide" -Popups @("Theme")
     Invoke-WinutilThemeChange -theme "Light"
     $_.Handled = $false
 })
 
 
-# Define event handler for button click
 $sync["SettingsButton"].Add_Click({
     Write-Debug "SettingsButton clicked"
-    if ($sync.SettingsPopup -eq $null -or
-        $sync.ThemePopup -eq $null) {
-        Write-Host "Either Settings or Theme Popup is null, this's not allowed to happen in the first place. Please double check your UI code." -ForegroundColor Red
-    }
-    # Hide the themes popup and toggle the settings popup
-    $sync.SettingsPopup.IsOpen = -not $sync.SettingsPopup.IsOpen
-    $sync.ThemePopup.IsOpen = $false
+    Invoke-WPFPopup -PopupActionTable @{ "Settings" = "Toggle"; "Theme" = "Hide" }
     $_.Handled = $false
 })
-
-# Define event handlers for menu items
 $sync["ImportMenuItem"].Add_Click({
-    # Handle Import menu item click
     Write-Debug "Import clicked"
-    if ($sync.SettingsPopup -eq $null) {
-        Write-Host "Either Settings is null, this's not allowed to happen in the first place. Please double check your UI code." -ForegroundColor Red
-    }
-    $sync.SettingsPopup.IsOpen = $false
+    Invoke-WPFPopup -Action "Hide" -Popups @("Settings")
     Invoke-WPFImpex -type "import"
     $_.Handled = $false
 })
-
 $sync["ExportMenuItem"].Add_Click({
-    # Handle Export menu item click
     Write-Debug "Export clicked"
-    if ($sync.SettingsPopup -eq $null) {
-        Write-Host "Either Settings is null, this's not allowed to happen in the first place. Please double check your UI code." -ForegroundColor Red
-    }
-    $sync.SettingsPopup.IsOpen = $false
+    Invoke-WPFPopup -Action "Hide" -Popups @("Settings")
     Invoke-WPFImpex -type "export"
     $_.Handled = $false
 })
-
 $sync["AboutMenuItem"].Add_Click({
-    # Handle Export menu item click
     Write-Debug "About clicked"
-    if ($sync.SettingsPopup -eq $null) {
-        Write-Host "Either Settings is null, this's not allowed to happen in the first place. Please double check your UI code." -ForegroundColor Red
-    }
-    $sync.SettingsPopup.IsOpen = $false
+    Invoke-WPFPopup -Action "Hide" -Popups @("Settings")
+
     $authorInfo = @"
 Author   : <a href="https://github.com/ChrisTitusTech">@christitustech</a>
 Runspace : <a href="https://github.com/DeveloperDurp">@DeveloperDurp</a>
@@ -611,33 +564,24 @@ MicroWin : <a href="https://github.com/KonTy">@KonTy</a>, <a href="https://githu
 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>
 "@
-
     Show-CustomDialog -Title "About" -Message $authorInfo
 })
-
 $sync["SponsorMenuItem"].Add_Click({
-    # Handle Export menu item click
     Write-Debug "Sponsors clicked"
-    if ($sync.SettingsPopup -eq $null) {
-        Write-Host "Either Settings is null, this's not allowed to happen in the first place. Please double check your UI code." -ForegroundColor Red
-    }
-    $sync.SettingsPopup.IsOpen = $false
+    Invoke-WPFPopup -Action "Hide" -Popups @("Settings")
+
     $authorInfo = @"
 <a href="https://github.com/sponsors/ChrisTitusTech">Current sponsors for ChrisTitusTech:</a>
 "@
     $authorInfo += "`n"
     try {
-        # Call the function to get the sponsors
         $sponsors = Invoke-WinUtilSponsors
-
-        # Append the sponsors to the authorInfo
         foreach ($sponsor in $sponsors) {
             $authorInfo += "<a href=`"https://github.com/sponsors/ChrisTitusTech`">$sponsor</a>`n"
         }
     } catch {
         $authorInfo += "An error occurred while fetching or processing the sponsors: $_`n"
     }
-
     Show-CustomDialog -Title "Sponsors" -Message $authorInfo -EnableScroll $true
 })
 

From fc53ca802b5df0a89b13383538111ef35f95b63b Mon Sep 17 00:00:00 2001
From: MyDrift <personal@mdiana.ch>
Date: Sun, 3 Nov 2024 17:25:42 +0300
Subject: [PATCH 11/11] Improve 'Invoke-WPFPopup' by @MyDrift-user

Thanks for the improvements :)
---
 functions/public/Invoke-WPFPopup.ps1 | 97 +++++++++-------------------
 1 file changed, 30 insertions(+), 67 deletions(-)

diff --git a/functions/public/Invoke-WPFPopup.ps1 b/functions/public/Invoke-WPFPopup.ps1
index ea8942d1e1..46cdc2159c 100644
--- a/functions/public/Invoke-WPFPopup.ps1
+++ b/functions/public/Invoke-WPFPopup.ps1
@@ -1,91 +1,54 @@
 function Invoke-WPFPopup {
     param (
-        [Parameter(position=0)]
-        [ValidateSet("Show","Hide","Toggle", ErrorMessage="Action '{0}' is not part of the valid set '{1}'.")]
+        [ValidateSet("Show", "Hide", "Toggle")]
         [string]$Action = "",
 
-        [Parameter(position=1)]
         [string[]]$Popups = @(),
 
-        [Parameter(position=2)]
         [ValidateScript({
-            $PossibleActions = @("Show", "Hide", "Toggle")
-            [hashtable]$UnExpectedPairs = @{}
-            Foreach ($pair in $_.GetEnumerator()) {
-                $key = $pair.Name
-                $value = $pair.Value
-                if (-not ($value -in $PossibleActions)) {
-                    $UnExpectedPairs.Add("$key", "$value")
-                }
+            $invalid = $_.GetEnumerator() | Where-Object { $_.Value -notin @("Show", "Hide", "Toggle") }
+            if ($invalid) {
+                throw "Found invalid Popup-Action pair(s): " + ($invalid | ForEach-Object { "$($_.Key) = $($_.Value)" } -join "; ")
             }
-
-            if ($UnExpectedPairs.Count -gt 0) {
-                $UnExpectedPairsAsString = "@{"
-                Foreach ($pair in $UnExpectedPairs.GetEnumerator()) { $UnExpectedPairsAsString += "`"$($pair.Name)`" = `"$($pair.Value)`"; " }
-                $UnExpectedPairsAsString = $UnExpectedPairsAsString -replace (';\s*$', '')
-                $UnExpectedPairsAsString += "}"
-                throw "Found Unexpected pair(s), these Popup & Action pair(s) are: $UnExpectedPairsAsString"
-            }
-
-            # Return true for passing validation checks
             $true
         })]
         [hashtable]$PopupActionTable = @{}
     )
 
-    if ($PopupActionTable.Count -eq 0 -and $Action -eq "" -and $Popups.Count -eq 0) {
-        throw [GenericException]::new("No Parameter was provided, please use either 'PopupActionTable' on its own, or use 'Action' and 'Popups' on their own, depending on your use case.")
-    }
-    if ($PopupActionTable.Count -gt 0 -and ($Action -ne "" -or $Popups.Count -gt 0)) {
-        throw [GenericException]::new("Only use 'PopupActionTable' on its own, or use 'Action' and 'Popups' on their own, depending on your use case.")
+    if (-not $PopupActionTable.Count -and (-not $Action -or -not $Popups.Count)) {
+        throw "Provide either 'PopupActionTable' or both 'Action' and 'Popups'."
     }
 
-    $PopupsNotFound = [System.Collections.Generic.List[string]]::new($Popups.Count)
+    if ($PopupActionTable.Count -and ($Action -or $Popups.Count)) {
+        throw "Use 'PopupActionTable' on its own, or 'Action' with 'Popups'."
+    }
 
-    if ($PopupActionTable.Count -gt 0) {
-        Foreach ($popupActionPair in $PopupActionTable.GetEnumerator()) {
-            $popup = $popupActionPair.Name + "Popup"
-            $action = $popupActionPair.Value
-            if ($sync.$popup -eq $null) {
-                $PopupsNotFound.Add("$popup") | Out-Null
-                continue
-            }
-            switch ($action) {
-                'Show' { $actionAsBool = $true }
-                'Hide' { $actionAsBool = $false }
-                'Toggle' { $actionAsBool = -not $sync.$popup.IsOpen }
-                default { throw [GenericException]::new("Action can only be `"Show`" or `"Hide`" or `"Toggle`".") }
-            }
-            $sync.$popup.IsOpen = $actionAsBool
-        }
+    # Collect popups and actions
+    $PopupsToProcess = if ($PopupActionTable.Count) {
+        $PopupActionTable.GetEnumerator() | ForEach-Object { [PSCustomObject]@{ Name = "$($_.Key)Popup"; Action = $_.Value } }
     } else {
-        if ($Action -eq "" -or $Popups.Count -eq 0) {
-            throw [GenericException]::new("Please provide both the 'Action' and 'Popups' Parameters, with the appropriate values foreach parameter.")
+        $Popups | ForEach-Object { [PSCustomObject]@{ Name = "$_`Popup"; Action = $Action } }
+    }
+
+    $PopupsNotFound = @()
+
+    # Apply actions
+    foreach ($popupEntry in $PopupsToProcess) {
+        $popupName = $popupEntry.Name
+
+        if (-not $sync.$popupName) {
+            $PopupsNotFound += $popupName
+            continue
         }
-        Foreach ($popup in $Popups) {
-            $popup += "Popup"
-            if ($sync.$popup -eq $null) {
-                $PopupsNotFound.Add("$popup") | Out-Null
-                continue
-            }
-            switch ($action) {
-                'Show' { $actionAsBool = $true }
-                'Hide' { $actionAsBool = $false }
-                'Toggle' { $actionAsBool = -not $sync.$popup.IsOpen }
-                default { throw [GenericException]::new("Action can only be `"Show`" or `"Hide`" or `"Toggle`".") }
-            }
-            $sync.$popup.IsOpen = $actionAsBool
+
+        $sync.$popupName.IsOpen = switch ($popupEntry.Action) {
+            "Show" { $true }
+            "Hide" { $false }
+            "Toggle" { -not $sync.$popupName.IsOpen }
         }
     }
 
     if ($PopupsNotFound.Count -gt 0) {
-        $PopupsNotFoundAsString = "@("
-        Foreach ($popupNotFound in $PopupsNotFound) {
-            $PopupsNotFoundAsString += "$popupNotFound"
-            $PopupsNotFoundAsString += ", "
-        }
-        $PopupsNotFoundAsString = $PopupsNotFoundAsString -replace (',\s*$', '')
-        $PopupsNotFoundAsString += ")"
-        throw [GenericException]::new("Could not find $PopupsNotFoundAsString Popups in `$sync variable.")
+        throw "Could not find the following popups: $($PopupsNotFound -join ', ')"
     }
 }