Improve 'Invoke-WPFPopup' by @MyDrift-user

Thanks for the improvements :)

config/applications.json

@@ -445,7 +445,7 @@
         "category": "Utilities",
         "content": "Dual Monitor Tools",
         "link": "https://dualmonitortool.sourceforge.net/",
-        "description": "Dual Monitor Tools (DMT) is a FOSS app that customize handling multiple monitors and even lock the mouse on specific monitor. Useful for full screen games and apps that does not handle well a second monitor or helps the workflow."
+        "description": "Dual Monitor Tools (DMT) is a FOSS app that allows you to customize the handling of multiple monitors. Useful for fullscreen games and apps that handle a second monitor poorly and can improve your workflow."
     },
     "duplicati": {
         "category": "Utilities",

config/feature.json

@@ -321,5 +321,5 @@
     "Order": "a084_",
     "Type": "Button",
     "ButtonWidth": "300"
-  },
+  }
 }

config/themes.json

@@ -2,12 +2,12 @@
     "shared":{
         "CustomDialogFontSize":       "12",
         "CustomDialogFontSizeHeader": "14",
-        "CustomDialogIconSize":       "25",
+        "CustomDialogLogoSize":       "25",
         "CustomDialogWidth":          "400",
         "CustomDialogHeight":         "200",
         "FontSize":         "12",
         "FontFamily":       "Arial",
-        "FontSizeHeading":  "16",
+        "HeadingFontSize":  "16",
         "HeaderFontFamily": "Consolas, Monaco",
         "CheckBoxBulletDecoratorSize": "14",
         "CheckBoxMargin": "15,0,0,2",
@@ -27,7 +27,7 @@
         "ButtonFontFamily": "Arial",
         "ButtonWidth":      "200",
         "ButtonHeight":     "25",
-        "ConfigTabButtonFontSize":      "16",
+        "ConfigUpdateButtonFontSize":   "14",
         "SearchBarWidth":               "200",
         "SearchBarHeight":              "26",
         "SearchBarTextBoxFontSize":     "12",
@@ -44,7 +44,7 @@
         "MainForegroundColor":  "#232629",
         "MainBackgroundColor":  "#F7F7F7",
         "LabelBackgroundColor":  "#F7F7F7",
-        "LinkForegroundColor":  "#232629",
+        "LinkForegroundColor":  "#484848",
         "LinkHoverForegroundColor":  "#232629",
         "ScrollBarBackgroundColor": "#4A4D52",
         "ScrollBarHoverColor": "#5A5D62",

config/tweaks.json

@@ -2584,6 +2584,36 @@
     ],
     "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveCopilot"
   },
+  "WPFTweaksRecallOff": {
+    "Content": "Disable Recall",
+    "Description": "Turn Recall off",
+    "category": "Essential Tweaks",
+    "panel": "1",
+    "Order": "a011_",
+    "registry": [
+      {
+
+        "Path": "HKLM:\\SOFTWARE\\Policies\\Microsoft\\Windows\\WindowsAI",
+        "Name": "DisableAIDataAnalysis",
+        "Type": "DWord",
+        "Value": "1",
+        "OriginalValue": "0"
+      }
+    ],
+    "InvokeScript": [
+      "
+      Write-Host \"Disable Recall\"
+      DISM /Online /Disable-Feature /FeatureName:Recall
+      "
+    ],
+    "UndoScript": [
+      "
+      Write-Host \"Enable Recall\"
+      DISM /Online /Enable-Feature /FeatureName:Recall
+      "
+    ],
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/DisableRecall"
+  },
   "WPFTweaksDisableLMS1": {
     "Content": "Disable Intel MM (vPro LMS)",
     "Description": "Intel LMS service is always listening on all ports and could be a huge security risk. There is no need to run LMS on home machines and even in the Enterprise there are better solutions.",
@@ -3434,14 +3464,5 @@
     "Type": "Button",
     "ButtonWidth": "300",
     "link": "https://christitustech.github.io/winutil/dev/tweaks/Performance-Plans/RemoveUltPerf"
-  },
-  "WPFWinUtilShortcut": {
-    "Content": "Create WinUtil Shortcut",
-    "category": "Shortcuts",
-    "panel": "2",
-    "Order": "a082_",
-    "Type": "Button",
-    "ButtonWidth": "300",
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Shortcuts/Shortcut"
   }
 }

docs/dev/tweaks/Essential-Tweaks/DisableRecall.md

@@ -0,0 +1,91 @@
+# Disable Microsoft Recall
+
+Last Updated: 2024-10-24
+
+
+!!! info
+     The Development Documentation is auto generated for every compilation of WinUtil, meaning a part of it will always stay up-to-date. **Developers do have the ability to add custom content, which won't be updated automatically.**
+## Description
+
+Disables MS Recall built into Windows since 24H2.
+
+<!-- BEGIN CUSTOM CONTENT -->
+
+<!-- END CUSTOM CONTENT -->
+
+<details>
+<summary>Preview Code</summary>
+
+```json
+"WPFTweaksRecallOff": {
+    "Content": "Disable Recall",
+    "Description": "Turn Recall off",
+    "category": "Essential Tweaks",
+    "panel": "1",
+    "Order": "a011_",
+    "registry": [
+      {
+
+        "Path": "HKLM:\\SOFTWARE\\Policies\\Microsoft\\Windows\\WindowsAI",
+        "Name": "DisableAIDataAnalysis",
+        "Type": "DWord",
+        "Value": "1",
+        "OriginalValue": "0"
+      }
+    ],
+    "InvokeScript": [
+      "
+      Write-Host \"Disable Recall\"
+      DISM /Online /Disable-Feature /FeatureName:Recall
+      "
+    ],
+    "UndoScript": [
+      "
+      Write-Host \"Enable Recall\"
+      DISM /Online /Enable-Feature /FeatureName:Recall
+      "
+    ],
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/DisableRecall"
+  },
+```
+
+</details>
+
+## Invoke Script
+
+```powershell
+
+      Write-Host "Disable Recall"
+      DISM /Online /Disable-Feature /FeatureName:Recall
+
+
+```
+## Undo Script
+
+```powershell
+
+      Write-Host "Enable Recall"
+      DISM /Online /Enable-Feature /FeatureName:Recall
+
+
+```
+## Registry Changes
+Applications and System Components store and retrieve configuration data to modify windows settings, so we can use the registry to change many settings in one place.
+
+
+You can find information about the registry on [Wikipedia](https://www.wikiwand.com/en/Windows_Registry) and [Microsoft's Website](https://learn.microsoft.com/en-us/windows/win32/sysinfo/registry).
+
+### Registry Key: DisableAIDataAnalysis
+
+**Type:** DWord
+
+**Original Value:** 0
+
+**New Value:** 1
+
+<!-- BEGIN SECOND CUSTOM CONTENT -->
+
+<!-- END SECOND CUSTOM CONTENT -->
+
+
+[View the JSON file](https://github.com/ChrisTitusTech/winutil/tree/main/config/tweaks.json)

docs/dev/tweaks/Shortcuts/Shortcut.md

@@ -1,113 +0,0 @@
-# Create WinUtil Shortcut
-
-Last Updated: 2024-08-07
-
-
-!!! info
-     The Development Documentation is auto generated for every compilation of WinUtil, meaning a part of it will always stay up-to-date. **Developers do have the ability to add custom content, which won't be updated automatically.**
-
-
-<!-- BEGIN CUSTOM CONTENT -->
-
-<!-- END CUSTOM CONTENT -->
-
-<details>
-<summary>Preview Code</summary>
-
-```json
-{
-  "Content": "Create WinUtil Shortcut",
-  "category": "Shortcuts",
-  "panel": "2",
-  "Order": "a082_",
-  "Type": "Button",
-  "ButtonWidth": "300",
-  "link": "https://christitustech.github.io/winutil/dev/tweaks/Shortcuts/Shortcut"
-}
-```
-
-</details>
-
-## Function: Invoke-WPFShortcut
-
-```powershell
-function Invoke-WPFShortcut {
-    <#
-
-    .SYNOPSIS
-        Creates a shortcut and prompts for a save location
-
-    .PARAMETER ShortcutToAdd
-        The name of the shortcut to add
-
-    .PARAMETER RunAsAdmin
-        A boolean value to make 'Run as administrator' property on (true) or off (false), defaults to off
-
-    #>
-    param(
-        $ShortcutToAdd,
-        [bool]$RunAsAdmin = $false
-    )
-
-    # Preper the Shortcut Fields and add an a Custom Icon if it's available, else don't add a Custom Icon.
-
-    Switch ($ShortcutToAdd) {
-        "WinUtil" {
-            # Use Powershell 7 if installed and fallback to PS5 if not
-            if (Get-Command "pwsh" -ErrorAction SilentlyContinue) {
-                $shell = "pwsh.exe"
-            } else {
-                $shell = "powershell.exe"
-            }
-
-            $shellArgs = "-ExecutionPolicy Bypass -Command `"Start-Process $shell -verb runas -ArgumentList `'-Command `"irm https://github.com/ChrisTitusTech/winutil/releases/latest/download/winutil.ps1 | iex`"`'"
-
-            $DestinationName = "WinUtil.lnk"
-        }
-    }
-
-    # Show a File Dialog Browser, to let the User choose the Name and Location of where to save the Shortcut
-    $FileBrowser = New-Object System.Windows.Forms.SaveFileDialog
-    $FileBrowser.InitialDirectory = [Environment]::GetFolderPath('Desktop')
-    $FileBrowser.Filter = "Shortcut Files (*.lnk)|*.lnk"
-    $FileBrowser.FileName = $DestinationName
-
-    # Do an Early Return if the Save Operation was canceled by User's Input.
-    $FileBrowserResult = $FileBrowser.ShowDialog()
-    $DialogResultEnum = New-Object System.Windows.Forms.DialogResult
-    if (-not ($FileBrowserResult -eq $DialogResultEnum::OK)) {
-        return
-    }
-
-    # Prepare the Shortcut paramter
-    $WshShell = New-Object -comObject WScript.Shell
-    $Shortcut = $WshShell.CreateShortcut($FileBrowser.FileName)
-    $Shortcut.TargetPath = $shell
-    $Shortcut.Arguments = $shellArgs
-    if (Test-Path -Path $winutildir["logo.ico"]) {
-        $shortcut.IconLocation = $winutildir["logo.ico"]
-    }
-
-    # Save the Shortcut to disk
-    $Shortcut.Save()
-
-    if ($RunAsAdmin -eq $true) {
-        $bytes = [System.IO.File]::ReadAllBytes($FileBrowser.FileName)
-        # Set byte value at position 0x15 in hex, or 21 in decimal, from the value 0x00 to 0x20 in hex
-        $bytes[0x15] = $bytes[0x15] -bor 0x20
-        [System.IO.File]::WriteAllBytes($FileBrowser.FileName, $bytes)
-    }
-
-    Write-Host "Shortcut for $ShortcutToAdd has been saved to $($FileBrowser.FileName) with 'Run as administrator' set to $RunAsAdmin"
-}
-
-```
-
-
-<!-- BEGIN SECOND CUSTOM CONTENT -->
-
-<!-- END SECOND CUSTOM CONTENT -->
-
-
-[View the JSON file](https://github.com/ChrisTitusTech/winutil/tree/main/config/tweaks.json)
-

functions/private/Copy-Files.ps1

@@ -19,10 +19,10 @@ function Copy-Files {
     try {
 
         $files = Get-ChildItem -Path $path -Recurse:$recurse
-        Write-Host "Copy $($files.Count)(s) from $path to $destination"
+        Write-Host "Copy $($files.Count) file(s) from $path to $destination"
 
         foreach ($file in $files) {
-            $status = "Copy files {0} on {1}: {2}" -f $counter, $files.Count, $file.Name
+            $status = "Copying file {0} of {1}: {2}" -f $counter, $files.Count, $file.Name
             Write-Progress -Activity "Copy Windows files" -Status $status -PercentComplete ($counter++/$files.count*100)
             $restpath = $file.FullName -Replace $path, ''
 
@@ -37,7 +37,11 @@ function Copy-Files {
         }
         Write-Progress -Activity "Copy Windows files" -Status "Ready" -Completed
     } catch {
-        Write-Warning "Unable to Copy all the files due to unhandled exception"
+        Write-Host "Unable to Copy all the files due to an unhandled exception" -ForegroundColor Yellow
-        Write-Warning $psitem.Exception.StackTrace
+        Write-Host "Error information: $($_.Exception.Message)`n" -ForegroundColor Yellow
+        Write-Host "Additional information:" -ForegroundColor Yellow
+        Write-Host $PSItem.Exception.StackTrace
+        # Write possible suggestions
+        Write-Host "`nIf you are using an antivirus, try configuring exclusions"
     }
 }

functions/private/Invoke-WinUtilMicroWin-Helper.ps1

@@ -25,6 +25,17 @@ function Test-CompatibleImage() {
     }
 }
 
+class ErroredPackage {
+    [string]$PackageName
+    [string]$ErrorMessage
+    ErroredPackage() { $this.Init(@{} )}
+    # Constructor for packages that have errored out
+    ErroredPackage([string]$pkgName, [string]$reason) {
+        $this.PackageName = $pkgName
+        $this.ErrorMessage = $reason
+    }
+}
+
 function Get-FidoLangFromCulture {
 
     param (
@@ -98,6 +109,7 @@ function Remove-Features() {
             $_.FeatureName -NotLike "*Media*" -AND
             $_.FeatureName -NotLike "*NFS*" -AND
             $_.FeatureName -NotLike "*SearchEngine*" -AND
+            $_.FeatureName -NotLike "*RemoteDesktop*" -AND
             $_.State -ne "Disabled"
         }
 
@@ -157,27 +169,54 @@ function Remove-Packages {
                 $_ -NotLike "*WMIC*" -AND
                 $_ -NotLike "*UI.XaML*" -AND
                 $_ -NotLike "*Ethernet*" -AND
-                $_ -NotLike "*Wifi*"
+                $_ -NotLike "*Wifi*" -AND
+                $_ -NotLike "*FodMetadata*" -AND
+                $_ -NotLike "*Foundation*" -AND
+                $_ -NotLike "*LanguageFeatures*" -AND
+                $_ -NotLike "*VBSCRIPT*" -AND
+                $_ -NotLike "*License*"
             }
 
         $failedCount = 0
 
+        $erroredPackages = [System.Collections.Generic.List[ErroredPackage]]::new()
+
         foreach ($pkg in $pkglist) {
             try {
                 $status = "Removing $pkg"
-                Write-Progress -Activity "Removing Apps" -Status $status -PercentComplete ($counter++/$pkglist.Count*100)
+                Write-Progress -Activity "Removing Packages" -Status $status -PercentComplete ($counter++/$pkglist.Count*100)
                 Remove-WindowsPackage -Path "$scratchDir" -PackageName $pkg -NoRestart -ErrorAction SilentlyContinue
             } catch {
-                # This can happen if the package that is being removed is a permanent one, like FodMetadata
+                # This can happen if the package that is being removed is a permanent one
-                Write-Host "Could not remove OS package $($pkg)"
+                $erroredPackages.Add([ErroredPackage]::new($pkg, $_.Exception.Message))
                 $failedCount += 1
                 continue
             }
         }
-        Write-Progress -Activity "Removing Apps" -Status "Ready" -Completed
+        Write-Progress -Activity "Removing Packages" -Status "Ready" -Completed
         if ($failedCount -gt 0)
         {
-            Write-Host "Some packages could not be removed. Do not worry: your image will still work fine. This can happen if the package is permanent or has been superseded by a newer one."
+            Write-Host "$failedCount package(s) could not be removed. Your image will still work fine, however. Below is information on what packages failed to be removed and why."
+            if ($erroredPackages.Count -gt 0)
+            {
+                $erroredPackages = $erroredPackages | Sort-Object -Property ErrorMessage
+
+                $previousErroredPackage = $erroredPackages[0]
+                $counter = 0
+                Write-Host ""
+                Write-Host "- $($previousErroredPackage.ErrorMessage)"
+                foreach ($erroredPackage in $erroredPackages) {
+                    if ($erroredPackage.ErrorMessage -ne $previousErroredPackage.ErrorMessage) {
+                        Write-Host ""
+                        $counter = 0
+                        Write-Host "- $($erroredPackage.ErrorMessage)"
+                    }
+                    $counter += 1
+                    Write-Host "  $counter) $($erroredPackage.PackageName)"
+                    $previousErroredPackage = $erroredPackage
+                }
+                Write-Host ""
+            }
         }
     } catch {
         Write-Host "Unable to get information about the packages. MicroWin processing will continue, but packages will not be processed"
@@ -201,13 +240,8 @@ function Remove-ProvisionedPackages() {
         $appxProvisionedPackages = Get-AppxProvisionedPackage -Path "$($scratchDir)" | Where-Object {
                 $_.PackageName -NotLike "*AppInstaller*" -AND
                 $_.PackageName -NotLike "*Store*" -and
-                $_.PackageName -NotLike "*dism*" -and
-                $_.PackageName -NotLike "*Foundation*" -and
-                $_.PackageName -NotLike "*FodMetadata*" -and
-                $_.PackageName -NotLike "*LanguageFeatures*" -and
                 $_.PackageName -NotLike "*Notepad*" -and
                 $_.PackageName -NotLike "*Printing*" -and
-                $_.PackageName -NotLike "*Foundation*" -and
                 $_.PackageName -NotLike "*YourPhone*" -and
                 $_.PackageName -NotLike "*Xbox*" -and
                 $_.PackageName -NotLike "*WindowsTerminal*" -and
@@ -242,6 +276,31 @@ function Remove-ProvisionedPackages() {
     }
 }
 
+function Get-LocalizedUsers
+{
+    <#
+        .SYNOPSIS
+            Gets a localized user group representation for ICACLS commands (Port from DISMTools PE Helper)
+        .PARAMETER admins
+            Determines whether to get a localized user group representation for the Administrators user group
+        .OUTPUTS
+            A string containing the localized user group
+        .EXAMPLE
+            Get-LocalizedUsers -admins $true
+    #>
+    param (
+        [Parameter(Mandatory = $true, Position = 0)] [bool]$admins
+    )
+    if ($admins)
+    {
+        return (Get-LocalGroup | Where-Object { $_.SID.Value -like "S-1-5-32-544" }).Name
+    }
+    else
+    {
+        return (Get-LocalGroup | Where-Object { $_.SID.Value -like "S-1-5-32-545" }).Name
+    }
+}
+
 function Copy-ToUSB([string]$fileToCopy) {
     foreach ($volume in Get-Volume) {
         if ($volume -and $volume.FileSystemLabel -ieq "ventoy") {
@@ -625,70 +684,70 @@ function New-CheckInstall {
     # using here string to embedd firstrun
     $checkInstall = @'
     @echo off
-    if exist "C:\windows\cpu.txt" (
+    if exist "%HOMEDRIVE%\windows\cpu.txt" (
-        echo C:\windows\cpu.txt exists
+        echo %HOMEDRIVE%\windows\cpu.txt exists
     ) else (
-        echo C:\windows\cpu.txt does not exist
+        echo %HOMEDRIVE%\windows\cpu.txt does not exist
     )
-    if exist "C:\windows\SerialNumber.txt" (
+    if exist "%HOMEDRIVE%\windows\SerialNumber.txt" (
-        echo C:\windows\SerialNumber.txt exists
+        echo %HOMEDRIVE%\windows\SerialNumber.txt exists
     ) else (
-        echo C:\windows\SerialNumber.txt does not exist
+        echo %HOMEDRIVE%\windows\SerialNumber.txt does not exist
     )
-    if exist "C:\unattend.xml" (
+    if exist "%HOMEDRIVE%\unattend.xml" (
-        echo C:\unattend.xml exists
+        echo %HOMEDRIVE%\unattend.xml exists
     ) else (
-        echo C:\unattend.xml does not exist
+        echo %HOMEDRIVE%\unattend.xml does not exist
     )
-    if exist "C:\Windows\Setup\Scripts\SetupComplete.cmd" (
+    if exist "%HOMEDRIVE%\Windows\Setup\Scripts\SetupComplete.cmd" (
-        echo C:\Windows\Setup\Scripts\SetupComplete.cmd exists
+        echo %HOMEDRIVE%\Windows\Setup\Scripts\SetupComplete.cmd exists
     ) else (
-        echo C:\Windows\Setup\Scripts\SetupComplete.cmd does not exist
+        echo %HOMEDRIVE%\Windows\Setup\Scripts\SetupComplete.cmd does not exist
     )
-    if exist "C:\Windows\Panther\unattend.xml" (
+    if exist "%HOMEDRIVE%\Windows\Panther\unattend.xml" (
-        echo C:\Windows\Panther\unattend.xml exists
+        echo %HOMEDRIVE%\Windows\Panther\unattend.xml exists
     ) else (
-        echo C:\Windows\Panther\unattend.xml does not exist
+        echo %HOMEDRIVE%\Windows\Panther\unattend.xml does not exist
     )
-    if exist "C:\Windows\System32\Sysprep\unattend.xml" (
+    if exist "%HOMEDRIVE%\Windows\System32\Sysprep\unattend.xml" (
-        echo C:\Windows\System32\Sysprep\unattend.xml exists
+        echo %HOMEDRIVE%\Windows\System32\Sysprep\unattend.xml exists
     ) else (
-        echo C:\Windows\System32\Sysprep\unattend.xml does not exist
+        echo %HOMEDRIVE%\Windows\System32\Sysprep\unattend.xml does not exist
     )
-    if exist "C:\Windows\FirstStartup.ps1" (
+    if exist "%HOMEDRIVE%\Windows\FirstStartup.ps1" (
-        echo C:\Windows\FirstStartup.ps1 exists
+        echo %HOMEDRIVE%\Windows\FirstStartup.ps1 exists
     ) else (
-        echo C:\Windows\FirstStartup.ps1 does not exist
+        echo %HOMEDRIVE%\Windows\FirstStartup.ps1 does not exist
     )
-    if exist "C:\Windows\winutil.ps1" (
+    if exist "%HOMEDRIVE%\Windows\winutil.ps1" (
-        echo C:\Windows\winutil.ps1 exists
+        echo %HOMEDRIVE%\Windows\winutil.ps1 exists
     ) else (
-        echo C:\Windows\winutil.ps1 does not exist
+        echo %HOMEDRIVE%\Windows\winutil.ps1 does not exist
     )
-    if exist "C:\Windows\LogSpecialize.txt" (
+    if exist "%HOMEDRIVE%\Windows\LogSpecialize.txt" (
-        echo C:\Windows\LogSpecialize.txt exists
+        echo %HOMEDRIVE%\Windows\LogSpecialize.txt exists
     ) else (
-        echo C:\Windows\LogSpecialize.txt does not exist
+        echo %HOMEDRIVE%\Windows\LogSpecialize.txt does not exist
     )
-    if exist "C:\Windows\LogAuditUser.txt" (
+    if exist "%HOMEDRIVE%\Windows\LogAuditUser.txt" (
-        echo C:\Windows\LogAuditUser.txt exists
+        echo %HOMEDRIVE%\Windows\LogAuditUser.txt exists
     ) else (
-        echo C:\Windows\LogAuditUser.txt does not exist
+        echo %HOMEDRIVE%\Windows\LogAuditUser.txt does not exist
     )
-    if exist "C:\Windows\LogOobeSystem.txt" (
+    if exist "%HOMEDRIVE%\Windows\LogOobeSystem.txt" (
-        echo C:\Windows\LogOobeSystem.txt exists
+        echo %HOMEDRIVE%\Windows\LogOobeSystem.txt exists
     ) else (
-        echo C:\Windows\LogOobeSystem.txt does not exist
+        echo %HOMEDRIVE%\Windows\LogOobeSystem.txt does not exist
     )
-    if exist "c:\windows\csup.txt" (
+    if exist "%HOMEDRIVE%\windows\csup.txt" (
-        echo c:\windows\csup.txt exists
+        echo %HOMEDRIVE%\windows\csup.txt exists
     ) else (
-        echo c:\windows\csup.txt does not exist
+        echo %HOMEDRIVE%\windows\csup.txt does not exist
     )
-    if exist "c:\windows\LogFirstRun.txt" (
+    if exist "%HOMEDRIVE%\windows\LogFirstRun.txt" (
-        echo c:\windows\LogFirstRun.txt exists
+        echo %HOMEDRIVE%\windows\LogFirstRun.txt exists
     ) else (
-        echo c:\windows\LogFirstRun.txt does not exist
+        echo %HOMEDRIVE%\windows\LogFirstRun.txt does not exist
     )
 '@
     $checkInstall | Out-File -FilePath "$env:temp\checkinstall.cmd" -Force -Encoding Ascii
@@ -726,7 +785,7 @@ function New-FirstRun {
         }
     }
 
-    "FirstStartup has worked" | Out-File -FilePath c:\windows\LogFirstRun.txt -Append -NoClobber
+    "FirstStartup has worked" | Out-File -FilePath "$env:HOMEDRIVE\windows\LogFirstRun.txt" -Append -NoClobber
 
     $taskbarPath = "$env:AppData\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar"
     # Delete all files on the Taskbar
@@ -746,45 +805,19 @@ function New-FirstRun {
         }
     }
     Remove-Item -Path "$env:USERPROFILE\Desktop\*.lnk"
-    Remove-Item -Path "C:\Users\Default\Desktop\*.lnk"
+    Remove-Item -Path "$env:HOMEDRIVE\Users\Default\Desktop\*.lnk"
 
-    # ************************************************
+    try
-    # Create WinUtil shortcut on the desktop
+    {
-    #
+        if ((Get-WindowsOptionalFeature -Online | Where-Object { $_.FeatureName -like "Recall" }).Count -gt 0)
-    $desktopPath = "$($env:USERPROFILE)\Desktop"
+        {
-    # Specify the target PowerShell command
+            Disable-WindowsOptionalFeature -Online -FeatureName "Recall" -Remove
-    $command = "powershell.exe -NoProfile -ExecutionPolicy Bypass -Command 'irm https://christitus.com/win | iex'"
-    # Specify the path for the shortcut
-    $shortcutPath = Join-Path $desktopPath 'winutil.lnk'
-    # Create a shell object
-    $shell = New-Object -ComObject WScript.Shell
-
-    # Create a shortcut object
-    $shortcut = $shell.CreateShortcut($shortcutPath)
-
-    if (Test-Path -Path "c:\Windows\cttlogo.png") {
-        $shortcut.IconLocation = "c:\Windows\cttlogo.png"
         }
+    }
+    catch
+    {
 
-    # Set properties of the shortcut
+    }
-    $shortcut.TargetPath = "powershell.exe"
-    $shortcut.Arguments = "-NoProfile -ExecutionPolicy Bypass -Command `"$command`""
-    # Save the shortcut
-    $shortcut.Save()
-
-    # Make the shortcut have 'Run as administrator' property on
-    $bytes = [System.IO.File]::ReadAllBytes($shortcutPath)
-    # Set byte value at position 0x15 in hex, or 21 in decimal, from the value 0x00 to 0x20 in hex
-    $bytes[0x15] = $bytes[0x15] -bor 0x20
-    [System.IO.File]::WriteAllBytes($shortcutPath, $bytes)
-
-    Write-Host "Shortcut created at: $shortcutPath"
-    #
-    # Done create WinUtil shortcut on the desktop
-    # ************************************************
-
-    Start-Process explorer
-
 '@
     $firstRun | Out-File -FilePath "$env:temp\FirstStartup.ps1" -Force
 }

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 IconSize
+    .PARAMETER LogoSize
-    The Size to use for Icon inside the custom dialog window.
+    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 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.Foreground = $ForegroundColor
-    $dialog.Background = $backgroundColor
+    $dialog.Background = $BackgroundColor
-    $dialog.FontFamily = $font
+    $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()
     })

functions/public/Invoke-WPFButton.ps1

@@ -50,7 +50,6 @@ function Invoke-WPFButton {
         "WPFFixesNetwork" {Invoke-WPFFixesNetwork}
         "WPFUpdatesdisable" {Invoke-WPFUpdatesdisable}
         "WPFUpdatessecurity" {Invoke-WPFUpdatessecurity}
-        "WPFWinUtilShortcut" {Invoke-WPFShortcut -ShortcutToAdd "WinUtil" -RunAsAdmin $true}
         "WPFGetInstalled" {Invoke-WPFGetInstalled -CheckBox "winget"}
         "WPFGetInstalledTweaks" {Invoke-WPFGetInstalled -CheckBox "tweaks"}
         "WPFGetIso" {Invoke-WPFGetIso}

functions/public/Invoke-WPFMicrowin.ps1

@@ -51,10 +51,6 @@ public class PowerManagement {
     $index = $sync.MicrowinWindowsFlavors.SelectedValue.Split(":")[0].Trim()
     Write-Host "Index chosen: '$index' from $($sync.MicrowinWindowsFlavors.SelectedValue)"
 
-    $keepPackages = $sync.WPFMicrowinKeepProvisionedPackages.IsChecked
-    $keepProvisionedPackages = $sync.WPFMicrowinKeepAppxPackages.IsChecked
-    $keepDefender = $sync.WPFMicrowinKeepDefender.IsChecked
-    $keepEdge = $sync.WPFMicrowinKeepEdge.IsChecked
     $copyToUSB = $sync.WPFMicrowinCopyToUsb.IsChecked
     $injectDrivers = $sync.MicrowinInjectDrivers.IsChecked
     $importDrivers = $sync.MicrowinImportDrivers.IsChecked
@@ -91,6 +87,14 @@ public class PowerManagement {
         return
     }
 
+    # Detect whether the image to process contains Windows 10 and show warning
+    if ((Test-CompatibleImage $imgVersion $([System.Version]::new(10,0,21996,1))) -eq $false) {
+        $msg = "Windows 10 has been detected in the image you want to process. While you can continue, Windows 10 is not a recommended target for MicroWin, and you may not get the full experience."
+        $dlg_msg = $msg
+        Write-Host $msg
+        [System.Windows.MessageBox]::Show($dlg_msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Exclamation)
+    }
+
     $mountDirExists = Test-Path $mountDir
     $scratchDirExists = Test-Path $scratchDir
     if (-not $mountDirExists -or -not $scratchDirExists) {
@@ -158,6 +162,35 @@ public class PowerManagement {
         Write-Host "Removing Appx Bloat"
         Remove-ProvisionedPackages
 
+        # Detect Windows 11 24H2 and add dependency to FileExp to prevent Explorer look from going back - thanks @WitherOrNot and @thecatontheceiling
+        if ((Test-CompatibleImage $imgVersion $([System.Version]::new(10,0,26100,1))) -eq $true)
+        {
+            try
+            {
+                if (Test-Path "$scratchDir\Windows\SystemApps\MicrosoftWindows.Client.FileExp_cw5n1h2txyewy\appxmanifest.xml" -PathType Leaf)
+                {
+                    # Found the culprit. Do the following:
+
+                    # 1. Take ownership of the file, from TrustedInstaller to Administrators
+                    takeown /F "$scratchDir\Windows\SystemApps\MicrosoftWindows.Client.FileExp_cw5n1h2txyewy\appxmanifest.xml" /A
+
+                    # 2. Set ACLs so that we can write to it
+                    icacls "$scratchDir\Windows\SystemApps\MicrosoftWindows.Client.FileExp_cw5n1h2txyewy\appxmanifest.xml" /grant "$(Get-LocalizedUsers -admins $true):(M)" | Out-Host
+
+                    # 3. Open the file and do the modification
+                    $appxManifest = Get-Content -Path "$scratchDir\Windows\SystemApps\MicrosoftWindows.Client.FileExp_cw5n1h2txyewy\appxmanifest.xml"
+                    $originalLine = $appxManifest[13]
+                    $dependency = "`n        <PackageDependency Name=`"Microsoft.WindowsAppRuntime.CBS`" MinVersion=`"1.0.0.0`" Publisher=`"CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US`" />"
+                    $appxManifest[13] = "$originalLine$dependency"
+                    Set-Content -Path "$scratchDir\Windows\SystemApps\MicrosoftWindows.Client.FileExp_cw5n1h2txyewy\appxmanifest.xml" -Value $appxManifest -Force -Encoding utf8
+                }
+            }
+            catch
+            {
+
+            }
+        }
+
         Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\LogFiles\WMI\RtBackup" -Directory
         Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\DiagTrack" -Directory
         Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\InboxApps" -Directory
@@ -238,6 +271,9 @@ public class PowerManagement {
         # Write-Host Error code $LASTEXITCODE
         Write-Host "Done disabling Teams"
 
+        Write-Host "Fix Windows Volume Mixer Issue"
+        reg add "HKLM\zNTUSER\Software\Microsoft\Internet Explorer\LowRegistry\Audio\PolicyConfig\PropertyStore" /f
+
         Write-Host "Bypassing system requirements (system image)"
         reg add "HKLM\zDEFAULT\Control Panel\UnsupportedHardwareNotificationCache" /v "SV1" /t REG_DWORD /d 0 /f
         reg add "HKLM\zDEFAULT\Control Panel\UnsupportedHardwareNotificationCache" /v "SV2" /t REG_DWORD /d 0 /f
@@ -289,6 +325,19 @@ public class PowerManagement {
         reg add "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize" /v "AppsUseLightTheme" /t REG_DWORD /d 0 /f
         reg add "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize" /v "SystemUsesLightTheme" /t REG_DWORD /d 0 /f
 
+        if ((Test-CompatibleImage $imgVersion $([System.Version]::new(10,0,21996,1))) -eq $false) {
+            # We're dealing with Windows 10. Configure sane desktop settings. NOTE: even though stuff to disable News and Interests is there,
+            # it doesn't seem to work, and I don't want to waste more time dealing with an operating system that will lose support in a year (2025)
+
+            # I invite anyone to work on improving stuff for News and Interests, but that won't be me!
+
+            Write-Host "Disabling Search Highlights..."
+            reg add "HKLM\zNTUSER\SOFTWARE\Microsoft\Windows\CurrentVersion\Feeds\DSB" /v "ShowDynamicContent" /t REG_DWORD /d 0 /f
+            reg add "HKLM\zNTUSER\SOFTWARE\Microsoft\Windows\CurrentVersion\SearchSettings" /v "IsDynamicSearchBoxEnabled" /t REG_DWORD /d 0 /f
+            reg add "HKLM\zSOFTWARE\Policies\Microsoft\Dsh" /v "AllowNewsAndInterests" /t REG_DWORD /d 0 /f
+            reg add "HKLM\zNTUSER\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "TraySearchBoxVisible" /t REG_DWORD /d 1 /f
+        }
+
     } catch {
         Write-Error "An unexpected error occurred: $_"
     } finally {

functions/public/Invoke-WPFPopup.ps1

@@ -0,0 +1,54 @@
+function Invoke-WPFPopup {
+    param (
+        [ValidateSet("Show", "Hide", "Toggle")]
+        [string]$Action = "",
+
+        [string[]]$Popups = @(),
+
+        [ValidateScript({
+            $invalid = $_.GetEnumerator() | Where-Object { $_.Value -notin @("Show", "Hide", "Toggle") }
+            if ($invalid) {
+                throw "Found invalid Popup-Action pair(s): " + ($invalid | ForEach-Object { "$($_.Key) = $($_.Value)" } -join "; ")
+            }
+            $true
+        })]
+        [hashtable]$PopupActionTable = @{}
+    )
+
+    if (-not $PopupActionTable.Count -and (-not $Action -or -not $Popups.Count)) {
+        throw "Provide either 'PopupActionTable' or both 'Action' and 'Popups'."
+    }
+
+    if ($PopupActionTable.Count -and ($Action -or $Popups.Count)) {
+        throw "Use 'PopupActionTable' on its own, or 'Action' with 'Popups'."
+    }
+
+    # Collect popups and actions
+    $PopupsToProcess = if ($PopupActionTable.Count) {
+        $PopupActionTable.GetEnumerator() | ForEach-Object { [PSCustomObject]@{ Name = "$($_.Key)Popup"; Action = $_.Value } }
+    } else {
+        $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
+        }
+
+        $sync.$popupName.IsOpen = switch ($popupEntry.Action) {
+            "Show" { $true }
+            "Hide" { $false }
+            "Toggle" { -not $sync.$popupName.IsOpen }
+        }
+    }
+
+    if ($PopupsNotFound.Count -gt 0) {
+        throw "Could not find the following popups: $($PopupsNotFound -join ', ')"
+    }
+}

functions/public/Invoke-WPFShortcut.ps1

@@ -1,72 +0,0 @@
-function Invoke-WPFShortcut {
-    <#
-
-    .SYNOPSIS
-        Creates a shortcut and prompts for a save location
-
-    .PARAMETER ShortcutToAdd
-        The name of the shortcut to add
-
-    .PARAMETER RunAsAdmin
-        A boolean value to make 'Run as administrator' property on (true) or off (false), defaults to off
-
-    #>
-    param(
-        $ShortcutToAdd,
-        [bool]$RunAsAdmin = $false
-    )
-
-    # Preper the Shortcut Fields and add an a Custom Icon if it's available, else don't add a Custom Icon.
-
-    Switch ($ShortcutToAdd) {
-        "WinUtil" {
-            # Use Powershell 7 if installed and fallback to PS5 if not
-            if (Get-Command "pwsh" -ErrorAction SilentlyContinue) {
-                $shell = "pwsh.exe"
-            } else {
-                $shell = "powershell.exe"
-            }
-
-            $shellArgs = "-ExecutionPolicy Bypass -Command `"Start-Process $shell -verb runas -ArgumentList `'-Command `"irm https://github.com/ChrisTitusTech/winutil/releases/latest/download/winutil.ps1 | iex`"`'"
-
-            $DestinationName = "WinUtil.lnk"
-        }
-    }
-
-    # Show a File Dialog Browser, to let the User choose the Name and Location of where to save the Shortcut
-    $FileBrowser = New-Object System.Windows.Forms.SaveFileDialog
-    $FileBrowser.InitialDirectory = [Environment]::GetFolderPath('Desktop')
-    $FileBrowser.Filter = "Shortcut Files (*.lnk)|*.lnk"
-    $FileBrowser.FileName = $DestinationName
-
-    # Do an Early Return if the Save Operation was canceled by User's Input.
-    $FileBrowserResult = $FileBrowser.ShowDialog()
-    $DialogResultEnum = New-Object System.Windows.Forms.DialogResult
-    if (-not ($FileBrowserResult -eq $DialogResultEnum::OK)) {
-        return
-    }
-
-    # Prepare the Shortcut paramter
-    $WshShell = New-Object -comObject WScript.Shell
-    $Shortcut = $WshShell.CreateShortcut($FileBrowser.FileName)
-    $Shortcut.TargetPath = $shell
-    $Shortcut.Arguments = $shellArgs
-    if (-NOT (Test-Path -Path $winutildir["logo.ico"])) {
-        Invoke-WebRequest -Uri "https://christitus.com/images/logo-full.ico" -OutFile $winutildir["logo.ico"]
-    }
-    if (Test-Path -Path $winutildir["logo.ico"]) {
-        $shortcut.IconLocation = $winutildir["logo.ico"]
-    }
-
-    # Save the Shortcut to disk
-    $Shortcut.Save()
-
-    if ($RunAsAdmin -eq $true) {
-        $bytes = [System.IO.File]::ReadAllBytes($FileBrowser.FileName)
-        # Set byte value at position 0x15 in hex, or 21 in decimal, from the value 0x00 to 0x20 in hex
-        $bytes[0x15] = $bytes[0x15] -bor 0x20
-        [System.IO.File]::WriteAllBytes($FileBrowser.FileName, $bytes)
-    }
-
-    Write-Host "Shortcut for $ShortcutToAdd has been saved to $($FileBrowser.FileName) with 'Run as administrator' set to $RunAsAdmin"
-}

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
 

functions/public/Invoke-WPFUpdatesdefault.ps1

@@ -42,4 +42,24 @@ function Invoke-WPFUpdatesdefault {
     Write-Host "==================================================="
     Write-Host "---  Windows Update Settings Reset to Default   ---"
     Write-Host "==================================================="
+
+    Start-Process -FilePath "secedit" -ArgumentList "/configure /cfg $env:windir\inf\defltbase.inf /db defltbase.sdb /verbose" -Wait
+    Start-Process -FilePath "cmd.exe" -ArgumentList "/c RD /S /Q $env:WinDir\System32\GroupPolicyUsers" -Wait
+    Start-Process -FilePath "cmd.exe" -ArgumentList "/c RD /S /Q $env:WinDir\System32\GroupPolicy" -Wait
+    Start-Process -FilePath "gpupdate" -ArgumentList "/force" -Wait
+    Remove-Item -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Policies" -Recurse -Force -ErrorAction SilentlyContinue
+    Remove-Item -Path "HKCU:\Software\Microsoft\WindowsSelfHost" -Recurse -Force -ErrorAction SilentlyContinue
+    Remove-Item -Path "HKCU:\Software\Policies" -Recurse -Force -ErrorAction SilentlyContinue
+    Remove-Item -Path "HKLM:\Software\Microsoft\Policies" -Recurse -Force -ErrorAction SilentlyContinue
+    Remove-Item -Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Policies" -Recurse -Force -ErrorAction SilentlyContinue
+    Remove-Item -Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\WindowsStore\WindowsUpdate" -Recurse -Force -ErrorAction SilentlyContinue
+    Remove-Item -Path "HKLM:\Software\Microsoft\WindowsSelfHost" -Recurse -Force -ErrorAction SilentlyContinue
+    Remove-Item -Path "HKLM:\Software\Policies" -Recurse -Force -ErrorAction SilentlyContinue
+    Remove-Item -Path "HKLM:\Software\WOW6432Node\Microsoft\Policies" -Recurse -Force -ErrorAction SilentlyContinue
+    Remove-Item -Path "HKLM:\Software\WOW6432Node\Microsoft\Windows\CurrentVersion\Policies" -Recurse -Force -ErrorAction SilentlyContinue
+    Remove-Item -Path "HKLM:\Software\WOW6432Node\Microsoft\Windows\CurrentVersion\WindowsStore\WindowsUpdate" -Recurse -Force -ErrorAction SilentlyContinue
+
+    Write-Host "==================================================="
+    Write-Host "---  Windows Local Policies Reset to Default   ---"
+    Write-Host "==================================================="
 }

overrides/main.html

@@ -4,6 +4,7 @@
     {{ super() }}
     <div style="color: red; text-align: center; padding: 10px; font-size: 20px;">
         <strong>Announcement:</strong> We are currently not adding any applications to WinUtil and any apps that will be added through a PR will be declined by the maintainer.
+        <strong>Announcement:</strong> We are currently reworking the docs to use Hugo rather then mkdocs.
     </div>
 {% endblock %}
 

scripts/main.ps1

@@ -33,19 +33,16 @@ $sync.runspace.Open()
 
 class WingetFailedInstall : Exception {
     [string]$additionalData
-
     WingetFailedInstall($Message) : base($Message) {}
 }
 
 class ChocoFailedInstall : Exception {
     [string]$additionalData
-
     ChocoFailedInstall($Message) : base($Message) {}
 }
 
 class GenericException : Exception {
     [string]$additionalData
-
     GenericException($Message) : base($Message) {}
 }
 
@@ -254,12 +251,7 @@ $commonKeyEvents = {
 $sync["Form"].Add_PreViewKeyDown($commonKeyEvents)
 
 $sync["Form"].Add_MouseLeftButtonDown({
-    # Hide Settings and Theme Popup on click anywhere else
+    Invoke-WPFPopup -Action "Hide" -Popups @("Settings", "Theme")
-    if ($sync.SettingsButton.IsOpen -or
-        $sync.ThemePopup.IsOpen) {
-            $sync.SettingsPopup.IsOpen = $false
-            $sync.ThemePopup.IsOpen = $false
-        }
     $sync["Form"].DragMove()
 })
 
@@ -277,12 +269,7 @@ $sync["Form"].Add_MouseDoubleClick({
 
 $sync["Form"].Add_Deactivated({
     Write-Debug "WinUtil lost focus"
-    # Hide Settings and Theme Popup on Winutil Focus Loss
+    Invoke-WPFPopup -Action "Hide" -Popups @("Settings", "Theme")
-    if ($sync.SettingsButton.IsOpen -or
-        $sync.ThemePopup.IsOpen) {
-            $sync.SettingsPopup.IsOpen = $false
-            $sync.ThemePopup.IsOpen = $false
-    }
 })
 
 $sync["Form"].Add_ContentRendered({
@@ -410,10 +397,8 @@ $sync["ISOmanual"].add_Checked({
     $sync["ISOLanguage"].Visibility = [System.Windows.Visibility]::Collapsed
 })
 
-$sync["ISORelease"].Items.Add("23H2") | Out-Null
+$sync["ISORelease"].Items.Add("24H2") | Out-Null
-$sync["ISORelease"].Items.Add("22H2") | Out-Null
+$sync["ISORelease"].SelectedItem = "24H2"
-$sync["ISORelease"].Items.Add("21H2") | Out-Null
-$sync["ISORelease"].SelectedItem = "23H2"
 
 $sync["ISOLanguage"].Items.Add("System Language ($(Get-FidoLangFromCulture -langName $((Get-Culture).Name)))") | Out-Null
 if ($currentCulture -ne "English International") {
@@ -523,101 +508,79 @@ 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["ThemeButton"].Add_Click({
+    Write-Debug "ThemeButton clicked"
+    Invoke-WPFPopup -PopupActionTable @{ "Settings" = "Hide"; "Theme" = "Toggle" }
+    $_.Handled = $false
+})
 $sync["AutoThemeMenuItem"].Add_Click({
-    $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({
-    $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({
-    $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.IsOpen) {
+    Invoke-WPFPopup -PopupActionTable @{ "Settings" = "Toggle"; "Theme" = "Hide" }
-        $sync.SettingsPopup.IsOpen = $false
-    }
-    else{
-        $sync.SettingsPopup.IsOpen = $true
-    }
-    $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-WPFPopup -Action "Hide" -Popups @("Settings")
     Invoke-WPFImpex -type "import"
     $_.Handled = $false
 })
-
 $sync["ExportMenuItem"].Add_Click({
-    # Handle Export menu item click
     Write-Debug "Export clicked"
-    $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"
-    $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>
-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>
 "@
-
+    Show-CustomDialog -Title "About" -Message $authorInfo
-    Show-CustomDialog -Message $authorInfo -LogoSize $LogoSize
 })
-
 $sync["SponsorMenuItem"].Add_Click({
-    # Handle Export menu item click
     Write-Debug "Sponsors clicked"
-    $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
-
+        foreach ($sponsor in $sponsors) {
-        # Append the sponsors to the authorInfo
+            $authorInfo += "<a href=`"https://github.com/sponsors/ChrisTitusTech`">$sponsor</a>`n"
-        $sponsors | ForEach-Object { $authorInfo += "$_`n" }
+        }
     } catch {
         $authorInfo += "An error occurred while fetching or processing the sponsors: $_`n"
     }
-
+    Show-CustomDialog -Title "Sponsors" -Message $authorInfo -EnableScroll $true
-    Show-CustomDialog -Message $authorInfo -EnableScroll $true
 })
 
 $sync["Form"].ShowDialog() | out-null

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>
@@ -1040,7 +1040,7 @@
                         HorizontalAlignment="Stretch">
                     <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="{DynamicResource MicrowinCheckBoxMargin}" />
+                            <CheckBox x:Name="WPFMicrowinDownloadFromGitHub" Content="Download oscdimg.exe from CTT Github repo" IsChecked="True" Margin="{DynamicResource MicrowinCheckBoxMargin}" />
                             <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