Code Formatting of Repo - Add Preprocessing to Compilation Process - Introduction of Dev/Build Tools to WinUtil (Although very simple at the moment) (#2383)

* Replace Tabs with Spaces to follow the conventions

* Add Preprocessing in Compiler

* Compile from Anywhere you want - Running 'Compile.ps1' Works in any directory you call it from

* Code Formatting Changes

* Result of Preprocessing Step in 'Compile.ps1' Script - Remove Trailing Whitespace Characters

* Make Preprocessing more advanced

* Move Preprocessing to a separate script file

* Make Self Modification impossible for 'tools/Do-PreProcessing.ps1' Script - Make the workingdir same as sync.PSScriptRoot for consistency

* Revert commit b5dffd671f

* Patched a Bug of some Excluded Files not actually get excluded in 'Get-ChildItem' PS Cmdlet

* Update Replace Regex for Code Formatting in 'Do-PreProcessing' Script Tool

* Rename 'Do-PreProcessing' to 'Invoke-Preprocessing' - Update some Comments

* Make 'Invoke-Preprocessing' Modular - Update RegEx to handle more cases - Update Documentation - Add Validations & Useful feedback upon error

* Replace Tabs with Spaces to follow the conventions - 'applications.json' File

* Code Formatting Changes - 'Copy-Files' Private Function

* Update Replace Regex for Code Formatting in 'Invoke-Preprocessing' Script Tool

* Replace Tabs with Spaces to follow the conventions - Make 'ExcludedFiles' validation step check all filepaths before finally checking if any has failed

* Result of 'Invoke-Preprocessing' Script

* Update Replace Regex for Code Formatting in 'Invoke-Preprocessing' Script Tool

Compile.ps1

@@ -1,13 +1,15 @@
 param (
     [switch]$Debug,
-    [switch]$Run
+    [switch]$Run,
+    [switch]$SkipPreprocessing
 )
 $OFS = "`r`n"
 $scriptname = "winutil.ps1"
+$workingdir = $PSScriptRoot
 
 # Variable to sync between runspaces
 $sync = [Hashtable]::Synchronized(@{})
-$sync.PSScriptRoot = $PSScriptRoot
+$sync.PSScriptRoot = $workingdir
 $sync.configs = @{}
 
 function Update-Progress {
@@ -15,12 +17,12 @@ function Update-Progress {
         [Parameter(Mandatory, position=0)]
         [string]$StatusMessage,
 
-	[Parameter(Mandatory, position=1)]
+        [Parameter(Mandatory, position=1)]
-	[ValidateRange(0,100)]
+        [ValidateRange(0,100)]
         [int]$Percent,
 
-	[Parameter(position=2)]
+        [Parameter(position=2)]
-	[string]$Activity = "Compiling"
+        [string]$Activity = "Compiling"
     )
 
     Write-Progress -Activity $Activity -Status $StatusMessage -PercentComplete $Percent
@@ -34,6 +36,17 @@ $header = @"
 ################################################################################################################
 "@
 
+if (-NOT $SkipPreprocessing) {
+    Update-Progress "Pre-req: Running Preprocessor..." 0
+
+    # Dot source the 'Invoke-Preprocessing' Function from 'tools/Invoke-Preprocessing.ps1' Script
+    $preprocessingFilePath = ".\tools\Invoke-Preprocessing.ps1"
+    . "$(($workingdir -replace ('\\$', '')) + '\' + ($preprocessingFilePath -replace ('\.\\', '')))"
+
+    $excludedFiles = @('.\.git\', '.\.gitignore', '.\.gitattributes', '.\.github\CODEOWNERS', '.\LICENSE', '.\winutil.ps1', "$preprocessingFilePath", '.\docs\changelog.md', '*.png', '*.exe')
+    $msg = "Pre-req: Code Formatting"
+    Invoke-Preprocessing -WorkingDir "$workingdir" -ExcludedFiles $excludedFiles -ProgressStatusMessage $msg
+}
 
 # Create the script in memory.
 Update-Progress "Pre-req: Allocating Memory" 0
@@ -43,14 +56,14 @@ Update-Progress "Adding: Header" 5
 $script_content.Add($header)
 
 Update-Progress "Adding: Version" 10
-$script_content.Add($(Get-Content .\scripts\start.ps1).replace('#{replaceme}',"$(Get-Date -Format yy.MM.dd)"))
+$script_content.Add($(Get-Content "$workingdir\scripts\start.ps1").replace('#{replaceme}',"$(Get-Date -Format yy.MM.dd)"))
 
 Update-Progress "Adding: Functions" 20
-Get-ChildItem .\functions -Recurse -File | ForEach-Object {
+Get-ChildItem "$workingdir\functions" -Recurse -File | ForEach-Object {
     $script_content.Add($(Get-Content $psitem.FullName))
     }
 Update-Progress "Adding: Config *.json" 40
-Get-ChildItem .\config | Where-Object {$psitem.extension -eq ".json"} | ForEach-Object {
+Get-ChildItem "$workingdir\config" | Where-Object {$psitem.extension -eq ".json"} | ForEach-Object {
 
     $json = (Get-Content $psitem.FullName).replace("'","''")
 
@@ -65,15 +78,15 @@ Get-ChildItem .\config | Where-Object {$psitem.extension -eq ".json"} | ForEach-
         #  Use **HTML decimal/hex codes instead**, as using HTML Entity Codes will result in XML parse Error when running the compiled script.
         for ($i = 0; $i -lt $firstLevelJsonList.Count; $i += 1) {
             $firstLevelName = $firstLevelJsonList[$i]
-	    if ($jsonAsObject.$firstLevelName.content -ne $null) {
+            if ($jsonAsObject.$firstLevelName.content -ne $null) {
                 $jsonAsObject.$firstLevelName.content = $jsonAsObject.$firstLevelName.content.replace('&','&#38;').replace('“','&#8220;').replace('”','&#8221;').replace("'",'&#39;').replace('<','&#60;').replace('>','&#62;').replace('—','&#8212;')
                 $jsonAsObject.$firstLevelName.content = $jsonAsObject.$firstLevelName.content.replace('&#39;&#39;',"&#39;") # resolves the Double Apostrophe caused by the first replace function in the main loop
             }
             if ($jsonAsObject.$firstLevelName.description -ne $null) {
                 $jsonAsObject.$firstLevelName.description = $jsonAsObject.$firstLevelName.description.replace('&','&#38;').replace('“','&#8220;').replace('”','&#8221;').replace("'",'&#39;').replace('<','&#60;').replace('>','&#62;').replace('—','&#8212;')
                 $jsonAsObject.$firstLevelName.description = $jsonAsObject.$firstLevelName.description.replace('&#39;&#39;',"&#39;") # resolves the Double Apostrophe caused by the first replace function in the main loop
-	    }
+            }
-	}
+        }
 
     # Add 'WPFInstall' as a prefix to every entry-name in 'applications.json' file
     if ($psitem.Name -eq "applications.json") {
@@ -95,10 +108,10 @@ Get-ChildItem .\config | Where-Object {$psitem.extension -eq ".json"} | ForEach-
     $script_content.Add($(Write-output "`$sync.configs.$($psitem.BaseName) = '$json' `| convertfrom-json" ))
 }
 
-$xaml = (Get-Content .\xaml\inputXML.xaml).replace("'","''")
+$xaml = (Get-Content "$workingdir\xaml\inputXML.xaml").replace("'","''")
 
 # Dot-source the Get-TabXaml function
-. .\functions\private\Get-TabXaml.ps1
+. "$workingdir\functions\private\Get-TabXaml.ps1"
 
 Update-Progress "Building: Xaml " 75
 $appXamlContent = Get-TabXaml "applications" 5
@@ -114,30 +127,28 @@ $xaml = $xaml -replace "{{InstallPanel_features}}", $featuresXamlContent
 
 $script_content.Add($(Write-output "`$inputXML =  '$xaml'"))
 
-$script_content.Add($(Get-Content .\scripts\main.ps1))
+$script_content.Add($(Get-Content "$workingdir\scripts\main.ps1"))
 
-if ($Debug){
+if ($Debug) {
     Update-Progress "Writing debug files" 95
-    $appXamlContent | Out-File -FilePath ".\xaml\inputApp.xaml" -Encoding ascii
+    $appXamlContent | Out-File -FilePath "$workingdir\xaml\inputApp.xaml" -Encoding ascii
-    $tweaksXamlContent | Out-File -FilePath ".\xaml\inputTweaks.xaml" -Encoding ascii
+    $tweaksXamlContent | Out-File -FilePath "$workingdir\xaml\inputTweaks.xaml" -Encoding ascii
-    $featuresXamlContent | Out-File -FilePath ".\xaml\inputFeatures.xaml" -Encoding ascii
+    $featuresXamlContent | Out-File -FilePath "$workingdir\xaml\inputFeatures.xaml" -Encoding ascii
-}
+} else {
-else {
     Update-Progress "Removing temporary files" 99
-    Remove-Item ".\xaml\inputApp.xaml" -ErrorAction SilentlyContinue
+    Remove-Item "$workingdir\xaml\inputApp.xaml" -ErrorAction SilentlyContinue
-    Remove-Item ".\xaml\inputTweaks.xaml" -ErrorAction SilentlyContinue
+    Remove-Item "$workingdir\xaml\inputTweaks.xaml" -ErrorAction SilentlyContinue
-    Remove-Item ".\xaml\inputFeatures.xaml" -ErrorAction SilentlyContinue
+    Remove-Item "$workingdir\xaml\inputFeatures.xaml" -ErrorAction SilentlyContinue
 }
 
-Set-Content -Path $scriptname -Value ($script_content -join "`r`n") -Encoding ascii
+Set-Content -Path "$workingdir\$scriptname" -Value ($script_content -join "`r`n") -Encoding ascii
 Write-Progress -Activity "Compiling" -Completed
 
-if ($run){
+if ($run) {
     try {
-        Start-Process -FilePath "pwsh" -ArgumentList ".\$scriptname"
+        Start-Process -FilePath "pwsh" -ArgumentList "$workingdir\$scriptname"
-    }
+    } catch {
-    catch {
+        Start-Process -FilePath "powershell" -ArgumentList "$workingdir\$scriptname"
-        Start-Process -FilePath "powershell" -ArgumentList ".\$scriptname"
     }
 
 }

config/tweaks.json

@@ -2432,7 +2432,7 @@
 
         # Check if the SystemRestorePointCreationFrequency value exists
         $exists = Get-ItemProperty -path \"HKLM:\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\SystemRestore\" -Name \"SystemRestorePointCreationFrequency\" -ErrorAction SilentlyContinue
-        if($null -eq $exists){
+        if($null -eq $exists) {
             write-host 'Changing system to allow multiple restore points per day'
             Set-ItemProperty -Path \"HKLM:\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\SystemRestore\" -Name \"SystemRestorePointCreationFrequency\" -Value \"0\" -Type DWord -Force -ErrorAction Stop | Out-Null
         }
@@ -2666,17 +2666,16 @@
       $OneDrivePath = $($env:OneDrive)
       Write-Host \"Removing OneDrive\"
       $regPath = \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OneDriveSetup.exe\"
-      if (Test-Path $regPath){
+      if (Test-Path $regPath) {
           $OneDriveUninstallString = Get-ItemPropertyValue \"$regPath\" -Name \"UninstallString\"
           $OneDriveExe, $OneDriveArgs = $OneDriveUninstallString.Split(\" \")
           Start-Process -FilePath $OneDriveExe -ArgumentList \"$OneDriveArgs /silent\" -NoNewWindow -Wait
-      }
+      } else {
-      else{
           Write-Host \"Onedrive dosn't seem to be installed anymore\" -ForegroundColor Red
           return
       }
       # Check if OneDrive got Uninstalled
-      if (-not (Test-Path $regPath)){
+      if (-not (Test-Path $regPath)) {
       Write-Host \"Copy downloaded Files from the OneDrive Folder to Root UserProfile\"
       Start-Process -FilePath powershell -ArgumentList \"robocopy '$($OneDrivePath)' '$($env:USERPROFILE.TrimEnd())\\' /mov /e /xj\" -NoNewWindow -Wait
 
@@ -2738,8 +2737,7 @@
       Write-Host \"Please Note - The OneDrive folder at $OneDrivePath may still have items in it. You must manually delete it, but all the files should already be copied to the base user folder.\"
       Write-Host \"If there are Files missing afterwards, please Login to Onedrive.com and Download them manually\" -ForegroundColor Yellow
       Start-Sleep 5
-      }
+      } else {
-      else{
       Write-Host \"Something went Wrong during the Unistallation of OneDrive\" -ForegroundColor Red
       }
       "
@@ -2939,8 +2937,7 @@
       try {
           Invoke-WebRequest -Uri $remoteHostsUrl -OutFile $tempHostsPath
           Write-Output \"Downloaded the remote HOSTS file to a temporary location.\"
-      }
+      } catch {
-      catch {
           Write-Error \"Failed to download the HOSTS file. Error: $_\"
       }
 
@@ -2966,8 +2963,7 @@
               $combinedContent | Set-Content $localHostsPath -Encoding ASCII
               Write-Output \"Successfully added the AdobeNetBlock.\"
           }
-      }
+      } catch {
-      catch {
           Write-Error \"Error during processing: $_\"
       }
 
@@ -2978,8 +2974,7 @@
       try {
           Invoke-Expression \"ipconfig /flushdns\"
           Write-Output \"DNS cache flushed successfully.\"
-      }
+      } catch {
-      catch {
           Write-Error \"Failed to flush DNS cache. Error: $_\"
       }
       "
@@ -2992,8 +2987,7 @@
       # Load the content of the HOSTS file
       try {
           $hostsContent = Get-Content $localHostsPath -ErrorAction Stop
-      }
+      } catch {
-      catch {
           Write-Error \"Failed to load the HOSTS file. Error: $_\"
           return
       }
@@ -3019,8 +3013,7 @@
       try {
           $newContent | Set-Content $localHostsPath -Encoding ASCII
           Write-Output \"Successfully removed the AdobeNetBlock section from the HOSTS file.\"
-      }
+      } catch {
-      catch {
           Write-Error \"Failed to write back to the HOSTS file. Error: $_\"
       }
 
@@ -3028,8 +3021,7 @@
       try {
           Invoke-Expression \"ipconfig /flushdns\"
           Write-Output \"DNS cache flushed successfully.\"
-      }
+      } catch {
-      catch {
           Write-Error \"Failed to flush DNS cache. Error: $_\"
       }
       "

functions/private/ConvertTo-Icon.ps1

@@ -57,9 +57,9 @@ function ConvertTo-Icon {
 
     #>
     param(
-        [Parameter(Mandatory=$true, position=0)]
+        [Parameter(Mandatory, position=0)]
         [string]$bitmapPath,
-        [Parameter(Mandatory=$true, position=1)]
+        [Parameter(Mandatory, position=1)]
         [string]$iconPath,
         [Parameter(position=2)]
         [bool]$overrideIconFile = $true
@@ -86,8 +86,7 @@ function ConvertTo-Icon {
         $icon.Save($file)
         $file.Close()
         $icon.Dispose()
-    }
+    } else {
-    else {
         throw [System.IO.FileNotFoundException] "[ConvertTo-Icon] The provided bitmap File Path is not found at '$bitmapPath'."
     }
 }

functions/private/Copy-Files.ps1

@@ -10,38 +10,33 @@ function Copy-Files {
 
     #>
     param (
-        [string] $Path,
+        [string]$Path,
-        [string] $Destination,
+        [string]$Destination,
-        [switch] $Recurse = $false,
+        [switch]$Recurse = $false,
-        [switch] $Force = $false
+        [switch]$Force = $false
     )
 
     try {
 
- 	$files = Get-ChildItem -Path $path -Recurse:$recurse
+        $files = Get-ChildItem -Path $path -Recurse:$recurse
-	Write-Host "Copy $($files.Count)(s) from $path to $destination"
+        Write-Host "Copy $($files.Count)(s) from $path to $destination"
 
-        foreach($file in $files)
+        foreach ($file in $files) {
-        {
             $status = "Copy files {0} on {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, ''
 
-            if($file.PSIsContainer -eq $true)
+            if ($file.PSIsContainer -eq $true) {
-            {
                 Write-Debug "Creating $($destination + $restpath)"
                 New-Item ($destination+$restpath) -Force:$force -Type Directory -ErrorAction SilentlyContinue
-            }
+            } else {
-            else
-            {
                 Write-Debug "Copy from $($file.FullName) to $($destination+$restpath)"
                 Copy-Item $file.FullName ($destination+$restpath) -ErrorAction SilentlyContinue -Force:$force
                 Set-ItemProperty -Path ($destination+$restpath) -Name IsReadOnly -Value $false
             }
         }
         Write-Progress -Activity "Copy Windows files" -Status "Ready" -Completed
-    }
+    } catch {
-    Catch{
         Write-Warning "Unable to Copy all the files due to unhandled exception"
         Write-Warning $psitem.Exception.StackTrace
     }

functions/private/Get-Oscdimg.ps1

@@ -1,15 +1,17 @@
 function Get-Oscdimg {
     <#
-
         .DESCRIPTION
         This function will download oscdimg file from github Release folders and put it into env:temp folder
 
         .EXAMPLE
         Get-Oscdimg
     #>
-    param( [Parameter(Mandatory=$true)]
+
+    param(
+        [Parameter(Mandatory, position=0)]
         [string]$oscdimgPath
     )
+
     $oscdimgPath = "$env:TEMP\oscdimg.exe"
     $downloadUrl = "https://github.com/ChrisTitusTech/winutil/raw/main/releases/oscdimg.exe"
     Invoke-RestMethod -Uri $downloadUrl -OutFile $oscdimgPath

functions/private/Get-TabXaml.ps1

@@ -1,19 +1,23 @@
 function Get-TabXaml {
     <#
-    .SYNOPSIS
+        .SYNOPSIS
-        Generates XAML for a tab in the WinUtil GUI
+            Generates XAML for a tab in the WinUtil GUI
-        This function is used to generate the XAML for the applications tab in the WinUtil GUI
+            This function is used to generate the XAML for the applications tab in the WinUtil GUI
-        It takes the tabname and the number of columns to display the applications in as input and returns the XAML for the tab as output
+            It takes the tabname and the number of columns to display the applications in as input and returns the XAML for the tab as output
-    .PARAMETER tabname
+
-        The name of the tab to generate XAML for
+        .PARAMETER tabname
-        Note: the 'tabname' parameter must equal one of the json files found in $sync.configs variable
+            The name of the tab to generate XAML for
-              Otherwise, it'll throw an exception
+            Note: the 'tabname' parameter must equal one of the json files found in $sync.configs variable
-    .PARAMETER columncount
+                  Otherwise, it'll throw an exception
-        The number of columns to display the applications in, default is 0
+
-    .OUTPUTS
+        .PARAMETER columncount
-        The XAML for the tab
+            The number of columns to display the applications in, default is 0
-    .EXAMPLE
+
-        Get-TabXaml "applications" 3
+        .OUTPUTS
+            The XAML for the tab
+
+        .EXAMPLE
+            Get-TabXaml "applications" 3
     #>
 
 
@@ -115,7 +119,7 @@ function Get-TabXaml {
             }
 
             # Dot-source the Get-WPFObjectName function
-            . .\functions\private\Get-WPFObjectName
+            . "$($sync.PSScriptRoot)\functions\private\Get-WPFObjectName.ps1"
 
             $categorycontent = $($category -replace '^.__', '')
             $categoryname = Get-WPFObjectName -type "Label" -name $categorycontent
@@ -188,7 +192,7 @@ function Get-TabXaml {
 
                     # else it is a checkbox
                     default {
-                        $checkedStatus = If ($appInfo.Checked -eq $null) {""} Else {" IsChecked=""$($appInfo.Checked)"""}
+                        $checkedStatus = If ($appInfo.Checked -eq $null) {""} else {" IsChecked=""$($appInfo.Checked)"""}
                         if ($appInfo.Link -eq $null) {
                             $blockXml += $precal_indent +
                                             "<CheckBox Name=""$($appInfo.Name)"" Content=""$($appInfo.Content)""$($checkedStatus) Margin=""5,0""" + " " +

functions/private/Get-WPFObjectName.ps1

@@ -1,27 +1,31 @@
 function Get-WPFObjectName {
-        <#
+    <#
-    .SYNOPSIS
+        .SYNOPSIS
-        This is a helper function that generates an objectname with the prefix WPF that can be used as a Powershell Variable after compilation.
+            This is a helper function that generates an objectname with the prefix WPF that can be used as a Powershell Variable after compilation.
-        To achieve this, all characters that are not a-z, A-Z or 0-9 are simply removed from the name.
+            To achieve this, all characters that are not a-z, A-Z or 0-9 are simply removed from the name.
-    .PARAMETER type
-        The type of object for which the name should be generated. (e.g. Label, Button, CheckBox...)
-    .PARAMETER name
-        The name or description to be used for the object. (invalid characters are removed)
-    .OUTPUTS
-        A string that can be used as a object/variable name in powershell.
-        For example: WPFLabelMicrosoftTools
 
-    .EXAMPLE
+        .PARAMETER type
-        Get-WPFObjectName -type Label -name "Microsoft Tools"
+            The type of object for which the name should be generated. (e.g. Label, Button, CheckBox...)
+
+        .PARAMETER name
+            The name or description to be used for the object. (invalid characters are removed)
+
+        .OUTPUTS
+            A string that can be used as a object/variable name in powershell.
+            For example: WPFLabelMicrosoftTools
+
+        .EXAMPLE
+            Get-WPFObjectName -type Label -name "Microsoft Tools"
     #>
 
-    param( [Parameter(Mandatory=$true)]
+    param(
-    $type,
+        [Parameter(Mandatory, position=0)]
-    $name
+        [string]$type,
-)
 
-$Output = $("WPF"+$type+$name) -replace '[^a-zA-Z0-9]', ''
+        [Parameter(position=1)]
-
+        [string]$name
-return $Output
+    )
 
+    $Output = $("WPF"+$type+$name) -replace '[^a-zA-Z0-9]', ''
+    return $Output
 }

functions/private/Get-WinUtilInstallerProcess.ps1

@@ -14,10 +14,10 @@ function Get-WinUtilInstallerProcess {
 
     param($Process)
 
-    if ($Null -eq $Process){
+    if ($Null -eq $Process) {
         return $false
     }
-    if (Get-Process -Id $Process.Id -ErrorAction SilentlyContinue){
+    if (Get-Process -Id $Process.Id -ErrorAction SilentlyContinue) {
         return $true
     }
     return $false

functions/private/Get-WinUtilToggleStatus.ps1

@@ -13,125 +13,112 @@ Function Get-WinUtilToggleStatus {
     #>
 
     Param($ToggleSwitch)
-    if($ToggleSwitch -eq "WPFToggleDarkMode"){
+    if($ToggleSwitch -eq "WPFToggleDarkMode") {
         $app = (Get-ItemProperty -path 'HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize').AppsUseLightTheme
         $system = (Get-ItemProperty -path 'HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize').SystemUsesLightTheme
-        if($app -eq 0 -and $system -eq 0){
+        if($app -eq 0 -and $system -eq 0) {
             return $true
-        }
+        } else {
-        else{
             return $false
         }
     }
-    if($ToggleSwitch -eq "WPFToggleBingSearch"){
+    if($ToggleSwitch -eq "WPFToggleBingSearch") {
         $bingsearch = (Get-ItemProperty -path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Search').BingSearchEnabled
-        if($bingsearch -eq 0){
+        if($bingsearch -eq 0) {
             return $false
-        }
+        } else {
-        else{
             return $true
         }
     }
-    if($ToggleSwitch -eq "WPFToggleNumLock"){
+    if($ToggleSwitch -eq "WPFToggleNumLock") {
         $numlockvalue = (Get-ItemProperty -path 'HKCU:\Control Panel\Keyboard').InitialKeyboardIndicators
-        if($numlockvalue -eq 2){
+        if($numlockvalue -eq 2) {
             return $true
-        }
+        } else {
-        else{
             return $false
         }
     }
-    if($ToggleSwitch -eq "WPFToggleVerboseLogon"){
+    if($ToggleSwitch -eq "WPFToggleVerboseLogon") {
         $VerboseStatusvalue = (Get-ItemProperty -path 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System').VerboseStatus
-        if($VerboseStatusvalue -eq 1){
+        if($VerboseStatusvalue -eq 1) {
             return $true
-        }
+        } else {
-        else{
             return $false
         }
     }
-    if($ToggleSwitch -eq "WPFToggleShowExt"){
+    if($ToggleSwitch -eq "WPFToggleShowExt") {
         $hideextvalue = (Get-ItemProperty -path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced').HideFileExt
-        if($hideextvalue -eq 0){
+        if($hideextvalue -eq 0) {
             return $true
-        }
+        } else {
-        else{
             return $false
         }
     }
-    if($ToggleSwitch -eq "WPFToggleSnapWindow"){
+    if($ToggleSwitch -eq "WPFToggleSnapWindow") {
         $hidesnap = (Get-ItemProperty -path 'HKCU:\Control Panel\Desktop').WindowArrangementActive
-        if($hidesnap -eq 0){
+        if($hidesnap -eq 0) {
             return $false
-        }
+        } else {
-        else{
             return $true
         }
     }
-    if($ToggleSwitch -eq "WPFToggleSnapFlyout"){
+    if($ToggleSwitch -eq "WPFToggleSnapFlyout") {
         $hidesnap = (Get-ItemProperty -path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced').EnableSnapAssistFlyout
-        if($hidesnap -eq 0){
+        if($hidesnap -eq 0) {
             return $false
-        }
+        } else {
-        else{
             return $true
         }
     }
-    if($ToggleSwitch -eq "WPFToggleSnapSuggestion"){
+    if($ToggleSwitch -eq "WPFToggleSnapSuggestion") {
         $hidesnap = (Get-ItemProperty -path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced').SnapAssist
-        if($hidesnap -eq 0){
+        if($hidesnap -eq 0) {
             return $false
-        }
+        } else {
-        else{
             return $true
         }
     }
-    if($ToggleSwitch -eq "WPFToggleMouseAcceleration"){
+    if($ToggleSwitch -eq "WPFToggleMouseAcceleration") {
         $MouseSpeed = (Get-ItemProperty -path 'HKCU:\Control Panel\Mouse').MouseSpeed
         $MouseThreshold1 = (Get-ItemProperty -path 'HKCU:\Control Panel\Mouse').MouseThreshold1
         $MouseThreshold2 = (Get-ItemProperty -path 'HKCU:\Control Panel\Mouse').MouseThreshold2
 
-        if($MouseSpeed -eq 1 -and $MouseThreshold1 -eq 6 -and $MouseThreshold2 -eq 10){
+        if($MouseSpeed -eq 1 -and $MouseThreshold1 -eq 6 -and $MouseThreshold2 -eq 10) {
             return $true
-        }
+        } else {
-        else{
             return $false
         }
     }
-    if($ToggleSwitch -eq "WPFToggleTaskbarSearch"){
+    if($ToggleSwitch -eq "WPFToggleTaskbarSearch") {
         $SearchButton = (Get-ItemProperty -path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Search").SearchboxTaskbarMode
-        if($SearchButton -eq 0){
+        if($SearchButton -eq 0) {
             return $false
-        }
+        } else {
-        else{
             return $true
         }
     }
     if ($ToggleSwitch -eq "WPFToggleStickyKeys") {
         $StickyKeys = (Get-ItemProperty -path 'HKCU:\Control Panel\Accessibility\StickyKeys').Flags
-        if($StickyKeys -eq 58){
+        if($StickyKeys -eq 58) {
             return $false
-        }
+        } else {
-        else{
             return $true
         }
     }
     if ($ToggleSwitch -eq "WPFToggleTaskView") {
         $TaskView = (Get-ItemProperty -path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced').ShowTaskViewButton
-        if($TaskView -eq 0){
+        if($TaskView -eq 0) {
             return $false
-        }
+        } else {
-        else{
             return $true
         }
     }
 
     if ($ToggleSwitch -eq "WPFToggleHiddenFiles") {
         $HiddenFiles = (Get-ItemProperty -path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced').Hidden
-        if($HiddenFiles -eq 0){
+        if($HiddenFiles -eq 0) {
             return $false
-        }
+        } else {
-        else{
             return $true
         }
     }
@@ -140,8 +127,7 @@ Function Get-WinUtilToggleStatus {
         $TaskbarWidgets = (Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced").TaskBarDa
         if($TaskbarWidgets -eq 0) {
             return $false
-        }
+        } else {
-        else{
             return $true
         }
     }
@@ -149,8 +135,7 @@ Function Get-WinUtilToggleStatus {
         $TaskbarAlignment = (Get-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced").TaskbarAl
         if($TaskbarAlignment -eq 0) {
             return $false
-        }
+        } else {
-        else{
             return $true
         }
     }
@@ -158,8 +143,7 @@ Function Get-WinUtilToggleStatus {
         $DetailedBSoD = (Get-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\CrashControl').DisplayParameters
         if($DetailedBSoD -eq 0) {
             return $false
-        }
+        } else {
-        else{
             return $true
         }
     }

functions/private/Get-WinUtilVariables.ps1

@@ -14,13 +14,12 @@ function Get-WinUtilVariables {
     $keys = ($sync.keys).where{ $_ -like "WPF*" }
     if ($Type) {
         $output = $keys | ForEach-Object {
-            Try {
+            try {
                 $objType = $sync["$psitem"].GetType().Name
                 if ($Type -contains $objType) {
                     Write-Output $psitem
                 }
-            }
+            } catch {
-            Catch {
                 <#I am here so errors don't get outputted for a couple variables that don't have the .GetType() attribute#>
             }
         }

functions/private/Get-WinUtilWingetLatest.ps1

@@ -8,7 +8,7 @@ function Get-WinUtilWingetLatest {
     # Invoke-WebRequest is notoriously slow when the byte progress is displayed. The following lines disable the progress bar and reset them at the end of the function
     $PreviousProgressPreference = $ProgressPreference
     $ProgressPreference = "silentlyContinue"
-    Try{
+    try {
         # Grabs the latest release of Winget from the Github API for the install process.
         $response = Invoke-RestMethod -Uri "https://api.github.com/repos/microsoft/Winget-cli/releases/latest" -Method Get -ErrorAction Stop
         $latestVersion = $response.tag_name #Stores version number of latest release.
@@ -19,8 +19,7 @@ function Get-WinUtilWingetLatest {
         Invoke-WebRequest -Uri $licenseWingetUrl -OutFile $ENV:TEMP\License1.xml
         # The only pain is that the msixbundle for winget-cli is 246MB. In some situations this can take a bit, with slower connections.
         Invoke-WebRequest -Uri $assetUrl -OutFile $ENV:TEMP\Microsoft.DesktopAppInstaller.msixbundle
-    }
+    } catch {
-    Catch{
         throw [WingetFailedInstall]::new('Failed to get latest Winget release and license')
     }
     $ProgressPreference = $PreviousProgressPreference

functions/private/Get-WinUtilWingetPrerequisites.ps1

@@ -17,13 +17,12 @@ function Get-WinUtilWingetPrerequisites {
     $fileUIXaml = "https://github.com/microsoft/microsoft-ui-xaml/releases/download/v${versionUIXamlPatch}/Microsoft.UI.Xaml.${versionUIXamlMinor}.x64.appx"
     # Write-Host "$fileUIXaml"
 
-    Try{
+    try {
         Write-Host "Downloading Microsoft.VCLibs Dependency..."
         Invoke-WebRequest -Uri $fileVCLibs -OutFile $ENV:TEMP\Microsoft.VCLibs.x64.Desktop.appx
         Write-Host "Downloading Microsoft.UI.Xaml Dependency...`n"
         Invoke-WebRequest -Uri $fileUIXaml -OutFile $ENV:TEMP\Microsoft.UI.Xaml.x64.appx
-    }
+    } catch {
-    Catch{
         throw [WingetFailedInstall]::new('Failed to install prerequsites')
     }
 }

functions/private/Install-WinUtilChoco.ps1

@@ -18,8 +18,7 @@ function Install-WinUtilChoco {
         Set-ExecutionPolicy Bypass -Scope Process -Force; Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) -ErrorAction Stop
         powershell choco feature enable -n allowGlobalConfirmation
 
-    }
+    } catch {
-    Catch {
         Write-Host "===========================================" -Foregroundcolor Red
         Write-Host "--     Chocolatey failed to install     ---" -Foregroundcolor Red
         Write-Host "===========================================" -Foregroundcolor Red

functions/private/Install-WinUtilProgramChoco.ps1

@@ -33,26 +33,26 @@ function Install-WinUtilProgramChoco {
     Write-Host "==========================================="
     Write-Host "--   Configuring Chocolatey pacakages   ---"
     Write-Host "==========================================="
-    Foreach ($Program in $ProgramsToInstall){
+    Foreach ($Program in $ProgramsToInstall) {
         Write-Progress -Activity "$manage Applications" -Status "$manage $($Program.choco) $($x + 1) of $count" -PercentComplete $($x/$count*100)
-        if($manage -eq "Installing"){
+        if($manage -eq "Installing") {
             write-host "Starting install of $($Program.choco) with Chocolatey."
-            try{
+            try {
                 $tryUpgrade = $false
-		$installOutputFilePath = "$env:TEMP\Install-WinUtilProgramChoco.install-command.output.txt"
+        $installOutputFilePath = "$env:TEMP\Install-WinUtilProgramChoco.install-command.output.txt"
         New-Item -ItemType File -Path $installOutputFilePath
-		$chocoInstallStatus = $(Start-Process -FilePath "choco" -ArgumentList "install $($Program.choco) -y" -Wait -PassThru -RedirectStandardOutput $installOutputFilePath).ExitCode
+        $chocoInstallStatus = $(Start-Process -FilePath "choco" -ArgumentList "install $($Program.choco) -y" -Wait -PassThru -RedirectStandardOutput $installOutputFilePath).ExitCode
             if(($chocoInstallStatus -eq 0) -AND (Test-Path -Path $installOutputFilePath)) {
                 $keywordsFound = Get-Content -Path $installOutputFilePath | Where-Object {$_ -match "reinstall" -OR $_ -match "already installed"}
-		        if ($keywordsFound) {
+                if ($keywordsFound) {
-		            $tryUpgrade = $true
+                    $tryUpgrade = $true
-		        }
+                }
             }
-		# TODO: Implement the Upgrade part using 'choco upgrade' command, this will make choco consistent with WinGet, as WinGet tries to Upgrade when you use the install command.
+        # TODO: Implement the Upgrade part using 'choco upgrade' command, this will make choco consistent with WinGet, as WinGet tries to Upgrade when you use the install command.
-		if ($tryUpgrade) {
+        if ($tryUpgrade) {
-		    throw "Automatic Upgrade for Choco isn't implemented yet, a feature to make it consistent with WinGet, the install command using choco simply failed because $($Program.choco) is already installed."
+            throw "Automatic Upgrade for Choco isn't implemented yet, a feature to make it consistent with WinGet, the install command using choco simply failed because $($Program.choco) is already installed."
-		}
+        }
-		if(($chocoInstallStatus -eq 0) -AND ($tryUpgrade -eq $false)){
+        if(($chocoInstallStatus -eq 0) -AND ($tryUpgrade -eq $false)) {
                     Write-Host "$($Program.choco) installed successfully using Chocolatey."
                     $X++
                     $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Normal" -value ($x/$count) })
@@ -69,13 +69,13 @@ function Install-WinUtilProgramChoco {
             }
         }
 
-	if($manage -eq "Uninstalling"){
+    if($manage -eq "Uninstalling") {
             write-host "Starting uninstall of $($Program.choco) with Chocolatey."
-            try{
+            try {
-		$uninstallOutputFilePath = "$env:TEMP\Install-WinUtilProgramChoco.uninstall-command.output.txt"
+        $uninstallOutputFilePath = "$env:TEMP\Install-WinUtilProgramChoco.uninstall-command.output.txt"
         New-Item -ItemType File -Path $uninstallOutputFilePath
-		$chocoUninstallStatus = $(Start-Process -FilePath "choco" -ArgumentList "uninstall $($Program.choco) -y" -Wait -PassThru).ExitCode
+        $chocoUninstallStatus = $(Start-Process -FilePath "choco" -ArgumentList "uninstall $($Program.choco) -y" -Wait -PassThru).ExitCode
-		if($chocoUninstallStatus -eq 0){
+        if($chocoUninstallStatus -eq 0) {
                     Write-Host "$($Program.choco) uninstalled successfully using Chocolatey."
                     $x++
                     $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Normal" -value ($x/$count) })
@@ -90,13 +90,13 @@ function Install-WinUtilProgramChoco {
                 $x++
                 $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Error" -value ($x/$count) })
             }
-	}
+    }
     }
     Write-Progress -Activity "$manage Applications" -Status "Finished" -Completed
 
     # Cleanup leftovers files
-    if(Test-Path -Path $installOutputFilePath){ Remove-Item -Path $installOutputFilePath }
+    if(Test-Path -Path $installOutputFilePath) { Remove-Item -Path $installOutputFilePath }
-    if(Test-Path -Path $uninstallOutputFilePath){ Remove-Item -Path $uninstallOutputFilePath }
+    if(Test-Path -Path $uninstallOutputFilePath) { Remove-Item -Path $uninstallOutputFilePath }
 
     return;
 }

functions/private/Install-WinUtilWinget.ps1

@@ -9,7 +9,7 @@ function Install-WinUtilWinget {
     #>
     $isWingetInstalled = Test-WinUtilPackageManager -winget
 
-    Try {
+    try {
         if ($isWingetInstalled -eq "installed") {
             Write-Host "`nWinget is already installed.`r" -ForegroundColor Green
             return
@@ -21,7 +21,7 @@ function Install-WinUtilWinget {
 
 
         # Gets the computer's information
-        if ($null -eq $sync.ComputerInfo){
+        if ($null -eq $sync.ComputerInfo) {
             $ComputerInfo = Get-ComputerInfo -ErrorAction Stop
         } else {
             $ComputerInfo = $sync.ComputerInfo
@@ -41,8 +41,8 @@ function Install-WinUtilWinget {
         Get-WinUtilWingetLatest
         Write-Host "Installing Winget w/ Prerequsites`r"
         Add-AppxProvisionedPackage -Online -PackagePath $ENV:TEMP\Microsoft.DesktopAppInstaller.msixbundle -DependencyPackagePath $ENV:TEMP\Microsoft.VCLibs.x64.Desktop.appx, $ENV:TEMP\Microsoft.UI.Xaml.x64.appx -LicensePath $ENV:TEMP\License1.xml
-		Write-Host "Manually adding Winget Sources, from Winget CDN."
+        Write-Host "Manually adding Winget Sources, from Winget CDN."
-		Add-AppxPackage -Path https://cdn.winget.microsoft.com/cache/source.msix #Seems some installs of Winget don't add the repo source, this should makes sure that it's installed every time.
+        Add-AppxPackage -Path https://cdn.winget.microsoft.com/cache/source.msix #Seems some installs of Winget don't add the repo source, this should makes sure that it's installed every time.
         Write-Host "Winget Installed" -ForegroundColor Green
         Write-Host "Enabling NuGet and Module..."
         Install-PackageProvider -Name NuGet -Force
@@ -50,17 +50,17 @@ function Install-WinUtilWinget {
         # Winget only needs a refresh of the environment variables to be used.
         Write-Output "Refreshing Environment Variables...`n"
         $ENV:PATH = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
-    } Catch {
+    } catch {
         Write-Host "Failure detected while installing via GitHub method. Continuing with Chocolatey method as fallback." -ForegroundColor Red
         # In case install fails via GitHub method.
-        Try {
+        try {
         # Install Choco if not already present
         Install-WinUtilChoco
         Start-Process -Verb runas -FilePath powershell.exe -ArgumentList "choco install winget-cli"
         Write-Host "Winget Installed" -ForegroundColor Green
         Write-Output "Refreshing Environment Variables...`n"
         $ENV:PATH = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
-        } Catch {
+        } catch {
             throw [WingetFailedInstall]::new('Failed to install!')
         }
     }

functions/private/Invoke-WinUtilBingSearch.ps1

@@ -9,25 +9,21 @@ function Invoke-WinUtilBingSearch {
 
     #>
     Param($Enabled)
-    Try{
+    try {
-        if ($Enabled -eq $false){
+        if ($Enabled -eq $false) {
             Write-Host "Enabling Bing Search"
             $value = 1
-        }
+        } else {
-        else {
             Write-Host "Disabling Bing Search"
             $value = 0
         }
         $Path = "HKCU:\Software\Microsoft\Windows\CurrentVersion\Search"
         Set-ItemProperty -Path $Path -Name BingSearchEnabled -Value $value
-    }
+    } catch [System.Security.SecurityException] {
-    Catch [System.Security.SecurityException] {
         Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
-    }
+    } catch [System.Management.Automation.ItemNotFoundException] {
-    Catch [System.Management.Automation.ItemNotFoundException] {
         Write-Warning $psitem.Exception.ErrorRecord
-    }
+    } catch {
-    Catch{
         Write-Warning "Unable to set $Name due to unhandled exception"
         Write-Warning $psitem.Exception.StackTrace
     }

functions/private/Invoke-WinUtilCurrentSystem.ps1

@@ -14,7 +14,7 @@ Function Invoke-WinUtilCurrentSystem {
         $CheckBox
     )
 
-    if ($checkbox -eq "winget"){
+    if ($checkbox -eq "winget") {
 
         $originalEncoding = [Console]::OutputEncoding
         [Console]::OutputEncoding = [System.Text.UTF8Encoding]::new()
@@ -31,9 +31,9 @@ Function Invoke-WinUtilCurrentSystem {
         }
     }
 
-    if($CheckBox -eq "tweaks"){
+    if($CheckBox -eq "tweaks") {
 
-        if(!(Test-Path 'HKU:\')){New-PSDrive -PSProvider Registry -Name HKU -Root HKEY_USERS}
+        if(!(Test-Path 'HKU:\')) {New-PSDrive -PSProvider Registry -Name HKU -Root HKEY_USERS}
         $ScheduledTasks = Get-ScheduledTask
 
         $sync.configs.tweaks | Get-Member -MemberType NoteProperty | ForEach-Object {
@@ -44,59 +44,57 @@ Function Invoke-WinUtilCurrentSystem {
             $scheduledtaskKeys = $sync.configs.tweaks.$Config.scheduledtask
             $serviceKeys = $sync.configs.tweaks.$Config.service
 
-            if($registryKeys -or $scheduledtaskKeys -or $serviceKeys){
+            if($registryKeys -or $scheduledtaskKeys -or $serviceKeys) {
                 $Values = @()
 
 
-                Foreach ($tweaks in $registryKeys){
+                Foreach ($tweaks in $registryKeys) {
-                    Foreach($tweak in $tweaks){
+                    Foreach($tweak in $tweaks) {
 
-                        if(test-path $tweak.Path){
+                        if(test-path $tweak.Path) {
                             $actualValue = Get-ItemProperty -Name $tweak.Name -Path $tweak.Path -ErrorAction SilentlyContinue | Select-Object -ExpandProperty $($tweak.Name)
                             $expectedValue = $tweak.Value
-                            if ($expectedValue -notlike $actualValue){
+                            if ($expectedValue -notlike $actualValue) {
                                 $values += $False
                             }
-                        }
+                        } else {
-                        else {
                             $values += $False
                         }
                     }
                 }
 
-                Foreach ($tweaks in $scheduledtaskKeys){
+                Foreach ($tweaks in $scheduledtaskKeys) {
-                    Foreach($tweak in $tweaks){
+                    Foreach($tweak in $tweaks) {
                         $task = $ScheduledTasks | Where-Object {$($psitem.TaskPath + $psitem.TaskName) -like "\$($tweak.name)"}
 
-                        if($task){
+                        if($task) {
                             $actualValue = $task.State
                             $expectedValue = $tweak.State
-                            if ($expectedValue -ne $actualValue){
+                            if ($expectedValue -ne $actualValue) {
                                 $values += $False
                             }
                         }
                     }
                 }
 
-                Foreach ($tweaks in $serviceKeys){
+                Foreach ($tweaks in $serviceKeys) {
-                    Foreach($tweak in $tweaks){
+                    Foreach($tweak in $tweaks) {
                         $Service = Get-Service -Name $tweak.Name
 
-                        if($Service){
+                        if($Service) {
                             $actualValue = $Service.StartType
                             $expectedValue = $tweak.StartupType
-                            if ($expectedValue -ne $actualValue){
+                            if ($expectedValue -ne $actualValue) {
                                 $values += $False
                             }
                         }
                     }
                 }
 
-                if($values -notcontains $false){
+                if($values -notcontains $false) {
                     Write-Output $Config
                 }
             }
         }
     }
 }
-

functions/private/Invoke-WinUtilDarkMode.ps1

@@ -9,12 +9,11 @@ Function Invoke-WinUtilDarkMode {
 
     #>
     Param($DarkMoveEnabled)
-    Try{
+    try {
-        if ($DarkMoveEnabled -eq $false){
+        if ($DarkMoveEnabled -eq $false) {
             Write-Host "Enabling Dark Mode"
             $DarkMoveValue = 0
-        }
+        } else {
-        else {
             Write-Host "Disabling Dark Mode"
             $DarkMoveValue = 1
         }
@@ -22,14 +21,11 @@ Function Invoke-WinUtilDarkMode {
         $Path = "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize"
         Set-ItemProperty -Path $Path -Name AppsUseLightTheme -Value $DarkMoveValue
         Set-ItemProperty -Path $Path -Name SystemUsesLightTheme -Value $DarkMoveValue
-    }
+    } catch [System.Security.SecurityException] {
-    Catch [System.Security.SecurityException] {
         Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
-    }
+    } catch [System.Management.Automation.ItemNotFoundException] {
-    Catch [System.Management.Automation.ItemNotFoundException] {
         Write-Warning $psitem.Exception.ErrorRecord
-    }
+    } catch {
-    Catch{
         Write-Warning "Unable to set $Name due to unhandled exception"
         Write-Warning $psitem.Exception.StackTrace
     }

functions/private/Invoke-WinUtilDetailedBSoD.ps1

@@ -8,26 +8,22 @@ Function Invoke-WinUtilDetailedBSoD {
 
     #>
     Param($Enabled)
-    Try{
+    try {
-        if ($Enabled -eq $false){
+        if ($Enabled -eq $false) {
             Write-Host "Enabling Detailed BSoD"
             $value = 1
-        }
+        } else {
-        else {
             Write-Host "Disabling Detailed BSoD"
             $value =0
         }
 
         $Path = "HKLM:\SYSTEM\CurrentControlSet\Control\CrashControl"
         Set-ItemProperty -Path $Path -Name DisplayParameters -Value $value
-    }
+    } catch [System.Security.SecurityException] {
-    Catch [System.Security.SecurityException] {
         Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
-    }
+    } catch [System.Management.Automation.ItemNotFoundException] {
-    Catch [System.Management.Automation.ItemNotFoundException] {
         Write-Warning $psitem.Exception.ErrorRecord
-    }
+    } catch {
-    Catch{
         Write-Warning "Unable to set $Name due to unhandled exception"
         Write-Warning $psitem.Exception.StackTrace
     }

functions/private/Invoke-WinUtilFeatureInstall.ps1

@@ -13,19 +13,16 @@ function Invoke-WinUtilFeatureInstall {
     $x = 0
 
     $CheckBox | ForEach-Object {
-        if($sync.configs.feature.$psitem.feature){
+        if($sync.configs.feature.$psitem.feature) {
-            Foreach( $feature in $sync.configs.feature.$psitem.feature ){
+            Foreach( $feature in $sync.configs.feature.$psitem.feature ) {
-                Try{
+                try {
                     Write-Host "Installing $feature"
                     Enable-WindowsOptionalFeature -Online -FeatureName $feature -All -NoRestart
-                }
+                } catch {
-                Catch{
+                    if ($psitem.Exception.Message -like "*requires elevation*") {
-                    if ($psitem.Exception.Message -like "*requires elevation*"){
                         Write-Warning "Unable to Install $feature due to permissions. Are you running as admin?"
                         $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Error" })
-                    }
+                    } else {
-
-                    else{
 
                         Write-Warning "Unable to Install $feature due to unhandled exception"
                         Write-Warning $psitem.Exception.StackTrace
@@ -33,21 +30,18 @@ function Invoke-WinUtilFeatureInstall {
                 }
             }
         }
-        if($sync.configs.feature.$psitem.InvokeScript){
+        if($sync.configs.feature.$psitem.InvokeScript) {
-            Foreach( $script in $sync.configs.feature.$psitem.InvokeScript ){
+            Foreach( $script in $sync.configs.feature.$psitem.InvokeScript ) {
-                Try{
+                try {
                     $Scriptblock = [scriptblock]::Create($script)
 
                     Write-Host "Running Script for $psitem"
                     Invoke-Command $scriptblock -ErrorAction stop
-                }
+                } catch {
-                Catch{
+                    if ($psitem.Exception.Message -like "*requires elevation*") {
-                    if ($psitem.Exception.Message -like "*requires elevation*"){
                         Write-Warning "Unable to Install $feature due to permissions. Are you running as admin?"
                         $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Error" })
-                    }
+                    } else {
-
-                    else{
                         $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Error" })
                         Write-Warning "Unable to Install $feature due to unhandled exception"
                         Write-Warning $psitem.Exception.StackTrace

functions/private/Invoke-WinUtilGPU.ps1

@@ -11,7 +11,7 @@ function Invoke-WinUtilGPU {
     )
 
     foreach ($gpu in $gpuInfo) {
-        foreach ($gpuPattern in $lowPowerGPUs){
+        foreach ($gpuPattern in $lowPowerGPUs) {
             if ($gpu.Name -like $gpuPattern) {
                 return $false
             }

functions/private/Invoke-WinUtilHiddenFiles.ps1

@@ -9,25 +9,21 @@ function Invoke-WinUtilHiddenFiles {
 
     #>
     Param($Enabled)
-    Try{
+    try {
-        if ($Enabled -eq $false){
+        if ($Enabled -eq $false) {
             Write-Host "Enabling Hidden Files"
             $value = 1
-        }
+        } else {
-        else {
             Write-Host "Disabling Hidden Files"
             $value = 0
         }
         $Path = "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced"
         Set-ItemProperty -Path $Path -Name Hidden -Value $value
-    }
+    } catch [System.Security.SecurityException] {
-    Catch [System.Security.SecurityException] {
         Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
-    }
+    } catch [System.Management.Automation.ItemNotFoundException] {
-    Catch [System.Management.Automation.ItemNotFoundException] {
         Write-Warning $psitem.Exception.ErrorRecord
-    }
+    } catch {
-    Catch{
         Write-Warning "Unable to set $Name due to unhandled exception"
         Write-Warning $psitem.Exception.StackTrace
     }

functions/private/Invoke-WinUtilMouseAcceleration.ps1

@@ -9,14 +9,13 @@ Function Invoke-WinUtilMouseAcceleration {
 
     #>
     Param($MouseAccelerationEnabled)
-    Try{
+    try {
-        if ($MouseAccelerationEnabled -eq $false){
+        if ($MouseAccelerationEnabled -eq $false) {
             Write-Host "Enabling Mouse Acceleration"
             $MouseSpeed = 1
             $MouseThreshold1 = 6
             $MouseThreshold2 = 10
-        }
+        } else {
-        else {
             Write-Host "Disabling Mouse Acceleration"
             $MouseSpeed = 0
             $MouseThreshold1 = 0
@@ -28,14 +27,11 @@ Function Invoke-WinUtilMouseAcceleration {
         Set-ItemProperty -Path $Path -Name MouseSpeed -Value $MouseSpeed
         Set-ItemProperty -Path $Path -Name MouseThreshold1 -Value $MouseThreshold1
         Set-ItemProperty -Path $Path -Name MouseThreshold2 -Value $MouseThreshold2
-    }
+    } catch [System.Security.SecurityException] {
-    Catch [System.Security.SecurityException] {
         Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
-    }
+    } catch [System.Management.Automation.ItemNotFoundException] {
-    Catch [System.Management.Automation.ItemNotFoundException] {
         Write-Warning $psitem.Exception.ErrorRecord
-    }
+    } catch {
-    Catch{
         Write-Warning "Unable to set $Name due to unhandled exception"
         Write-Warning $psitem.Exception.StackTrace
     }

functions/private/Invoke-WinUtilNumLock.ps1

@@ -6,12 +6,11 @@ function Invoke-WinUtilNumLock {
         Indicates whether to enable or disable Numlock on startup
     #>
     Param($Enabled)
-    Try{
+    try {
-        if ($Enabled -eq $false){
+        if ($Enabled -eq $false) {
             Write-Host "Enabling Numlock on startup"
             $value = 2
-        }
+        } else {
-        else {
             Write-Host "Disabling Numlock on startup"
             $value = 0
         }
@@ -23,11 +22,9 @@ function Invoke-WinUtilNumLock {
     }
     Catch [System.Security.SecurityException] {
         Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
-    }
+    } catch [System.Management.Automation.ItemNotFoundException] {
-    Catch [System.Management.Automation.ItemNotFoundException] {
         Write-Warning $psitem.Exception.ErrorRecord
-    }
+    } catch {
-    Catch{
         Write-Warning "Unable to set $Name due to unhandled exception"
         Write-Warning $psitem.Exception.StackTrace
     }

functions/private/Invoke-WinUtilScript.ps1

@@ -20,27 +20,22 @@ function Invoke-WinUtilScript {
         [scriptblock]$scriptblock
     )
 
-    Try {
+    try {
         Write-Host "Running Script for $name"
         Invoke-Command $scriptblock -ErrorAction Stop
-    }
+    } catch [System.Management.Automation.CommandNotFoundException] {
-    Catch [System.Management.Automation.CommandNotFoundException] {
         Write-Warning "The specified command was not found."
         Write-Warning $PSItem.Exception.message
-    }
+    } catch [System.Management.Automation.RuntimeException] {
-    Catch [System.Management.Automation.RuntimeException] {
         Write-Warning "A runtime exception occurred."
         Write-Warning $PSItem.Exception.message
-    }
+    } catch [System.Security.SecurityException] {
-    Catch [System.Security.SecurityException] {
         Write-Warning "A security exception occurred."
         Write-Warning $PSItem.Exception.message
-    }
+    } catch [System.UnauthorizedAccessException] {
-    Catch [System.UnauthorizedAccessException] {
         Write-Warning "Access denied. You do not have permission to perform this operation."
         Write-Warning $PSItem.Exception.message
-    }
+    } catch {
-    Catch {
         # Generic catch block to handle any other type of exception
         Write-Warning "Unable to run script for $name due to unhandled exception"
         Write-Warning $psitem.Exception.StackTrace

functions/private/Invoke-WinUtilShowExt.ps1

@@ -6,25 +6,21 @@ function Invoke-WinUtilShowExt {
         Indicates whether to enable or disable Show file extentions
     #>
     Param($Enabled)
-    Try{
+    try {
-        if ($Enabled -eq $false){
+        if ($Enabled -eq $false) {
             Write-Host "Showing file extentions"
             $value = 0
-        }
+        } else {
-        else {
             Write-Host "hiding file extensions"
             $value = 1
         }
         $Path = "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced"
         Set-ItemProperty -Path $Path -Name HideFileExt -Value $value
-    }
+    } catch [System.Security.SecurityException] {
-    Catch [System.Security.SecurityException] {
         Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
-    }
+    } catch [System.Management.Automation.ItemNotFoundException] {
-    Catch [System.Management.Automation.ItemNotFoundException] {
         Write-Warning $psitem.Exception.ErrorRecord
-    }
+    } catch {
-    Catch{
         Write-Warning "Unable to set $Name due to unhandled exception"
         Write-Warning $psitem.Exception.StackTrace
     }

functions/private/Invoke-WinUtilSnapFlyout.ps1

@@ -6,12 +6,11 @@ function Invoke-WinUtilSnapFlyout {
         Indicates whether to enable or disable Snap Assist Flyout on startup
     #>
     Param($Enabled)
-    Try{
+    try {
-        if ($Enabled -eq $false){
+        if ($Enabled -eq $false) {
             Write-Host "Enabling Snap Assist Flyout On startup"
             $value = 1
-        }
+        } else {
-        else {
             Write-Host "Disabling Snap Assist Flyout On startup"
             $value = 0
         }
@@ -20,14 +19,11 @@ function Invoke-WinUtilSnapFlyout {
         taskkill.exe /F /IM "explorer.exe"
         Set-ItemProperty -Path $Path -Name EnableSnapAssistFlyout -Value $value
         Start-Process "explorer.exe"
-    }
+    } catch [System.Security.SecurityException] {
-    Catch [System.Security.SecurityException] {
         Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
-    }
+    } catch [System.Management.Automation.ItemNotFoundException] {
-    Catch [System.Management.Automation.ItemNotFoundException] {
         Write-Warning $psitem.Exception.ErrorRecord
-    }
+    } catch {
-    Catch{
         Write-Warning "Unable to set $Name due to unhandled exception"
         Write-Warning $psitem.Exception.StackTrace
     }

functions/private/Invoke-WinUtilSnapSuggestion.ps1

@@ -6,12 +6,11 @@ function Invoke-WinUtilSnapSuggestion {
         Indicates whether to enable or disable Snap Assist Suggestions on startup
     #>
     Param($Enabled)
-    Try{
+    try {
-        if ($Enabled -eq $false){
+        if ($Enabled -eq $false) {
             Write-Host "Enabling Snap Assist Suggestion On startup"
             $value = 1
-        }
+        } else {
-        else {
             Write-Host "Disabling Snap Assist Suggestion On startup"
             $value = 0
         }
@@ -20,14 +19,11 @@ function Invoke-WinUtilSnapSuggestion {
         taskkill.exe /F /IM "explorer.exe"
         Set-ItemProperty -Path $Path -Name SnapAssist -Value $value
         Start-Process "explorer.exe"
-    }
+    } catch [System.Security.SecurityException] {
-    Catch [System.Security.SecurityException] {
         Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
-    }
+    } catch [System.Management.Automation.ItemNotFoundException] {
-    Catch [System.Management.Automation.ItemNotFoundException] {
         Write-Warning $psitem.Exception.ErrorRecord
-    }
+    } catch {
-    Catch{
         Write-Warning "Unable to set $Name due to unhandled exception"
         Write-Warning $psitem.Exception.StackTrace
     }

functions/private/Invoke-WinUtilSnapWindow.ps1

@@ -6,25 +6,21 @@ function Invoke-WinUtilSnapWindow {
         Indicates whether to enable or disable Snapping Windows on startup
     #>
     Param($Enabled)
-    Try{
+    try {
-        if ($Enabled -eq $false){
+        if ($Enabled -eq $false) {
             Write-Host "Enabling Snap Windows On startup | Relogin Required"
             $value = 1
-        }
+        } else {
-        else {
             Write-Host "Disabling Snap Windows On startup | Relogin Required"
             $value = 0
         }
         $Path = "HKCU:\Control Panel\Desktop"
         Set-ItemProperty -Path $Path -Name WindowArrangementActive -Value $value
-    }
+    } catch [System.Security.SecurityException] {
-    Catch [System.Security.SecurityException] {
         Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
-    }
+    } catch [System.Management.Automation.ItemNotFoundException] {
-    Catch [System.Management.Automation.ItemNotFoundException] {
         Write-Warning $psitem.Exception.ErrorRecord
-    }
+    } catch {
-    Catch{
         Write-Warning "Unable to set $Name due to unhandled exception"
         Write-Warning $psitem.Exception.StackTrace
     }

functions/private/Invoke-WinUtilSponsors.ps1

@@ -37,8 +37,7 @@ Function Invoke-WinUtilSponsors {
 
         # Return the sponsors
         return $sponsors
-    }
+    } catch {
-    catch {
         Write-Error "An error occurred while fetching or processing the sponsors: $_"
         return $null
     }

functions/private/Invoke-WinUtilStickyKeys.ps1

@@ -6,25 +6,21 @@ Function Invoke-WinUtilStickyKeys {
         Indicates whether to enable or disable Sticky Keys on startup
     #>
     Param($Enabled)
-    Try {
+    try {
-        if ($Enabled -eq $false){
+        if ($Enabled -eq $false) {
             Write-Host "Enabling Sticky Keys On startup"
             $value = 510
-        }
+        } else {
-        else {
             Write-Host "Disabling Sticky Keys On startup"
             $value = 58
         }
         $Path = "HKCU:\Control Panel\Accessibility\StickyKeys"
         Set-ItemProperty -Path $Path -Name Flags -Value $value
-    }
+    } catch [System.Security.SecurityException] {
-    Catch [System.Security.SecurityException] {
         Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
-    }
+    } catch [System.Management.Automation.ItemNotFoundException] {
-    Catch [System.Management.Automation.ItemNotFoundException] {
         Write-Warning $psitem.Exception.ErrorRecord
-    }
+    } catch {
-    Catch{
         Write-Warning "Unable to set $Name due to unhandled exception"
         Write-Warning $psitem.Exception.StackTrace
     }

functions/private/Invoke-WinUtilTaskView.ps1

@@ -9,25 +9,21 @@ function Invoke-WinUtilTaskView {
 
     #>
     Param($Enabled)
-    Try{
+    try {
-        if ($Enabled -eq $false){
+        if ($Enabled -eq $false) {
             Write-Host "Enabling Task View"
             $value = 1
-        }
+        } else {
-        else {
             Write-Host "Disabling Task View"
             $value = 0
         }
         $Path = "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced"
         Set-ItemProperty -Path $Path -Name ShowTaskViewButton -Value $value
-    }
+    } catch [System.Security.SecurityException] {
-    Catch [System.Security.SecurityException] {
         Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
-    }
+    } catch [System.Management.Automation.ItemNotFoundException] {
-    Catch [System.Management.Automation.ItemNotFoundException] {
         Write-Warning $psitem.Exception.ErrorRecord
-    }
+    } catch {
-    Catch{
         Write-Warning "Unable to set $Name due to unhandled exception"
         Write-Warning $psitem.Exception.StackTrace
     }

functions/private/Invoke-WinUtilTaskbarAlignment.ps1

@@ -9,25 +9,21 @@ function Invoke-WinUtilTaskbarAlignment {
 
     #>
     Param($Enabled)
-    Try{
+    try {
-        if ($Enabled -eq $false){
+        if ($Enabled -eq $false) {
             Write-Host "Making Taskbar Alignment to the Center"
             $value = 1
-        }
+        } else {
-        else {
             Write-Host "Making Taskbar Alignment to the Left"
             $value = 0
         }
         $Path = "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced"
         Set-ItemProperty -Path $Path -Name "TaskbarAl" -Value $value
-    }
+    } catch [System.Security.SecurityException] {
-    Catch [System.Security.SecurityException] {
         Write-Warning "Unable to set $Path\$Name to $value due to a Security Exception"
-    }
+    } catch [System.Management.Automation.ItemNotFoundException] {
-    Catch [System.Management.Automation.ItemNotFoundException] {
         Write-Warning $psitem.Exception.ErrorRecord
-    }
+    } catch {
-    Catch{
         Write-Warning "Unable to set $Name due to unhandled exception"
         Write-Warning $psitem.Exception.StackTrace
     }

functions/private/Invoke-WinUtilTaskbarSearch.ps1

@@ -9,25 +9,21 @@ function Invoke-WinUtilTaskbarSearch {
 
     #>
     Param($Enabled)
-    Try{
+    try {
-        if ($Enabled -eq $false){
+        if ($Enabled -eq $false) {
             Write-Host "Enabling Search Button"
             $value = 1
-        }
+        } else {
-        else {
             Write-Host "Disabling Search Button"
             $value = 0
         }
         $Path = "HKCU:\Software\Microsoft\Windows\CurrentVersion\Search\"
         Set-ItemProperty -Path $Path -Name SearchboxTaskbarMode -Value $value
-    }
+    } catch [System.Security.SecurityException] {
-    Catch [System.Security.SecurityException] {
         Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
-    }
+    } catch [System.Management.Automation.ItemNotFoundException] {
-    Catch [System.Management.Automation.ItemNotFoundException] {
         Write-Warning $psitem.Exception.ErrorRecord
-    }
+    } catch {
-    Catch{
         Write-Warning "Unable to set $Name due to unhandled exception"
         Write-Warning $psitem.Exception.StackTrace
     }

functions/private/Invoke-WinUtilTaskbarWidgets.ps1

@@ -9,25 +9,21 @@ function Invoke-WinUtilTaskbarWidgets {
 
     #>
     Param($Enabled)
-    Try{
+    try {
-        if ($Enabled -eq $false){
+        if ($Enabled -eq $false) {
             Write-Host "Enabling Taskbar Widgets"
             $value = 1
-        }
+        } else {
-        else {
             Write-Host "Disabling Taskbar Widgets"
             $value = 0
         }
         $Path = "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced"
         Set-ItemProperty -Path $Path -Name TaskbarDa -Value $value
-    }
+    } catch [System.Security.SecurityException] {
-    Catch [System.Security.SecurityException] {
         Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
-    }
+    } catch [System.Management.Automation.ItemNotFoundException] {
-    Catch [System.Management.Automation.ItemNotFoundException] {
         Write-Warning $psitem.Exception.ErrorRecord
-    }
+    } catch {
-    Catch{
         Write-Warning "Unable to set $Name due to unhandled exception"
         Write-Warning $psitem.Exception.StackTrace
     }

functions/private/Invoke-WinUtilTweaks.ps1

@@ -22,7 +22,7 @@ function Invoke-WinUtilTweaks {
     )
 
     Write-Debug "Tweaks: $($CheckBox)"
-    if($undo){
+    if($undo) {
         $Values = @{
             Registry = "OriginalValue"
             ScheduledTask = "OriginalState"
@@ -30,8 +30,7 @@ function Invoke-WinUtilTweaks {
             ScriptType = "UndoScript"
         }
 
-    }
+    } else {
-    Else{
         $Values = @{
             Registry = "Value"
             ScheduledTask = "State"
@@ -40,18 +39,18 @@ function Invoke-WinUtilTweaks {
             ScriptType = "InvokeScript"
         }
     }
-    if($sync.configs.tweaks.$CheckBox.ScheduledTask){
+    if($sync.configs.tweaks.$CheckBox.ScheduledTask) {
         $sync.configs.tweaks.$CheckBox.ScheduledTask | ForEach-Object {
             Write-Debug "$($psitem.Name) and state is $($psitem.$($values.ScheduledTask))"
             Set-WinUtilScheduledTask -Name $psitem.Name -State $psitem.$($values.ScheduledTask)
         }
     }
-    if($sync.configs.tweaks.$CheckBox.service){
+    if($sync.configs.tweaks.$CheckBox.service) {
         Write-Debug "KeepServiceStartup is $KeepServiceStartup"
         $sync.configs.tweaks.$CheckBox.service | ForEach-Object {
             $changeservice = $true
 
-	    # The check for !($undo) is required, without it the script will throw an error for accessing unavailable memeber, which's the 'OriginalService' Property
+        # The check for !($undo) is required, without it the script will throw an error for accessing unavailable memeber, which's the 'OriginalService' Property
             if($KeepServiceStartup -AND !($undo)) {
                 try {
                     # Check if the service exists
@@ -60,8 +59,7 @@ function Invoke-WinUtilTweaks {
                         Write-Debug "Service $($service.Name) was changed in the past to $($service.StartType.ToString()) from it's original type of $($psitem.$($values.OriginalService)), will not change it to $($psitem.$($values.service))"
                         $changeservice = $false
                     }
-                }
+                } catch [System.ServiceProcess.ServiceNotFoundException] {
-                catch [System.ServiceProcess.ServiceNotFoundException] {
                     Write-Warning "Service $($psitem.Name) was not found"
                 }
             }
@@ -72,13 +70,13 @@ function Invoke-WinUtilTweaks {
             }
         }
     }
-    if($sync.configs.tweaks.$CheckBox.registry){
+    if($sync.configs.tweaks.$CheckBox.registry) {
         $sync.configs.tweaks.$CheckBox.registry | ForEach-Object {
             Write-Debug "$($psitem.Name) and state is $($psitem.$($values.registry))"
             Set-WinUtilRegistry -Name $psitem.Name -Path $psitem.Path -Type $psitem.Type -Value $psitem.$($values.registry)
         }
     }
-    if($sync.configs.tweaks.$CheckBox.$($values.ScriptType)){
+    if($sync.configs.tweaks.$CheckBox.$($values.ScriptType)) {
         $sync.configs.tweaks.$CheckBox.$($values.ScriptType) | ForEach-Object {
             Write-Debug "$($psitem) and state is $($psitem.$($values.ScriptType))"
             $Scriptblock = [scriptblock]::Create($psitem)
@@ -86,8 +84,8 @@ function Invoke-WinUtilTweaks {
         }
     }
 
-    if(!$undo){
+    if(!$undo) {
-        if($sync.configs.tweaks.$CheckBox.appx){
+        if($sync.configs.tweaks.$CheckBox.appx) {
             $sync.configs.tweaks.$CheckBox.appx | ForEach-Object {
                 Write-Debug "UNDO $($psitem.Name)"
                 Remove-WinUtilAPPX -Name $psitem

functions/private/Invoke-WinUtilVerboseLogon.ps1

@@ -6,25 +6,21 @@ function Invoke-WinUtilVerboseLogon {
         Indicates whether to enable or disable VerboseLogon messages
     #>
     Param($Enabled)
-    Try{
+    try {
-        if ($Enabled -eq $false){
+        if ($Enabled -eq $false) {
             Write-Host "Enabling Verbose Logon Messages"
             $value = 1
-        }
+        } else {
-        else {
             Write-Host "Disabling Verbose Logon Messages"
             $value = 0
         }
         $Path = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System"
         Set-ItemProperty -Path $Path -Name VerboseStatus -Value $value
-    }
+    } catch [System.Security.SecurityException] {
-    Catch [System.Security.SecurityException] {
         Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
-    }
+    } catch [System.Management.Automation.ItemNotFoundException] {
-    Catch [System.Management.Automation.ItemNotFoundException] {
         Write-Warning $psitem.Exception.ErrorRecord
-    }
+    } catch {
-    Catch{
         Write-Warning "Unable to set $Name due to unhandled exception"
         Write-Warning $psitem.Exception.StackTrace
     }

functions/private/Invoke-WinUtilWingetProgram.ps1

@@ -15,8 +15,7 @@ Function Invoke-WinUtilWingetProgram {
     #>
 
     param(
-        [Parameter(Mandatory, Position=0)]
+        [Parameter(Mandatory, Position=0)]$Programs,
-        $Programs,
         
         [Parameter(Mandatory, Position=1)]
         [ValidateSet("Install", "Uninstall")]
@@ -47,10 +46,9 @@ Function Invoke-WinUtilWingetProgram {
         )
 
         $commonArguments = "--id $wingetId --silent"
-        $arguments = if ($Action -eq "Install"){
+        $arguments = if ($Action -eq "Install") {
             "install $commonArguments --accept-source-agreements --accept-package-agreements $(if ($scope) {" --scope $scope"})" 
-        }
+        } else {
-        else {
             "uninstall $commonArguments"
         }
 

functions/private/Remove-WinUtilAPPX.ps1

@@ -15,21 +15,18 @@ function Remove-WinUtilAPPX {
         $Name
     )
 
-    Try {
+    try {
         Write-Host "Removing $Name"
         Get-AppxPackage "*$Name*" | Remove-AppxPackage -ErrorAction SilentlyContinue
         Get-AppxProvisionedPackage -Online | Where-Object DisplayName -like "*$Name*" | Remove-AppxProvisionedPackage -Online -ErrorAction SilentlyContinue
-    }
+    } catch [System.Exception] {
-    Catch [System.Exception] {
         if ($psitem.Exception.Message -like "*The requested operation requires elevation*") {
             Write-Warning "Unable to uninstall $name due to a Security Exception"
-        }
+        } else {
-        else {
             Write-Warning "Unable to uninstall $name due to unhandled exception"
             Write-Warning $psitem.Exception.StackTrace
         }
-    }
+    } catch {
-    Catch{
         Write-Warning "Unable to uninstall $name due to unhandled exception"
         Write-Warning $psitem.Exception.StackTrace
     }

functions/private/Set-WinUtilDNS.ps1

@@ -12,23 +12,21 @@ function Set-WinUtilDNS {
 
     #>
     param($DNSProvider)
-    if($DNSProvider -eq "Default"){return}
+    if($DNSProvider -eq "Default") {return}
-    Try{
+    try {
         $Adapters = Get-NetAdapter | Where-Object {$_.Status -eq "Up"}
         Write-Host "Ensuring DNS is set to $DNSProvider on the following interfaces"
         Write-Host $($Adapters | Out-String)
 
-        Foreach ($Adapter in $Adapters){
+        Foreach ($Adapter in $Adapters) {
-            if($DNSProvider -eq "DHCP"){
+            if($DNSProvider -eq "DHCP") {
                 Set-DnsClientServerAddress -InterfaceIndex $Adapter.ifIndex -ResetServerAddresses
-            }
+            } else {
-            Else{
                 Set-DnsClientServerAddress -InterfaceIndex $Adapter.ifIndex -ServerAddresses ("$($sync.configs.dns.$DNSProvider.Primary)", "$($sync.configs.dns.$DNSProvider.Secondary)")
                 Set-DnsClientServerAddress -InterfaceIndex $Adapter.ifIndex -ServerAddresses ("$($sync.configs.dns.$DNSProvider.Primary6)", "$($sync.configs.dns.$DNSProvider.Secondary6)")
             }
         }
-    }
+    } catch {
-    Catch{
         Write-Warning "Unable to set DNS Provider due to an unhandled exception"
         Write-Warning $psitem.Exception.StackTrace
     }

functions/private/Set-WinUtilProgressbar.ps1

@@ -16,11 +16,10 @@ function Set-WinUtilProgressbar{
         [int]$Percent,
         $Hide
     )
-    if ($hide){
+    if ($hide) {
         $sync.form.Dispatcher.Invoke([action]{$sync.ProgressBarLabel.Visibility = "Collapsed"}) 
         $sync.form.Dispatcher.Invoke([action]{$sync.ProgressBar.Visibility = "Collapsed"})     
-    }
+    } else {
-    else{
         $sync.form.Dispatcher.Invoke([action]{$sync.ProgressBarLabel.Visibility = "Visible"}) 
         $sync.form.Dispatcher.Invoke([action]{$sync.ProgressBar.Visibility = "Visible"})     
     }

functions/private/Set-WinUtilRegistry.ps1

@@ -27,8 +27,8 @@ function Set-WinUtilRegistry {
         $Value
     )
 
-    Try{
+    try {
-        if(!(Test-Path 'HKU:\')){New-PSDrive -PSProvider Registry -Name HKU -Root HKEY_USERS}
+        if(!(Test-Path 'HKU:\')) {New-PSDrive -PSProvider Registry -Name HKU -Root HKEY_USERS}
 
         If (!(Test-Path $Path)) {
             Write-Host "$Path was not found, Creating..."
@@ -37,14 +37,11 @@ function Set-WinUtilRegistry {
 
         Write-Host "Set $Path\$Name to $Value"
         Set-ItemProperty -Path $Path -Name $Name -Type $Type -Value $Value -Force -ErrorAction Stop | Out-Null
-    }
+    } catch [System.Security.SecurityException] {
-    Catch [System.Security.SecurityException] {
         Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
-    }
+    } catch [System.Management.Automation.ItemNotFoundException] {
-    Catch [System.Management.Automation.ItemNotFoundException] {
         Write-Warning $psitem.Exception.ErrorRecord
-    }
+    } catch {
-    Catch{
         Write-Warning "Unable to set $Name due to unhandled exception"
         Write-Warning $psitem.Exception.StackTrace
     }

functions/private/Set-WinUtilScheduledTask.ps1

@@ -19,26 +19,23 @@ function Set-WinUtilScheduledTask {
         $State
     )
 
-    Try{
+    try {
-        if($State -eq "Disabled"){
+        if($State -eq "Disabled") {
             Write-Host "Disabling Scheduled Task $Name"
             Disable-ScheduledTask -TaskName $Name -ErrorAction Stop
         }
-        if($State -eq "Enabled"){
+        if($State -eq "Enabled") {
             Write-Host "Enabling Scheduled Task $Name"
             Enable-ScheduledTask -TaskName $Name -ErrorAction Stop
         }
-    }
+    } catch [System.Exception] {
-    Catch [System.Exception]{
+        if($psitem.Exception.Message -like "*The system cannot find the file specified*") {
-        if($psitem.Exception.Message -like "*The system cannot find the file specified*"){
             Write-Warning "Scheduled Task $name was not Found"
-        }
+        } else {
-        Else{
             Write-Warning "Unable to set $Name due to unhandled exception"
             Write-Warning $psitem.Exception.Message
         }
-    }
+    } catch {
-    Catch{
         Write-Warning "Unable to run script for $name due to unhandled exception"
         Write-Warning $psitem.Exception.StackTrace
     }

functions/private/Set-WinUtilService.ps1

@@ -26,11 +26,9 @@ Function Set-WinUtilService {
 
         # Service exists, proceed with changing properties
         $service | Set-Service -StartupType $StartupType -ErrorAction Stop
-    }
+    } catch [System.ServiceProcess.ServiceNotFoundException] {
-    catch [System.ServiceProcess.ServiceNotFoundException] {
         Write-Warning "Service $Name was not found"
-    }
+    } catch {
-    catch {
         Write-Warning "Unable to set $Name due to unhandled exception"
         Write-Warning $_.Exception.Message
     }

functions/private/Set-WinUtilUiTheme.ps1

@@ -1,25 +1,24 @@
 function Set-WinUtilUITheme {
     <#
+        .SYNOPSIS
+            Sets the theme of the XAML file
 
-    .SYNOPSIS
+        .PARAMETER inputXML
-        Sets the theme of the XAML file
+            A string representing the XAML object to modify
 
-    .PARAMETER inputXML
+        .PARAMETER themeName
-        A string representing the XAML object to modify
+            The name of the theme to set the XAML to. Defaults to 'matrix'
-
-    .PARAMETER themeName
-        The name of the theme to set the XAML to. Defaults to 'matrix'
-
-    .EXAMPLE
-        Set-WinUtilUITheme -inputXAML $inputXAML
 
+        .EXAMPLE
+            Set-WinUtilUITheme -inputXAML $inputXAML
     #>
+
     param
     (
-         [Parameter(Mandatory=$true, Position=0)]
+         [Parameter(Mandatory, position=0)]
-         [string] $inputXML,
+         [string]$inputXML,
-         [Parameter(Mandatory=$false, Position=1)]
+         [Parameter(position=1)]
-         [string] $themeName = 'matrix'
+         [string]$themeName = 'matrix'
     )
 
     try {
@@ -38,13 +37,11 @@ function Set-WinUtilUITheme {
                 # Replace the key with the value in the input XML
                 $inputXML = $inputXML.Replace($formattedKey, $value)
             }
-        }
+        } else {
-        else {
             Write-Host "Theme '$themeName' not found."
         }
 
-    }
+    } catch {
-    catch {
         Write-Warning "Unable to apply theme"
         Write-Warning $psitem.Exception.StackTrace
     }

functions/private/Test-WinUtilPackageManager.ps1

@@ -30,12 +30,12 @@ function Test-WinUtilPackageManager {
         } catch {
             Write-Warning "Winget was not found due to un-known reasons, The Stack Trace is:`n$($psitem.Exception.StackTrace)"
             $wingetExists = $false
-	}
+    }
 
         # If Winget is available, Parse it's Version and give proper information to Terminal Output.
-	# If it isn't available, the return of this funtion will be "not-installed", indicating that
+    # If it isn't available, the return of this funtion will be "not-installed", indicating that
         # Winget isn't installed/available on The System.
-	if ($wingetExists) {
+    if ($wingetExists) {
             # Check if Preview Version
             if ($wingetVersionFull.Contains("-preview")) {
                 $wingetVersion = $wingetVersionFull.Trim("-preview")
@@ -65,8 +65,7 @@ function Test-WinUtilPackageManager {
             if (!$wingetOutdated) {
                 Write-Host "    - Winget is Up to Date" -ForegroundColor Green
                 $status = "installed"
-            }
+            } else {
-            else {
                 Write-Host "    - Winget is Out of Date" -ForegroundColor Red
                 $status = "outdated"
             }

functions/public/Invoke-ScratchDialog.ps1

@@ -18,8 +18,7 @@ function Invoke-ScratchDialog {
     $filePath = $Dialog.SelectedPath
         Write-Host "No ISO is chosen+  $filePath"
 
-    if ([string]::IsNullOrEmpty($filePath))
+    if ([string]::IsNullOrEmpty($filePath)) {
-    {
         Write-Host "No Folder had chosen"
         return
     }

functions/public/Invoke-WPFButton.ps1

@@ -14,11 +14,11 @@ function Invoke-WPFButton {
 
     # Use this to get the name of the button
     #[System.Windows.MessageBox]::Show("$Button","Chris Titus Tech's Windows Utility","OK","Info")
-    if (-not $sync.ProcessRunning){
+    if (-not $sync.ProcessRunning) {
         Set-WinUtilProgressBar  -label "" -percent 0 -hide $true
     }
     
-    Switch -Wildcard ($Button){
+    Switch -Wildcard ($Button) {
     
         "WPFTab?BT" {Invoke-WPFTab $Button}
         "WPFinstall" {Invoke-WPFInstall}

functions/public/Invoke-WPFControlPanel.ps1

@@ -10,7 +10,7 @@ function Invoke-WPFControlPanel {
     #>
     param($Panel)
 
-    switch ($Panel){
+    switch ($Panel) {
         "WPFPanelcontrol" {cmd /c control}
         "WPFPanelnetwork" {cmd /c ncpa.cpl}
         "WPFPanelpower"   {cmd /c powercfg.cpl}

functions/public/Invoke-WPFFeatureInstall.ps1

@@ -6,7 +6,7 @@ function Invoke-WPFFeatureInstall {
 
     #>
 
-    if($sync.ProcessRunning){
+    if($sync.ProcessRunning) {
         $msg = "[Invoke-WPFFeatureInstall] Install process is currently running."
         [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
         return
@@ -17,7 +17,7 @@ function Invoke-WPFFeatureInstall {
     Invoke-WPFRunspace -ArgumentList $Features -DebugPreference $DebugPreference -ScriptBlock {
         param($Features, $DebugPreference)
         $sync.ProcessRunning = $true
-        if ($Features.count -eq 1){
+        if ($Features.count -eq 1) {
             $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })
         } else {
             $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Normal" -value 0.01 -overlay "logo" })

functions/public/Invoke-WPFFixesUpdate.ps1

@@ -66,7 +66,7 @@ function Invoke-WPFFixesUpdate {
                 ).Trim()} catch {0}) `
                 <# And the current percentage is greater than the previous one #>`
                 -and $percent -gt $oldpercent
-            ){
+            ) {
                 # Update the progress bar
                 $oldpercent = $percent
                 Write-Progress -Id 1 -ParentId 0 -Activity "Scanning for corruption" -Status "Running chkdsk... ($percent%)" -PercentComplete $percent
@@ -93,7 +93,7 @@ function Invoke-WPFFixesUpdate {
                         ) -join ''
                     ).TrimStart()} catch {0}
                 ) -and $percent -gt $oldpercent
-            ){
+            ) {
                 # Update the progress bar
                 $oldpercent = $percent
                 Write-Progress -Id 1 -ParentId 0 -Activity "Scanning for corruption" -Status "Running SFC... ($percent%)" -PercentComplete $percent
@@ -112,7 +112,7 @@ function Invoke-WPFFixesUpdate {
                     [int]($_ -replace "\[" -replace "=" -replace " " -replace "%" -replace "\]")
                 } catch {0}) `
                 -and $percent -gt $oldpercent
-            ){
+            ) {
                 # Update the progress bar
                 $oldpercent = $percent
                 Write-Progress -Id 1 -ParentId 0 -Activity "Scanning for corruption" -Status "Running DISM... ($percent%)" -PercentComplete $percent
@@ -137,7 +137,7 @@ function Invoke-WPFFixesUpdate {
                         ) -join ''
                     ).TrimStart()} catch {0}
                 ) -and $percent -gt $oldpercent
-            ){
+            ) {
                 # Update the progress bar
                 $oldpercent = $percent
                 Write-Progress -Id 1 -ParentId 0 -Activity "Scanning for corruption" -Status "Running SFC... ($percent%)" -PercentComplete $percent

functions/public/Invoke-WPFGetInstalled.ps1

@@ -10,13 +10,13 @@ function Invoke-WPFGetInstalled {
     #>
     param($checkbox)
 
-    if($sync.ProcessRunning){
+    if($sync.ProcessRunning) {
         $msg = "[Invoke-WPFGetInstalled] Install process is currently running."
         [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
         return
     }
 
-    if(((Test-WinUtilPackageManager -winget) -eq "not-installed") -and $checkbox -eq "winget"){
+    if(((Test-WinUtilPackageManager -winget) -eq "not-installed") -and $checkbox -eq "winget") {
         return
     }
 
@@ -26,17 +26,17 @@ function Invoke-WPFGetInstalled {
         $sync.ProcessRunning = $true
         $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" })
 
-        if($checkbox -eq "winget"){
+        if($checkbox -eq "winget") {
             Write-Host "Getting Installed Programs..."
         }
-        if($checkbox -eq "tweaks"){
+        if($checkbox -eq "tweaks") {
             Write-Host "Getting Installed Tweaks..."
         }
 
         $Checkboxes = Invoke-WinUtilCurrentSystem -CheckBox $checkbox
 
         $sync.form.Dispatcher.invoke({
-            foreach($checkbox in $Checkboxes){
+            foreach($checkbox in $Checkboxes) {
                 $sync.$checkbox.ischecked = $True
             }
         })

functions/public/Invoke-WPFGetIso.ps1

@@ -6,7 +6,7 @@ function Invoke-WPFGetIso {
 
     Write-Host "Invoking WPFGetIso"
 
-    if($sync.ProcessRunning){
+    if($sync.ProcessRunning) {
         $msg = "GetIso process is currently running."
         [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
         return
@@ -18,22 +18,20 @@ function Invoke-WPFGetIso {
 
 
     Write-Host "         _                     __    __  _         "
-	Write-Host "  /\/\  (_)  ___  _ __   ___  / / /\ \ \(_) _ __   "
+    Write-Host "  /\/\  (_)  ___  _ __   ___  / / /\ \ \(_) _ __   "
-	Write-Host " /    \ | | / __|| '__| / _ \ \ \/  \/ /| || '_ \  "
+    Write-Host " /    \ | | / __|| '__| / _ \ \ \/  \/ /| || '_ \  "
-	Write-Host "/ /\/\ \| || (__ | |   | (_) | \  /\  / | || | | | "
+    Write-Host "/ /\/\ \| || (__ | |   | (_) | \  /\  / | || | | | "
-	Write-Host "\/    \/|_| \___||_|    \___/   \/  \/  |_||_| |_| "
+    Write-Host "\/    \/|_| \___||_|    \___/   \/  \/  |_||_| |_| "
 
     $oscdimgPath = Join-Path $env:TEMP 'oscdimg.exe'
     $oscdImgFound = [bool] (Get-Command -ErrorAction Ignore -Type Application oscdimg.exe) -or (Test-Path $oscdimgPath -PathType Leaf)
     Write-Host "oscdimg.exe on system: $oscdImgFound"
 
-    if (!$oscdImgFound)
+    if (!$oscdImgFound) {
-    {
         $downloadFromGitHub = $sync.WPFMicrowinDownloadFromGitHub.IsChecked
         $sync.BusyMessage.Visibility="Hidden"
 
-        if (!$downloadFromGitHub)
+        if (!$downloadFromGitHub) {
-        {
             # only show the message to people who did check the box to download from github, if you check the box
             # you consent to downloading it, no need to show extra dialogs
             [System.Windows.MessageBox]::Show("oscdimge.exe is not found on the system, winutil will now attempt do download and install it using choco. This might take a long time.")
@@ -42,8 +40,7 @@ function Invoke-WPFGetIso {
             Install-WinUtilChoco
             $chocoFound = [bool] (Get-Command -ErrorAction Ignore -Type Application choco)
             Write-Host "choco on system: $chocoFound"
-            if (!$chocoFound)
+            if (!$chocoFound) {
-            {
                 [System.Windows.MessageBox]::Show("choco.exe is not found on the system, you need choco to download oscdimg.exe")
                 return
             }
@@ -51,8 +48,7 @@ function Invoke-WPFGetIso {
             Start-Process -Verb runas -FilePath powershell.exe -ArgumentList "choco install windows-adk-oscdimg"
             [System.Windows.MessageBox]::Show("oscdimg is installed, now close, reopen PowerShell terminal and re-launch winutil.ps1")
             return
-        }
+        } else {
-        else {
             [System.Windows.MessageBox]::Show("oscdimge.exe is not found on the system, winutil will now attempt do download and install it from github. This might take a long time.")
             Get-Oscdimg -oscdimgPath $oscdimgPath
             $oscdImgFound = Test-Path $oscdimgPath -PathType Leaf
@@ -60,8 +56,7 @@ function Invoke-WPFGetIso {
                 $msg = "oscdimg was not downloaded can not proceed"
                 [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Error)
                 return
-            }
+            } else {
-            else {
                 Write-Host "oscdimg.exe was successfully downloaded from github"
             }
         }
@@ -74,16 +69,14 @@ function Invoke-WPFGetIso {
     $openFileDialog.ShowDialog() | Out-Null
     $filePath = $openFileDialog.FileName
 
-    if ([string]::IsNullOrEmpty($filePath))
+    if ([string]::IsNullOrEmpty($filePath)) {
-    {
         Write-Host "No ISO is chosen"
         $sync.BusyMessage.Visibility="Hidden"
         return
     }
 
     Write-Host "File path $($filePath)"
-    if (-not (Test-Path -Path $filePath -PathType Leaf))
+    if (-not (Test-Path -Path $filePath -PathType Leaf)) {
-    {
         $msg = "File you've chosen doesn't exist"
         [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Error)
         return
@@ -98,20 +91,16 @@ function Invoke-WPFGetIso {
     # This is done to guarantee a dynamic solution, as the installation drive may be mounted to a letter different than C
     $driveSpace = (Get-Volume -DriveLetter ([IO.Path]::GetPathRoot([Environment]::GetFolderPath([Environment+SpecialFolder]::UserProfile)).Replace(":\", "").Trim())).SizeRemaining
     Write-Debug "Free space on installation drive: $($driveSpace) bytes"
-    if ($driveSpace -lt ($isoSize * 2))
+    if ($driveSpace -lt ($isoSize * 2)) {
-    {
         # It's not critical and we _may_ continue. Output a warning
         Write-Warning "You may not have enough space for this operation. Proceed at your own risk."
     }
-    elseif ($driveSpace -lt $isoSize)
+    elseif ($driveSpace -lt $isoSize) {
-    {
         # It's critical and we can't continue. Output an error
         Write-Host "You don't have enough space for this operation. You need at least $([Math]::Round(($isoSize / ([Math]::Pow(1024, 2))) * 2, 2)) MB of free space to copy the ISO files to a temp directory and to be able to perform additional operations."
         Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
         return
-    }
+    } else {
-    else
-    {
         Write-Host "You have enough space for this operation."
     }
 
@@ -151,14 +140,12 @@ function Invoke-WPFGetIso {
     }
 
     # Detect if the folders already exist and remove them
-    if (($sync.MicrowinMountDir.Text -ne "") -and (Test-Path -Path $sync.MicrowinMountDir.Text))
+    if (($sync.MicrowinMountDir.Text -ne "") -and (Test-Path -Path $sync.MicrowinMountDir.Text)) {
-    {
         try {
             Write-Host "Deleting temporary files from previous run. Please wait..."
             Remove-Item -Path $sync.MicrowinMountDir.Text -Recurse -Force
             Remove-Item -Path $sync.MicrowinScratchDir.Text -Recurse -Force
-        }
+        } catch {
-        catch {
             Write-Host "Could not delete temporary files. You need to delete those manually."
         }
     }
@@ -199,16 +186,14 @@ function Invoke-WPFGetIso {
         $wimFile = "$mountDir\sources\install.wim"
         Write-Host "Getting image information $wimFile"
 
-        if ((-not (Test-Path -Path $wimFile -PathType Leaf)) -and (-not (Test-Path -Path $wimFile.Replace(".wim", ".esd").Trim() -PathType Leaf)))
+        if ((-not (Test-Path -Path $wimFile -PathType Leaf)) -and (-not (Test-Path -Path $wimFile.Replace(".wim", ".esd").Trim() -PathType Leaf))) {
-        {
             $msg = "Neither install.wim nor install.esd exist in the image, this could happen if you use unofficial Windows images. Please don't use shady images from the internet, use only official images. Here are instructions how to download ISO images if the Microsoft website is not showing the link to download and ISO. https://www.techrepublic.com/article/how-to-download-a-windows-10-iso-file-without-using-the-media-creation-tool/"
             Write-Host $msg
             [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Error)
             Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
             throw
         }
-        elseif ((-not (Test-Path -Path $wimFile -PathType Leaf)) -and (Test-Path -Path $wimFile.Replace(".wim", ".esd").Trim() -PathType Leaf))
+        elseif ((-not (Test-Path -Path $wimFile -PathType Leaf)) -and (Test-Path -Path $wimFile.Replace(".wim", ".esd").Trim() -PathType Leaf)) {
-        {
             Write-Host "Install.esd found on the image. It needs to be converted to a WIM file in order to begin processing"
             $wimFile = $wimFile.Replace(".wim", ".esd").Trim()
         }
@@ -221,8 +206,7 @@ function Invoke-WPFGetIso {
         $sync.MicrowinWindowsFlavors.SelectedIndex = 0
         Write-Host "Finding suitable Pro edition. This can take some time. Do note that this is an automatic process that might not select the edition you want."
         Get-WindowsImage -ImagePath $wimFile | ForEach-Object {
-            if ((Get-WindowsImage -ImagePath $wimFile -Index $_.ImageIndex).EditionId -eq "Professional")
+            if ((Get-WindowsImage -ImagePath $wimFile -Index $_.ImageIndex).EditionId -eq "Professional") {
-            {
                 # We have found the Pro edition
                 $sync.MicrowinWindowsFlavors.SelectedIndex = $_.ImageIndex - 1
             }
@@ -247,5 +231,3 @@ function Invoke-WPFGetIso {
     $sync.ProcessRunning = $false
     Set-WinUtilTaskbaritem -state "None" -overlay "checkmark"
 }
-
-

functions/public/Invoke-WPFImpex.ps1

@@ -19,31 +19,30 @@ function Invoke-WPFImpex {
         $Config = $null
     )
 
-    if ($type -eq "export"){
+    if ($type -eq "export") {
         $FileBrowser = New-Object System.Windows.Forms.SaveFileDialog
     }
-    if ($type -eq "import"){
+    if ($type -eq "import") {
         $FileBrowser = New-Object System.Windows.Forms.OpenFileDialog
     }
 
-    if (-not $Config){
+    if (-not $Config) {
         $FileBrowser.InitialDirectory = [Environment]::GetFolderPath('Desktop')
         $FileBrowser.Filter = "JSON Files (*.json)|*.json"
         $FileBrowser.ShowDialog() | Out-Null
 
-        if($FileBrowser.FileName -eq ""){
+        if($FileBrowser.FileName -eq "") {
             return
-        }
+        } else {
-        else{
             $Config = $FileBrowser.FileName
         }
     }
 
-    if ($type -eq "export"){
+    if ($type -eq "export") {
         $jsonFile = Get-WinUtilCheckBoxes -unCheck $false
         $jsonFile | ConvertTo-Json | Out-File $FileBrowser.FileName -Force
     }
-    if ($type -eq "import"){
+    if ($type -eq "import") {
         $jsonFile = Get-Content $Config | ConvertFrom-Json
 
         $flattenedJson = @()

functions/public/Invoke-WPFInstall.ps1

@@ -6,7 +6,7 @@ function Invoke-WPFInstall {
 
     #>
 
-    if($sync.ProcessRunning){
+    if($sync.ProcessRunning) {
         $msg = "[Invoke-WPFInstall] An Install process is currently running."
         [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
         return
@@ -23,7 +23,7 @@ function Invoke-WPFInstall {
 
     Invoke-WPFRunspace -ArgumentList $PackagesToInstall -DebugPreference $DebugPreference -ScriptBlock {
         param($PackagesToInstall, $DebugPreference)
-        if ($PackagesToInstall.count -eq 1){
+        if ($PackagesToInstall.count -eq 1) {
             $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })
         } else {
             $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Normal" -value 0.01 -overlay "logo" })
@@ -43,15 +43,15 @@ function Invoke-WPFInstall {
             return $packagesWinget, $packagesChoco
         }.Invoke($PackagesToInstall)
 
-        try{
+        try {
             $sync.ProcessRunning = $true
             $errorPackages = @()
-            if($packagesWinget.Count -gt 0){
+            if($packagesWinget.Count -gt 0) {
                 Install-WinUtilWinget
                 $errorPackages += Invoke-WinUtilWingetProgram -Action Install -Programs $packagesWinget 
                 $errorPackages| ForEach-Object {if($_.choco -ne "na") {$packagesChoco += $_}}
             }
-            if($packagesChoco.Count -gt 0){
+            if($packagesChoco.Count -gt 0) {
                 Install-WinUtilChoco
                 Install-WinUtilProgramChoco -ProgramsToInstall $packagesChoco
             }
@@ -59,8 +59,7 @@ function Invoke-WPFInstall {
             Write-Host "--      Installs have finished          ---"
             Write-Host "==========================================="
             $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" })
-        }
+        } catch {
-        Catch {
             Write-Host "==========================================="
             Write-Host "Error: $_"
             Write-Host "==========================================="

functions/public/Invoke-WPFInstallUpgrade.ps1

@@ -5,11 +5,11 @@ function Invoke-WPFInstallUpgrade {
         Invokes the function that upgrades all installed programs using winget
 
     #>
-    if((Test-WinUtilPackageManager -winget) -eq "not-installed"){
+    if((Test-WinUtilPackageManager -winget) -eq "not-installed") {
         return
     }
 
-    if(Get-WinUtilInstallerProcess -Process $global:WinGetInstall){
+    if(Get-WinUtilInstallerProcess -Process $global:WinGetInstall) {
         $msg = "[Invoke-WPFInstallUpgrade] Install process is currently running. Please check for a powershell window labeled 'Winget Install'"
         [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
         return

functions/public/Invoke-WPFMicrowin.ps1

@@ -5,32 +5,32 @@ function Invoke-WPFMicrowin {
     #>
 
 
-	if($sync.ProcessRunning) {
+    if($sync.ProcessRunning) {
         $msg = "GetIso process is currently running."
         [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
         return
     }
 
-	# Define the constants for Windows API
+    # Define the constants for Windows API
 Add-Type @"
 using System;
 using System.Runtime.InteropServices;
 
 public class PowerManagement {
-	[DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+    [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-	public static extern EXECUTION_STATE SetThreadExecutionState(EXECUTION_STATE esFlags);
+    public static extern EXECUTION_STATE SetThreadExecutionState(EXECUTION_STATE esFlags);
 
-	[FlagsAttribute]
+    [FlagsAttribute]
-	public enum EXECUTION_STATE : uint {
+    public enum EXECUTION_STATE : uint {
-		ES_SYSTEM_REQUIRED = 0x00000001,
+        ES_SYSTEM_REQUIRED = 0x00000001,
-		ES_DISPLAY_REQUIRED = 0x00000002,
+        ES_DISPLAY_REQUIRED = 0x00000002,
-		ES_CONTINUOUS = 0x80000000,
+        ES_CONTINUOUS = 0x80000000,
-	}
+    }
 }
 "@
 
-	# Prevent the machine from sleeping
+    # Prevent the machine from sleeping
-	[PowerManagement]::SetThreadExecutionState([PowerManagement]::EXECUTION_STATE::ES_CONTINUOUS -bor [PowerManagement]::EXECUTION_STATE::ES_SYSTEM_REQUIRED -bor [PowerManagement]::EXECUTION_STATE::ES_DISPLAY_REQUIRED)
+    [PowerManagement]::SetThreadExecutionState([PowerManagement]::EXECUTION_STATE::ES_CONTINUOUS -bor [PowerManagement]::EXECUTION_STATE::ES_SYSTEM_REQUIRED -bor [PowerManagement]::EXECUTION_STATE::ES_DISPLAY_REQUIRED)
 
     # Ask the user where to save the file
     $SaveDialog = New-Object System.Windows.Forms.SaveFileDialog
@@ -40,470 +40,429 @@ public class PowerManagement {
 
     if ($SaveDialog.FileName -eq "") {
         Write-Host "No file name for the target image was specified"
-		Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
+        Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
         return
     }
 
-	Set-WinUtilTaskbaritem -state "Indeterminate" -overlay "logo"
+    Set-WinUtilTaskbaritem -state "Indeterminate" -overlay "logo"
 
     Write-Host "Target ISO location: $($SaveDialog.FileName)"
 
-	$index = $sync.MicrowinWindowsFlavors.SelectedValue.Split(":")[0].Trim()
+    $index = $sync.MicrowinWindowsFlavors.SelectedValue.Split(":")[0].Trim()
-	Write-Host "Index chosen: '$index' from $($sync.MicrowinWindowsFlavors.SelectedValue)"
+    Write-Host "Index chosen: '$index' from $($sync.MicrowinWindowsFlavors.SelectedValue)"
 
-	$keepPackages = $sync.WPFMicrowinKeepProvisionedPackages.IsChecked
+    $keepPackages = $sync.WPFMicrowinKeepProvisionedPackages.IsChecked
-	$keepProvisionedPackages = $sync.WPFMicrowinKeepAppxPackages.IsChecked
+    $keepProvisionedPackages = $sync.WPFMicrowinKeepAppxPackages.IsChecked
-	$keepDefender = $sync.WPFMicrowinKeepDefender.IsChecked
+    $keepDefender = $sync.WPFMicrowinKeepDefender.IsChecked
-	$keepEdge = $sync.WPFMicrowinKeepEdge.IsChecked
+    $keepEdge = $sync.WPFMicrowinKeepEdge.IsChecked
-	$copyToUSB = $sync.WPFMicrowinCopyToUsb.IsChecked
+    $copyToUSB = $sync.WPFMicrowinCopyToUsb.IsChecked
-	$injectDrivers = $sync.MicrowinInjectDrivers.IsChecked
+    $injectDrivers = $sync.MicrowinInjectDrivers.IsChecked
-	$importDrivers = $sync.MicrowinImportDrivers.IsChecked
+    $importDrivers = $sync.MicrowinImportDrivers.IsChecked
 
     $mountDir = $sync.MicrowinMountDir.Text
     $scratchDir = $sync.MicrowinScratchDir.Text
 
-	# Detect if the Windows image is an ESD file and convert it to WIM
+    # Detect if the Windows image is an ESD file and convert it to WIM
-	if (-not (Test-Path -Path $mountDir\sources\install.wim -PathType Leaf) -and (Test-Path -Path $mountDir\sources\install.esd -PathType Leaf))
+    if (-not (Test-Path -Path $mountDir\sources\install.wim -PathType Leaf) -and (Test-Path -Path $mountDir\sources\install.esd -PathType Leaf)) {
-	{
+        Write-Host "Exporting Windows image to a WIM file, keeping the index we want to work on. This can take several minutes, depending on the performance of your computer..."
-		Write-Host "Exporting Windows image to a WIM file, keeping the index we want to work on. This can take several minutes, depending on the performance of your computer..."
+        Export-WindowsImage -SourceImagePath $mountDir\sources\install.esd -SourceIndex $index -DestinationImagePath $mountDir\sources\install.wim -CompressionType "Max"
-		Export-WindowsImage -SourceImagePath $mountDir\sources\install.esd -SourceIndex $index -DestinationImagePath $mountDir\sources\install.wim -CompressionType "Max"
+        if ($?) {
-		if ($?)
-		{
             Remove-Item -Path $mountDir\sources\install.esd -Force
-			# Since we've already exported the image index we wanted, switch to the first one
+            # Since we've already exported the image index we wanted, switch to the first one
-			$index = 1
+            $index = 1
-		}
+        } else {
-		else
-		{
             $msg = "The export process has failed and MicroWin processing cannot continue"
             Write-Host "Failed to export the image"
             [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Error)
-			Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
+            Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
             return
-		}
+        }
-	}
+    }
 
     $imgVersion = (Get-WindowsImage -ImagePath $mountDir\sources\install.wim -Index $index).Version
 
     # Detect image version to avoid performing MicroWin processing on Windows 8 and earlier
-    if ((Test-CompatibleImage $imgVersion $([System.Version]::new(10,0,10240,0))) -eq $false)
+    if ((Test-CompatibleImage $imgVersion $([System.Version]::new(10,0,10240,0))) -eq $false) {
-    {
+        $msg = "This image is not compatible with MicroWin processing. Make sure it isn't a Windows 8 or earlier image."
-		$msg = "This image is not compatible with MicroWin processing. Make sure it isn't a Windows 8 or earlier image."
         $dlg_msg = $msg + "`n`nIf you want more information, the version of the image selected is $($imgVersion)`n`nIf an image has been incorrectly marked as incompatible, report an issue to the developers."
-		Write-Host $msg
+        Write-Host $msg
-		[System.Windows.MessageBox]::Show($dlg_msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Exclamation)
+        [System.Windows.MessageBox]::Show($dlg_msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Exclamation)
-		Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
+        Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
         return
     }
 
-	$mountDirExists = Test-Path $mountDir
+    $mountDirExists = Test-Path $mountDir
     $scratchDirExists = Test-Path $scratchDir
-	if (-not $mountDirExists -or -not $scratchDirExists)
+    if (-not $mountDirExists -or -not $scratchDirExists) {
-	{
         Write-Error "Required directories '$mountDirExists' '$scratchDirExists' and do not exist."
-		Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
+        Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
         return
     }
 
-	try {
+    try {
 
-		Write-Host "Mounting Windows image. This may take a while."
+        Write-Host "Mounting Windows image. This may take a while."
         Mount-WindowsImage -ImagePath "$mountDir\sources\install.wim" -Index $index -Path "$scratchDir"
-        if ($?)
+        if ($?) {
-        {
+            Write-Host "Mounting complete! Performing removal of applications..."
-		    Write-Host "Mounting complete! Performing removal of applications..."
+        } else {
-        }
-        else
-        {
             Write-Host "Could not mount image. Exiting..."
-			Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
+            Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
             return
         }
 
-		if ($importDrivers)
+        if ($importDrivers) {
-		{
+            Write-Host "Exporting drivers from active installation..."
-			Write-Host "Exporting drivers from active installation..."
+            if (Test-Path "$env:TEMP\DRV_EXPORT") {
-			if (Test-Path "$env:TEMP\DRV_EXPORT")
+                Remove-Item "$env:TEMP\DRV_EXPORT" -Recurse -Force
-			{
+            }
-				Remove-Item "$env:TEMP\DRV_EXPORT" -Recurse -Force
+            if (($injectDrivers -and (Test-Path $sync.MicrowinDriverLocation.Text))) {
-			}
+                Write-Host "Using specified driver source..."
-			if (($injectDrivers -and (Test-Path $sync.MicrowinDriverLocation.Text)))
+                dism /english /online /export-driver /destination="$($sync.MicrowinDriverLocation.Text)" | Out-Host
-			{
+                if ($?) {
-				Write-Host "Using specified driver source..."
+                    # Don't add exported drivers yet, that is run later
-				dism /english /online /export-driver /destination="$($sync.MicrowinDriverLocation.Text)" | Out-Host
+                    Write-Host "Drivers have been exported successfully."
-				if ($?)
+                } else {
-				{
+                    Write-Host "Failed to export drivers."
-					# Don't add exported drivers yet, that is run later
+                }
-					Write-Host "Drivers have been exported successfully."
+            } else {
-				}
+                New-Item -Path "$env:TEMP\DRV_EXPORT" -ItemType Directory -Force
-				else
+                dism /english /online /export-driver /destination="$env:TEMP\DRV_EXPORT" | Out-Host
-				{
+                if ($?) {
-					Write-Host "Failed to export drivers."
+                    Write-Host "Adding exported drivers..."
-				}
+                    dism /english /image="$scratchDir" /add-driver /driver="$env:TEMP\DRV_EXPORT" /recurse | Out-Host
-			}
+                } else {
-			else
+                    Write-Host "Failed to export drivers. Continuing without importing them..."
-			{
+                }
-				New-Item -Path "$env:TEMP\DRV_EXPORT" -ItemType Directory -Force
+                if (Test-Path "$env:TEMP\DRV_EXPORT") {
-				dism /english /online /export-driver /destination="$env:TEMP\DRV_EXPORT" | Out-Host
+                    Remove-Item "$env:TEMP\DRV_EXPORT" -Recurse -Force
-				if ($?)
+                }
-				{
+            }
-					Write-Host "Adding exported drivers..."
+        }
-					dism /english /image="$scratchDir" /add-driver /driver="$env:TEMP\DRV_EXPORT" /recurse | Out-Host
-				}
-				else
-				{
-					Write-Host "Failed to export drivers. Continuing without importing them..."
-				}
-				if (Test-Path "$env:TEMP\DRV_EXPORT")
-				{
-					Remove-Item "$env:TEMP\DRV_EXPORT" -Recurse -Force
-				}
-			}
-		}
 
-		if ($injectDrivers)
+        if ($injectDrivers) {
-		{
+            $driverPath = $sync.MicrowinDriverLocation.Text
-			$driverPath = $sync.MicrowinDriverLocation.Text
+            if (Test-Path $driverPath) {
-			if (Test-Path $driverPath)
+                Write-Host "Adding Windows Drivers image($scratchDir) drivers($driverPath) "
-			{
+                dism /English /image:$scratchDir /add-driver /driver:$driverPath /recurse | Out-Host
-				Write-Host "Adding Windows Drivers image($scratchDir) drivers($driverPath) "
+            } else {
-				dism /English /image:$scratchDir /add-driver /driver:$driverPath /recurse | Out-Host
+                Write-Host "Path to drivers is invalid continuing without driver injection"
-			}
+            }
-			else
+        }
-			{
-				Write-Host "Path to drivers is invalid continuing without driver injection"
-			}
-		}
 
-		Write-Host "Remove Features from the image"
+        Write-Host "Remove Features from the image"
-		Remove-Features -keepDefender:$keepDefender
+        Remove-Features -keepDefender:$keepDefender
-		Write-Host "Removing features complete!"
+        Write-Host "Removing features complete!"
 
-		if (!$keepPackages)
+        if (!$keepPackages) {
-		{
+            Write-Host "Removing OS packages"
-			Write-Host "Removing OS packages"
+            Remove-Packages
-			Remove-Packages
+        }
-		}
+        if (!$keepProvisionedPackages) {
-		if (!$keepProvisionedPackages)
+            Write-Host "Removing Appx Bloat"
-		{
+            Remove-ProvisionedPackages -keepSecurity:$keepDefender
-			Write-Host "Removing Appx Bloat"
+        }
-			Remove-ProvisionedPackages -keepSecurity:$keepDefender
-		}
 
-		# special code, for some reason when you try to delete some inbox apps
+        # special code, for some reason when you try to delete some inbox apps
-		# we have to get and delete log files directory.
+        # we have to get and delete log files directory.
-		Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\LogFiles\WMI\RtBackup" -Directory
+        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\LogFiles\WMI\RtBackup" -Directory
-		Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\WebThreatDefSvc" -Directory
+        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\WebThreatDefSvc" -Directory
 
-		# Defender is hidden in 2 places we removed a feature above now need to remove it from the disk
+        # Defender is hidden in 2 places we removed a feature above now need to remove it from the disk
-		if (!$keepDefender)
+        if (!$keepDefender) {
-		{
+            Write-Host "Removing Defender"
-			Write-Host "Removing Defender"
+            Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Windows Defender" -Directory
-			Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Windows Defender" -Directory
+            Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Windows Defender"
-			Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Windows Defender"
+        }
-		}
+        if (!$keepEdge) {
-		if (!$keepEdge)
+            Write-Host "Removing Edge"
-		{
+            Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Microsoft" -mask "*edge*" -Directory
-			Write-Host "Removing Edge"
+            Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Microsoft" -mask "*edge*" -Directory
-			Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Microsoft" -mask "*edge*" -Directory
+            Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\SystemApps" -mask "*edge*" -Directory
-			Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Microsoft" -mask "*edge*" -Directory
+        }
-			Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\SystemApps" -mask "*edge*" -Directory
-		}
 
-		Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\DiagTrack" -Directory
+        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\DiagTrack" -Directory
-		Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\InboxApps" -Directory
+        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\InboxApps" -Directory
-		Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\SecurityHealthSystray.exe"
+        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\SecurityHealthSystray.exe"
-		Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\LocationNotificationWindows.exe"
+        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\LocationNotificationWindows.exe"
-		Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Windows Photo Viewer" -Directory
+        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Windows Photo Viewer" -Directory
-		Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Windows Photo Viewer" -Directory
+        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Windows Photo Viewer" -Directory
-		Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Windows Media Player" -Directory
+        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Windows Media Player" -Directory
-		Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Windows Media Player" -Directory
+        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Windows Media Player" -Directory
-		Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Windows Mail" -Directory
+        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Windows Mail" -Directory
-		Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Windows Mail" -Directory
+        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Windows Mail" -Directory
-		Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Internet Explorer" -Directory
+        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Internet Explorer" -Directory
-		Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Internet Explorer" -Directory
+        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Internet Explorer" -Directory
-		Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\GameBarPresenceWriter"
+        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\GameBarPresenceWriter"
-		Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\OneDriveSetup.exe"
+        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\OneDriveSetup.exe"
-		Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\OneDrive.ico"
+        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\OneDrive.ico"
-		Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\SystemApps" -mask "*Windows.Search*" -Directory
+        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\SystemApps" -mask "*Windows.Search*" -Directory
-		Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\SystemApps" -mask "*narratorquickstart*" -Directory
+        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\SystemApps" -mask "*narratorquickstart*" -Directory
-		Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\SystemApps" -mask "*Xbox*" -Directory
+        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\SystemApps" -mask "*Xbox*" -Directory
-		Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\SystemApps" -mask "*ParentalControls*" -Directory
+        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\SystemApps" -mask "*ParentalControls*" -Directory
-		Write-Host "Removal complete!"
+        Write-Host "Removal complete!"
 
-		Write-Host "Create unattend.xml"
+        Write-Host "Create unattend.xml"
-		New-Unattend
+        New-Unattend
-		Write-Host "Done Create unattend.xml"
+        Write-Host "Done Create unattend.xml"
-		Write-Host "Copy unattend.xml file into the ISO"
+        Write-Host "Copy unattend.xml file into the ISO"
-		New-Item -ItemType Directory -Force -Path "$($scratchDir)\Windows\Panther"
+        New-Item -ItemType Directory -Force -Path "$($scratchDir)\Windows\Panther"
-		Copy-Item "$env:temp\unattend.xml" "$($scratchDir)\Windows\Panther\unattend.xml" -force
+        Copy-Item "$env:temp\unattend.xml" "$($scratchDir)\Windows\Panther\unattend.xml" -force
-		New-Item -ItemType Directory -Force -Path "$($scratchDir)\Windows\System32\Sysprep"
+        New-Item -ItemType Directory -Force -Path "$($scratchDir)\Windows\System32\Sysprep"
-		Copy-Item "$env:temp\unattend.xml" "$($scratchDir)\Windows\System32\Sysprep\unattend.xml" -force
+        Copy-Item "$env:temp\unattend.xml" "$($scratchDir)\Windows\System32\Sysprep\unattend.xml" -force
-		Copy-Item "$env:temp\unattend.xml" "$($scratchDir)\unattend.xml" -force
+        Copy-Item "$env:temp\unattend.xml" "$($scratchDir)\unattend.xml" -force
-		Write-Host "Done Copy unattend.xml"
+        Write-Host "Done Copy unattend.xml"
 
-		Write-Host "Create FirstRun"
+        Write-Host "Create FirstRun"
-		New-FirstRun
+        New-FirstRun
-		Write-Host "Done create FirstRun"
+        Write-Host "Done create FirstRun"
-		Write-Host "Copy FirstRun.ps1 into the ISO"
+        Write-Host "Copy FirstRun.ps1 into the ISO"
-		Copy-Item "$env:temp\FirstStartup.ps1" "$($scratchDir)\Windows\FirstStartup.ps1" -force
+        Copy-Item "$env:temp\FirstStartup.ps1" "$($scratchDir)\Windows\FirstStartup.ps1" -force
-		Write-Host "Done copy FirstRun.ps1"
+        Write-Host "Done copy FirstRun.ps1"
 
-		Write-Host "Copy link to winutil.ps1 into the ISO"
+        Write-Host "Copy link to winutil.ps1 into the ISO"
-		$desktopDir = "$($scratchDir)\Windows\Users\Default\Desktop"
+        $desktopDir = "$($scratchDir)\Windows\Users\Default\Desktop"
-		New-Item -ItemType Directory -Force -Path "$desktopDir"
+        New-Item -ItemType Directory -Force -Path "$desktopDir"
-	    dism /English /image:$($scratchDir) /set-profilepath:"$($scratchDir)\Windows\Users\Default"
+        dism /English /image:$($scratchDir) /set-profilepath:"$($scratchDir)\Windows\Users\Default"
 
-		# $command = "powershell.exe -NoProfile -ExecutionPolicy Bypass -Command 'irm https://christitus.com/win | iex'"
+        # $command = "powershell.exe -NoProfile -ExecutionPolicy Bypass -Command 'irm https://christitus.com/win | iex'"
-		# $shortcutPath = "$desktopDir\WinUtil.lnk"
+        # $shortcutPath = "$desktopDir\WinUtil.lnk"
-		# $shell = New-Object -ComObject WScript.Shell
+        # $shell = New-Object -ComObject WScript.Shell
-		# $shortcut = $shell.CreateShortcut($shortcutPath)
+        # $shortcut = $shell.CreateShortcut($shortcutPath)
 
-		# if (Test-Path -Path "$env:TEMP\cttlogo.png")
+        # if (Test-Path -Path "$env:TEMP\cttlogo.png")
-		# {
+        # {
-		# 	$pngPath = "$env:TEMP\cttlogo.png"
+        #     $pngPath = "$env:TEMP\cttlogo.png"
-		# 	$icoPath = "$env:TEMP\cttlogo.ico"
+        #     $icoPath = "$env:TEMP\cttlogo.ico"
-		# 	ConvertTo-Icon -bitmapPath $pngPath -iconPath $icoPath
+        #     ConvertTo-Icon -bitmapPath $pngPath -iconPath $icoPath
-		# 	Write-Host "ICO file created at: $icoPath"
+        #     Write-Host "ICO file created at: $icoPath"
-		# 	Copy-Item "$env:TEMP\cttlogo.png" "$($scratchDir)\Windows\cttlogo.png" -force
+        #     Copy-Item "$env:TEMP\cttlogo.png" "$($scratchDir)\Windows\cttlogo.png" -force
-		# 	Copy-Item "$env:TEMP\cttlogo.ico" "$($scratchDir)\Windows\cttlogo.ico" -force
+        #     Copy-Item "$env:TEMP\cttlogo.ico" "$($scratchDir)\Windows\cttlogo.ico" -force
-		# 	$shortcut.IconLocation = "c:\Windows\cttlogo.ico"
+        #     $shortcut.IconLocation = "c:\Windows\cttlogo.ico"
-		# }
+        # }
 
-		# $shortcut.TargetPath = "powershell.exe"
+        # $shortcut.TargetPath = "powershell.exe"
-		# $shortcut.Arguments = "-NoProfile -ExecutionPolicy Bypass -Command `"$command`""
+        # $shortcut.Arguments = "-NoProfile -ExecutionPolicy Bypass -Command `"$command`""
-		# $shortcut.Save()
+        # $shortcut.Save()
-		# Write-Host "Shortcut to winutil created at: $shortcutPath"
+        # Write-Host "Shortcut to winutil created at: $shortcutPath"
-		# *************************** Automation black ***************************
+        # *************************** Automation black ***************************
 
-		Write-Host "Copy checkinstall.cmd into the ISO"
+        Write-Host "Copy checkinstall.cmd into the ISO"
-		New-CheckInstall
+        New-CheckInstall
-		Copy-Item "$env:temp\checkinstall.cmd" "$($scratchDir)\Windows\checkinstall.cmd" -force
+        Copy-Item "$env:temp\checkinstall.cmd" "$($scratchDir)\Windows\checkinstall.cmd" -force
-		Write-Host "Done copy checkinstall.cmd"
+        Write-Host "Done copy checkinstall.cmd"
 
-		Write-Host "Creating a directory that allows to bypass Wifi setup"
+        Write-Host "Creating a directory that allows to bypass Wifi setup"
-		New-Item -ItemType Directory -Force -Path "$($scratchDir)\Windows\System32\OOBE\BYPASSNRO"
+        New-Item -ItemType Directory -Force -Path "$($scratchDir)\Windows\System32\OOBE\BYPASSNRO"
 
-		Write-Host "Loading registry"
+        Write-Host "Loading registry"
-		reg load HKLM\zCOMPONENTS "$($scratchDir)\Windows\System32\config\COMPONENTS"
+        reg load HKLM\zCOMPONENTS "$($scratchDir)\Windows\System32\config\COMPONENTS"
-		reg load HKLM\zDEFAULT "$($scratchDir)\Windows\System32\config\default"
+        reg load HKLM\zDEFAULT "$($scratchDir)\Windows\System32\config\default"
-		reg load HKLM\zNTUSER "$($scratchDir)\Users\Default\ntuser.dat"
+        reg load HKLM\zNTUSER "$($scratchDir)\Users\Default\ntuser.dat"
-		reg load HKLM\zSOFTWARE "$($scratchDir)\Windows\System32\config\SOFTWARE"
+        reg load HKLM\zSOFTWARE "$($scratchDir)\Windows\System32\config\SOFTWARE"
-		reg load HKLM\zSYSTEM "$($scratchDir)\Windows\System32\config\SYSTEM"
+        reg load HKLM\zSYSTEM "$($scratchDir)\Windows\System32\config\SYSTEM"
 
-		Write-Host "Disabling Teams"
+        Write-Host "Disabling Teams"
-		reg add "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Communications" /v "ConfigureChatAutoInstall" /t REG_DWORD /d 0 /f   >$null 2>&1
+        reg add "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Communications" /v "ConfigureChatAutoInstall" /t REG_DWORD /d 0 /f   >$null 2>&1
-		reg add "HKLM\zSOFTWARE\Policies\Microsoft\Windows\Windows Chat" /v ChatIcon /t REG_DWORD /d 2 /f                             >$null 2>&1
+        reg add "HKLM\zSOFTWARE\Policies\Microsoft\Windows\Windows Chat" /v ChatIcon /t REG_DWORD /d 2 /f                             >$null 2>&1
-		reg add "HKLM\zNTUSER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarMn" /t REG_DWORD /d 0 /f        >$null 2>&1
+        reg add "HKLM\zNTUSER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarMn" /t REG_DWORD /d 0 /f        >$null 2>&1
-		reg query "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Communications" /v "ConfigureChatAutoInstall"                      >$null 2>&1
+        reg query "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Communications" /v "ConfigureChatAutoInstall"                      >$null 2>&1
-		# Write-Host Error code $LASTEXITCODE
+        # Write-Host Error code $LASTEXITCODE
-		Write-Host "Done disabling Teams"
+        Write-Host "Done disabling Teams"
 
-		Write-Host "Bypassing system requirements (system image)"
+        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 "SV1" /t REG_DWORD /d 0 /f
-		reg add "HKLM\zDEFAULT\Control Panel\UnsupportedHardwareNotificationCache" /v "SV2" /t REG_DWORD /d 0 /f
+        reg add "HKLM\zDEFAULT\Control Panel\UnsupportedHardwareNotificationCache" /v "SV2" /t REG_DWORD /d 0 /f
-		reg add "HKLM\zNTUSER\Control Panel\UnsupportedHardwareNotificationCache" /v "SV1" /t REG_DWORD /d 0 /f
+        reg add "HKLM\zNTUSER\Control Panel\UnsupportedHardwareNotificationCache" /v "SV1" /t REG_DWORD /d 0 /f
-		reg add "HKLM\zNTUSER\Control Panel\UnsupportedHardwareNotificationCache" /v "SV2" /t REG_DWORD /d 0 /f
+        reg add "HKLM\zNTUSER\Control Panel\UnsupportedHardwareNotificationCache" /v "SV2" /t REG_DWORD /d 0 /f
-		reg add "HKLM\zSYSTEM\Setup\LabConfig" /v "BypassCPUCheck" /t REG_DWORD /d 1 /f
+        reg add "HKLM\zSYSTEM\Setup\LabConfig" /v "BypassCPUCheck" /t REG_DWORD /d 1 /f
-		reg add "HKLM\zSYSTEM\Setup\LabConfig" /v "BypassRAMCheck" /t REG_DWORD /d 1 /f
+        reg add "HKLM\zSYSTEM\Setup\LabConfig" /v "BypassRAMCheck" /t REG_DWORD /d 1 /f
-		reg add "HKLM\zSYSTEM\Setup\LabConfig" /v "BypassSecureBootCheck" /t REG_DWORD /d 1 /f
+        reg add "HKLM\zSYSTEM\Setup\LabConfig" /v "BypassSecureBootCheck" /t REG_DWORD /d 1 /f
-		reg add "HKLM\zSYSTEM\Setup\LabConfig" /v "BypassStorageCheck" /t REG_DWORD /d 1 /f
+        reg add "HKLM\zSYSTEM\Setup\LabConfig" /v "BypassStorageCheck" /t REG_DWORD /d 1 /f
-		reg add "HKLM\zSYSTEM\Setup\LabConfig" /v "BypassTPMCheck" /t REG_DWORD /d 1 /f
+        reg add "HKLM\zSYSTEM\Setup\LabConfig" /v "BypassTPMCheck" /t REG_DWORD /d 1 /f
-		reg add "HKLM\zSYSTEM\Setup\MoSetup" /v "AllowUpgradesWithUnsupportedTPMOrCPU" /t REG_DWORD /d 1 /f
+        reg add "HKLM\zSYSTEM\Setup\MoSetup" /v "AllowUpgradesWithUnsupportedTPMOrCPU" /t REG_DWORD /d 1 /f
 
-		if (!$keepEdge)
+        if (!$keepEdge) {
-		{
+            Write-Host "Removing Edge icon from taskbar"
-			Write-Host "Removing Edge icon from taskbar"
+            reg delete "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Taskband" /v "Favorites" /f           >$null 2>&1
-			reg delete "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Taskband" /v "Favorites" /f 		  >$null 2>&1
+            reg delete "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Taskband" /v "FavoritesChanges" /f   >$null 2>&1
-			reg delete "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Taskband" /v "FavoritesChanges" /f   >$null 2>&1
+            reg delete "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Taskband" /v "Pinned" /f             >$null 2>&1
-			reg delete "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Taskband" /v "Pinned" /f             >$null 2>&1
+            reg delete "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Taskband" /v "LayoutCycle" /f        >$null 2>&1
-			reg delete "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Taskband" /v "LayoutCycle" /f        >$null 2>&1
+            Write-Host "Edge icon removed from taskbar"
-			Write-Host "Edge icon removed from taskbar"
+            if (Test-Path "HKLM:\zSOFTWARE\WOW6432Node") {
-			if (Test-Path "HKLM:\zSOFTWARE\WOW6432Node")
+                # Remove leftovers of 64-bit installations
-			{
+                # ---
-				# Remove leftovers of 64-bit installations
+                # Remove registry values first...
-				# ---
+                reg delete "HKLM\zSOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge" /va /f > $null 2>&1
-				# Remove registry values first...
+                reg delete "HKLM\zSOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge Update" /va /f > $null 2>&1
-				reg delete "HKLM\zSOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge" /va /f > $null 2>&1
+                reg delete "HKLM\zSOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft EdgeWebView" /va /f > $null 2>&1
-				reg delete "HKLM\zSOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge Update" /va /f > $null 2>&1
+                # ...then the registry keys
-				reg delete "HKLM\zSOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft EdgeWebView" /va /f > $null 2>&1
+                reg delete "HKLM\zSOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge" /f > $null 2>&1
-				# ...then the registry keys
+                reg delete "HKLM\zSOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge Update" /f > $null 2>&1
-				reg delete "HKLM\zSOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge" /f > $null 2>&1
+                reg delete "HKLM\zSOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft EdgeWebView" /f > $null 2>&1
-				reg delete "HKLM\zSOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge Update" /f > $null 2>&1
+            }
-				reg delete "HKLM\zSOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft EdgeWebView" /f > $null 2>&1
+        }
-			}
-		}
 
-		reg add "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "SearchboxTaskbarMode" /t REG_DWORD /d 0 /f
+        reg add "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "SearchboxTaskbarMode" /t REG_DWORD /d 0 /f
-		Write-Host "Setting all services to start manually"
+        Write-Host "Setting all services to start manually"
-		reg add "HKLM\zSOFTWARE\CurrentControlSet\Services" /v Start /t REG_DWORD /d 3 /f
+        reg add "HKLM\zSOFTWARE\CurrentControlSet\Services" /v Start /t REG_DWORD /d 3 /f
-		# Write-Host $LASTEXITCODE
+        # Write-Host $LASTEXITCODE
 
-		Write-Host "Enabling Local Accounts on OOBE"
+        Write-Host "Enabling Local Accounts on OOBE"
-		reg add "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\OOBE" /v "BypassNRO" /t REG_DWORD /d "1" /f
+        reg add "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\OOBE" /v "BypassNRO" /t REG_DWORD /d "1" /f
 
-		Write-Host "Disabling Sponsored Apps"
+        Write-Host "Disabling Sponsored Apps"
-		reg add "HKLM\zNTUSER\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "OemPreInstalledAppsEnabled" /t REG_DWORD /d 0 /f
+        reg add "HKLM\zNTUSER\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "OemPreInstalledAppsEnabled" /t REG_DWORD /d 0 /f
-		reg add "HKLM\zNTUSER\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "PreInstalledAppsEnabled" /t REG_DWORD /d 0 /f
+        reg add "HKLM\zNTUSER\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "PreInstalledAppsEnabled" /t REG_DWORD /d 0 /f
-		reg add "HKLM\zNTUSER\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SilentInstalledAppsEnabled" /t REG_DWORD /d 0 /f
+        reg add "HKLM\zNTUSER\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SilentInstalledAppsEnabled" /t REG_DWORD /d 0 /f
-		reg add "HKLM\zSOFTWARE\Policies\Microsoft\Windows\CloudContent" /v "DisableWindowsConsumerFeatures" /t REG_DWORD /d 1 /f
+        reg add "HKLM\zSOFTWARE\Policies\Microsoft\Windows\CloudContent" /v "DisableWindowsConsumerFeatures" /t REG_DWORD /d 1 /f
-		reg add "HKLM\zSOFTWARE\Microsoft\PolicyManager\current\device\Start" /v "ConfigureStartPins" /t REG_SZ /d '{\"pinnedList\": [{}]}' /f
+        reg add "HKLM\zSOFTWARE\Microsoft\PolicyManager\current\device\Start" /v "ConfigureStartPins" /t REG_SZ /d '{\"pinnedList\": [{}]}' /f
-		Write-Host "Done removing Sponsored Apps"
+        Write-Host "Done removing Sponsored Apps"
 
-		Write-Host "Disabling Reserved Storage"
+        Write-Host "Disabling Reserved Storage"
-		reg add "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\ReserveManager" /v "ShippedWithReserves" /t REG_DWORD /d 0 /f
+        reg add "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\ReserveManager" /v "ShippedWithReserves" /t REG_DWORD /d 0 /f
 
-		Write-Host "Changing theme to dark. This only works on Activated Windows"
+        Write-Host "Changing theme to dark. This only works on Activated Windows"
-		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 "AppsUseLightTheme" /t REG_DWORD /d 0 /f
-		reg add "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize" /v "SystemUsesLightTheme" /t REG_DWORD /d 0 /f
+        reg add "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize" /v "SystemUsesLightTheme" /t REG_DWORD /d 0 /f
 
-	} catch {
+    } catch {
         Write-Error "An unexpected error occurred: $_"
     } finally {
-		Write-Host "Unmounting Registry..."
+        Write-Host "Unmounting Registry..."
-		reg unload HKLM\zCOMPONENTS
+        reg unload HKLM\zCOMPONENTS
-		reg unload HKLM\zDEFAULT
+        reg unload HKLM\zDEFAULT
-		reg unload HKLM\zNTUSER
+        reg unload HKLM\zNTUSER
-		reg unload HKLM\zSOFTWARE
+        reg unload HKLM\zSOFTWARE
-		reg unload HKLM\zSYSTEM
+        reg unload HKLM\zSYSTEM
 
-		Write-Host "Cleaning up image..."
+        Write-Host "Cleaning up image..."
-		dism /English /image:$scratchDir /Cleanup-Image /StartComponentCleanup /ResetBase
+        dism /English /image:$scratchDir /Cleanup-Image /StartComponentCleanup /ResetBase
-		Write-Host "Cleanup complete."
+        Write-Host "Cleanup complete."
 
-		Write-Host "Unmounting image..."
+        Write-Host "Unmounting image..."
         Dismount-WindowsImage -Path $scratchDir -Save
-	}
+    }
 
-	try {
+    try {
 
-		Write-Host "Exporting image into $mountDir\sources\install2.wim"
+        Write-Host "Exporting image into $mountDir\sources\install2.wim"
         Export-WindowsImage -SourceImagePath "$mountDir\sources\install.wim" -SourceIndex $index -DestinationImagePath "$mountDir\sources\install2.wim" -CompressionType "Max"
-		Write-Host "Remove old '$mountDir\sources\install.wim' and rename $mountDir\sources\install2.wim"
+        Write-Host "Remove old '$mountDir\sources\install.wim' and rename $mountDir\sources\install2.wim"
-		Remove-Item "$mountDir\sources\install.wim"
+        Remove-Item "$mountDir\sources\install.wim"
-		Rename-Item "$mountDir\sources\install2.wim" "$mountDir\sources\install.wim"
+        Rename-Item "$mountDir\sources\install2.wim" "$mountDir\sources\install.wim"
 
-		if (-not (Test-Path -Path "$mountDir\sources\install.wim"))
+        if (-not (Test-Path -Path "$mountDir\sources\install.wim")) {
-		{
+            Write-Error "Something went wrong and '$mountDir\sources\install.wim' doesn't exist. Please report this bug to the devs"
-			Write-Error "Something went wrong and '$mountDir\sources\install.wim' doesn't exist. Please report this bug to the devs"
+            Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
-			Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
+            return
-			return
+        }
-		}
+        Write-Host "Windows image completed. Continuing with boot.wim."
-		Write-Host "Windows image completed. Continuing with boot.wim."
 
-		# Next step boot image
+        # Next step boot image
-		Write-Host "Mounting boot image $mountDir\sources\boot.wim into $scratchDir"
+        Write-Host "Mounting boot image $mountDir\sources\boot.wim into $scratchDir"
         Mount-WindowsImage -ImagePath "$mountDir\sources\boot.wim" -Index 2 -Path "$scratchDir"
 
-		if ($injectDrivers)
+        if ($injectDrivers) {
-		{
+            $driverPath = $sync.MicrowinDriverLocation.Text
-			$driverPath = $sync.MicrowinDriverLocation.Text
+            if (Test-Path $driverPath) {
-			if (Test-Path $driverPath)
+                Write-Host "Adding Windows Drivers image($scratchDir) drivers($driverPath) "
-			{
+                dism /English /image:$scratchDir /add-driver /driver:$driverPath /recurse | Out-Host
-				Write-Host "Adding Windows Drivers image($scratchDir) drivers($driverPath) "
+            } else {
-				dism /English /image:$scratchDir /add-driver /driver:$driverPath /recurse | Out-Host
+                Write-Host "Path to drivers is invalid continuing without driver injection"
-			}
+            }
-			else
+        }
-			{
-				Write-Host "Path to drivers is invalid continuing without driver injection"
-			}
-		}
 
-		Write-Host "Loading registry..."
+        Write-Host "Loading registry..."
-		reg load HKLM\zCOMPONENTS "$($scratchDir)\Windows\System32\config\COMPONENTS" >$null
+        reg load HKLM\zCOMPONENTS "$($scratchDir)\Windows\System32\config\COMPONENTS" >$null
-		reg load HKLM\zDEFAULT "$($scratchDir)\Windows\System32\config\default" >$null
+        reg load HKLM\zDEFAULT "$($scratchDir)\Windows\System32\config\default" >$null
-		reg load HKLM\zNTUSER "$($scratchDir)\Users\Default\ntuser.dat" >$null
+        reg load HKLM\zNTUSER "$($scratchDir)\Users\Default\ntuser.dat" >$null
-		reg load HKLM\zSOFTWARE "$($scratchDir)\Windows\System32\config\SOFTWARE" >$null
+        reg load HKLM\zSOFTWARE "$($scratchDir)\Windows\System32\config\SOFTWARE" >$null
-		reg load HKLM\zSYSTEM "$($scratchDir)\Windows\System32\config\SYSTEM" >$null
+        reg load HKLM\zSYSTEM "$($scratchDir)\Windows\System32\config\SYSTEM" >$null
-		Write-Host "Bypassing system requirements on the setup image"
+        Write-Host "Bypassing system requirements on the setup image"
-		reg add "HKLM\zDEFAULT\Control Panel\UnsupportedHardwareNotificationCache" /v "SV1" /t REG_DWORD /d 0 /f
+        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
+        reg add "HKLM\zDEFAULT\Control Panel\UnsupportedHardwareNotificationCache" /v "SV2" /t REG_DWORD /d 0 /f
-		reg add "HKLM\zNTUSER\Control Panel\UnsupportedHardwareNotificationCache" /v "SV1" /t REG_DWORD /d 0 /f
+        reg add "HKLM\zNTUSER\Control Panel\UnsupportedHardwareNotificationCache" /v "SV1" /t REG_DWORD /d 0 /f
-		reg add "HKLM\zNTUSER\Control Panel\UnsupportedHardwareNotificationCache" /v "SV2" /t REG_DWORD /d 0 /f
+        reg add "HKLM\zNTUSER\Control Panel\UnsupportedHardwareNotificationCache" /v "SV2" /t REG_DWORD /d 0 /f
-		reg add "HKLM\zSYSTEM\Setup\LabConfig" /v "BypassCPUCheck" /t REG_DWORD /d 1 /f
+        reg add "HKLM\zSYSTEM\Setup\LabConfig" /v "BypassCPUCheck" /t REG_DWORD /d 1 /f
-		reg add "HKLM\zSYSTEM\Setup\LabConfig" /v "BypassRAMCheck" /t REG_DWORD /d 1 /f
+        reg add "HKLM\zSYSTEM\Setup\LabConfig" /v "BypassRAMCheck" /t REG_DWORD /d 1 /f
-		reg add "HKLM\zSYSTEM\Setup\LabConfig" /v "BypassSecureBootCheck" /t REG_DWORD /d 1 /f
+        reg add "HKLM\zSYSTEM\Setup\LabConfig" /v "BypassSecureBootCheck" /t REG_DWORD /d 1 /f
-		reg add "HKLM\zSYSTEM\Setup\LabConfig" /v "BypassStorageCheck" /t REG_DWORD /d 1 /f
+        reg add "HKLM\zSYSTEM\Setup\LabConfig" /v "BypassStorageCheck" /t REG_DWORD /d 1 /f
-		reg add "HKLM\zSYSTEM\Setup\LabConfig" /v "BypassTPMCheck" /t REG_DWORD /d 1 /f
+        reg add "HKLM\zSYSTEM\Setup\LabConfig" /v "BypassTPMCheck" /t REG_DWORD /d 1 /f
-		reg add "HKLM\zSYSTEM\Setup\MoSetup" /v "AllowUpgradesWithUnsupportedTPMOrCPU" /t REG_DWORD /d 1 /f
+        reg add "HKLM\zSYSTEM\Setup\MoSetup" /v "AllowUpgradesWithUnsupportedTPMOrCPU" /t REG_DWORD /d 1 /f
-		# Fix Computer Restarted Unexpectedly Error on New Bare Metal Install
+        # Fix Computer Restarted Unexpectedly Error on New Bare Metal Install
-		reg add "HKLM\zSYSTEM\Setup\Status\ChildCompletion" /v "setup.exe" /t REG_DWORD /d 3 /f
+        reg add "HKLM\zSYSTEM\Setup\Status\ChildCompletion" /v "setup.exe" /t REG_DWORD /d 3 /f
-	} catch {
+    } catch {
         Write-Error "An unexpected error occurred: $_"
     } finally {
-		Write-Host "Unmounting Registry..."
+        Write-Host "Unmounting Registry..."
-		reg unload HKLM\zCOMPONENTS
+        reg unload HKLM\zCOMPONENTS
-		reg unload HKLM\zDEFAULT
+        reg unload HKLM\zDEFAULT
-		reg unload HKLM\zNTUSER
+        reg unload HKLM\zNTUSER
-		reg unload HKLM\zSOFTWARE
+        reg unload HKLM\zSOFTWARE
-		reg unload HKLM\zSYSTEM
+        reg unload HKLM\zSYSTEM
 
-		Write-Host "Unmounting image..."
+        Write-Host "Unmounting image..."
         Dismount-WindowsImage -Path $scratchDir -Save
 
-		Write-Host "Creating ISO image"
+        Write-Host "Creating ISO image"
 
-		# if we downloaded oscdimg from github it will be in the temp directory so use it
+        # if we downloaded oscdimg from github it will be in the temp directory so use it
-		# if it is not in temp it is part of ADK and is in global PATH so just set it to oscdimg.exe
+        # if it is not in temp it is part of ADK and is in global PATH so just set it to oscdimg.exe
-		$oscdimgPath = Join-Path $env:TEMP 'oscdimg.exe'
+        $oscdimgPath = Join-Path $env:TEMP 'oscdimg.exe'
-		$oscdImgFound = Test-Path $oscdimgPath -PathType Leaf
+        $oscdImgFound = Test-Path $oscdimgPath -PathType Leaf
-		if (!$oscdImgFound)
+        if (!$oscdImgFound) {
-		{
+            $oscdimgPath = "oscdimg.exe"
-			$oscdimgPath = "oscdimg.exe"
+        }
-		}
 
-		Write-Host "[INFO] Using oscdimg.exe from: $oscdimgPath"
+        Write-Host "[INFO] Using oscdimg.exe from: $oscdimgPath"
         
-		$oscdimgProc = Start-Process -FilePath "$oscdimgPath" -ArgumentList "-m -o -u2 -udfver102 -bootdata:2#p0,e,b$mountDir\boot\etfsboot.com#pEF,e,b$mountDir\efi\microsoft\boot\efisys.bin `"$mountDir`" `"$($SaveDialog.FileName)`"" -Wait -PassThru -NoNewWindow
+        $oscdimgProc = Start-Process -FilePath "$oscdimgPath" -ArgumentList "-m -o -u2 -udfver102 -bootdata:2#p0,e,b$mountDir\boot\etfsboot.com#pEF,e,b$mountDir\efi\microsoft\boot\efisys.bin `"$mountDir`" `"$($SaveDialog.FileName)`"" -Wait -PassThru -NoNewWindow
         
-		$LASTEXITCODE = $oscdimgProc.ExitCode
+        $LASTEXITCODE = $oscdimgProc.ExitCode
         
-		Write-Host "OSCDIMG Error Level : $($oscdimgProc.ExitCode)"
+        Write-Host "OSCDIMG Error Level : $($oscdimgProc.ExitCode)"
 
-		if ($copyToUSB)
+        if ($copyToUSB) {
-		{
+            Write-Host "Copying target ISO to the USB drive"
-			Write-Host "Copying target ISO to the USB drive"
+            Copy-ToUSB("$($SaveDialog.FileName)")
-			Copy-ToUSB("$($SaveDialog.FileName)")
+            if ($?) { Write-Host "Done Copying target ISO to USB drive!" } else { Write-Host "ISO copy failed." }
-			if ($?) { Write-Host "Done Copying target ISO to USB drive!" } else { Write-Host "ISO copy failed." }
+        }
-		}
 
-		Write-Host " _____                       "
+        Write-Host " _____                       "
-		Write-Host "(____ \                      "
+        Write-Host "(____ \                      "
-		Write-Host " _   \ \ ___  ____   ____    "
+        Write-Host " _   \ \ ___  ____   ____    "
-		Write-Host "| |   | / _ \|  _ \ / _  )   "
+        Write-Host "| |   | / _ \|  _ \ / _  )   "
-		Write-Host "| |__/ / |_| | | | ( (/ /    "
+        Write-Host "| |__/ / |_| | | | ( (/ /    "
-		Write-Host "|_____/ \___/|_| |_|\____)   "
+        Write-Host "|_____/ \___/|_| |_|\____)   "
 
-		# Check if the ISO was successfully created - CTT edit
+        # Check if the ISO was successfully created - CTT edit
-		if ($LASTEXITCODE -eq 0) {
+        if ($LASTEXITCODE -eq 0) {
-			Write-Host "`n`nPerforming Cleanup..."
+            Write-Host "`n`nPerforming Cleanup..."
-				Remove-Item -Recurse -Force "$($scratchDir)"
+                Remove-Item -Recurse -Force "$($scratchDir)"
-				Remove-Item -Recurse -Force "$($mountDir)"
+                Remove-Item -Recurse -Force "$($mountDir)"
-			$msg = "Done. ISO image is located here: $($SaveDialog.FileName)"
+            $msg = "Done. ISO image is located here: $($SaveDialog.FileName)"
-			Write-Host $msg
+            Write-Host $msg
-			Set-WinUtilTaskbaritem -state "None" -overlay "checkmark"
+            Set-WinUtilTaskbaritem -state "None" -overlay "checkmark"
-			[System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Information)
+            [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Information)
-		} else {
+        } else {
-			Write-Host "ISO creation failed. The "$($mountDir)" directory has not been removed."
+            Write-Host "ISO creation failed. The "$($mountDir)" directory has not been removed."
-			try
+            try {
-			{
+                # This creates a new Win32 exception from which we can extract a message in the system language.
-				# This creates a new Win32 exception from which we can extract a message in the system language.
+                # Now, this will NOT throw an exception
-				# Now, this will NOT throw an exception
+                $exitCode = New-Object System.ComponentModel.Win32Exception($LASTEXITCODE)
-				$exitCode = New-Object System.ComponentModel.Win32Exception($LASTEXITCODE)
+                Write-Host "Reason: $($exitCode.Message)"
-				Write-Host "Reason: $($exitCode.Message)"
+            } catch {
-			}
+                # Could not get error description from Windows APIs
-			catch
+            }
-			{
+        }
-				# Could not get error description from Windows APIs
-			}
-		}
 
-		$sync.MicrowinOptionsPanel.Visibility = 'Collapsed'
+        $sync.MicrowinOptionsPanel.Visibility = 'Collapsed'
 
-		#$sync.MicrowinFinalIsoLocation.Text = "$env:temp\microwin.iso"
+        #$sync.MicrowinFinalIsoLocation.Text = "$env:temp\microwin.iso"
         $sync.MicrowinFinalIsoLocation.Text = "$($SaveDialog.FileName)"
-		# Allow the machine to sleep again (optional)
+        # Allow the machine to sleep again (optional)
-		[PowerManagement]::SetThreadExecutionState(0)
+        [PowerManagement]::SetThreadExecutionState(0)
-		$sync.ProcessRunning = $false
+        $sync.ProcessRunning = $false
-	}
+    }
 }

functions/public/Invoke-WPFOOSU.ps1

@@ -10,8 +10,7 @@ function Invoke-WPFOOSU {
         Invoke-WebRequest -Uri "https://dl5.oo-software.com/files/ooshutup10/OOSU10.exe" -OutFile $OOSU_filepath
         Write-Host "Starting OO Shutup 10 ..."
         Start-Process $OOSU_filepath
-    }
+    } catch {
-    catch {
         Write-Host "Error Downloading and Running OO Shutup 10" -ForegroundColor Red
     }
     finally {

functions/public/Invoke-WPFPresets.ps1

@@ -20,10 +20,9 @@ function Invoke-WPFPresets {
         [bool]$imported = $false
     )
 
-    if($imported -eq $true){
+    if($imported -eq $true) {
         $CheckBoxesToCheck = $preset
-    }
+    } else {
-    Else{
         $CheckBoxesToCheck = $sync.configs.preset.$preset
     }
 
@@ -39,8 +38,7 @@ function Invoke-WPFPresets {
     foreach ($CheckBox in $CheckBoxes) {
         $checkboxName = $CheckBox.Key
 
-        if (-not $CheckBoxesToCheck)
+        if (-not $CheckBoxesToCheck) {
-        {
             $sync.$checkboxName.IsChecked = $false
             continue
         }

functions/public/Invoke-WPFRunspace.ps1

@@ -38,8 +38,7 @@ function Invoke-WPFRunspace {
     $script:handle = $script:powershell.BeginInvoke()
 
     # Clean up the RunspacePool threads when they are complete, and invoke the garbage collector to clean up the memory
-    if ($script:handle.IsCompleted)
+    if ($script:handle.IsCompleted) {
-    {
         $script:powershell.EndInvoke($script:handle)
         $script:powershell.Dispose()
         $sync.runspace.Dispose()

functions/public/Invoke-WPFShortcut.ps1

@@ -21,10 +21,9 @@ function Invoke-WPFShortcut {
     Switch ($ShortcutToAdd) {
         "WinUtil" {
             # Use Powershell 7 if installed and fallback to PS5 if not
-            if (Get-Command "pwsh" -ErrorAction SilentlyContinue){
+            if (Get-Command "pwsh" -ErrorAction SilentlyContinue) {
                 $shell = "pwsh.exe"
-            }
+            } else {
-            else{
                 $shell = "powershell.exe"
             }
 

functions/public/Invoke-WPFTab.ps1

@@ -21,8 +21,7 @@ function Invoke-WPFTab {
             $sync[$PSItem.Name].IsChecked = $false
             # $tabNumber = [int]($PSItem.Name -replace "WPFTab","" -replace "BT","") - 1
             # $sync.$tabNav.Items[$tabNumber].IsSelected = $false
-        }
+        } else {
-        else {
             $sync["$ClickedTab"].IsChecked = $true
             $tabNumber = [int]($ClickedTab-replace "WPFTab","" -replace "BT","") - 1
             $sync.$tabNav.Items[$tabNumber].IsSelected = $true

functions/public/Invoke-WPFToggle.ps1

@@ -15,7 +15,7 @@ function Invoke-WPFToggle {
     # Use this to get the name of the button
     #[System.Windows.MessageBox]::Show("$Button","Chris Titus Tech's Windows Utility","OK","Info")
 
-    Switch -Wildcard ($Button){
+    Switch -Wildcard ($Button) {
 
         "WPFToggleDarkMode" {Invoke-WinUtilDarkMode -DarkMoveEnabled $(Get-WinUtilToggleStatus WPFToggleDarkMode)}
         "WPFToggleBingSearch" {Invoke-WinUtilBingSearch $(Get-WinUtilToggleStatus WPFToggleBingSearch)}

functions/public/Invoke-WPFTweakPS7.ps1

@@ -26,13 +26,13 @@ function Invoke-WPFTweakPS7{
         }
     }
     # Check if the Windows Terminal is installed and return if not (Prerequisite for the following code)
-    if (-not (Get-Command "wt" -ErrorAction SilentlyContinue)){
+    if (-not (Get-Command "wt" -ErrorAction SilentlyContinue)) {
         Write-Host "Windows Terminal not installed. Skipping Terminal preference"
         return
     }
     # Check if the Windows Terminal settings.json file exists and return if not (Prereqisite for the following code)
     $settingsPath = "$env:LOCALAPPDATA\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json"
-    if (-not (Test-Path -Path $settingsPath)){
+    if (-not (Test-Path -Path $settingsPath)) {
         Write-Host "Windows Terminal Settings file not found at $settingsPath"
         return
     }

functions/public/Invoke-WPFUltimatePerformance.ps1

@@ -9,10 +9,10 @@ Function Invoke-WPFUltimatePerformance {
 
     #>
     param($State)
-    Try{
+    try {
         # Check if Ultimate Performance plan is installed
         $ultimatePlan = powercfg -list | Select-String -Pattern "Ultimate Performance"
-        if($state -eq "Enable"){
+        if($state -eq "Enable") {
             if ($ultimatePlan) {
                 Write-Host "Ultimate Performance plan is already installed."
             } else {
@@ -29,7 +29,7 @@ Function Invoke-WPFUltimatePerformance {
 
 
         }
-        elseif($state -eq "Disable"){
+        elseif($state -eq "Disable") {
             if ($ultimatePlan) {
                 # Extract the GUID of the Ultimate Performance plan
                 $ultimatePlanGUID = $ultimatePlan.Line.Split()[3]
@@ -47,7 +47,7 @@ Function Invoke-WPFUltimatePerformance {
                 Write-Host "Ultimate Performance plan is not installed."
             }
         }
-    } Catch{
+    } catch {
         Write-Warning $psitem.Exception.Message
     }
 }

functions/public/Invoke-WPFUnInstall.ps1

@@ -6,7 +6,7 @@ function Invoke-WPFUnInstall {
 
     #>
 
-    if($sync.ProcessRunning){
+    if($sync.ProcessRunning) {
         $msg = "[Invoke-WPFUnInstall] Install process is currently running"
         [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
         return
@@ -27,12 +27,12 @@ function Invoke-WPFUnInstall {
 
     $confirm = [System.Windows.MessageBox]::Show($Messageboxbody, $MessageboxTitle, $ButtonType, $MessageIcon)
 
-    if($confirm -eq "No"){return}
+    if($confirm -eq "No") {return}
 
 
     Invoke-WPFRunspace -ArgumentList $PackagesToInstall -DebugPreference $DebugPreference -ScriptBlock {
         param($PackagesToInstall, $DebugPreference)
-        if ($PackagesToInstall.count -eq 1){
+        if ($PackagesToInstall.count -eq 1) {
             $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })
         } else {
             $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Normal" -value 0.01 -overlay "logo" })
@@ -51,14 +51,14 @@ function Invoke-WPFUnInstall {
             }
             return $packagesWinget, $packagesChoco
         }.Invoke($PackagesToInstall)
-        try{
+        try {
             $sync.ProcessRunning = $true
 
             # Install all selected programs in new window
-            if($packagesWinget.Count -gt 0){
+            if($packagesWinget.Count -gt 0) {
                 Invoke-WinUtilWingetProgram -Action Uninstall -Programs $packagesWinget
             }
-            if($packagesChoco.Count -gt 0){
+            if($packagesChoco.Count -gt 0) {
                 Install-WinUtilProgramChoco -ProgramsToInstall $packagesChoco -Manage "Uninstalling"
             }
 
@@ -66,8 +66,7 @@ function Invoke-WPFUnInstall {
             Write-Host "--       Uninstalls have finished       ---"
             Write-Host "==========================================="
             $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" })
-        }
+        } catch {
-        Catch {
             Write-Host "==========================================="
             Write-Host "Error: $_"
             Write-Host "==========================================="

functions/public/Invoke-WPFtweaksbutton.ps1

@@ -6,7 +6,7 @@ function Invoke-WPFtweaksbutton {
 
   #>
 
-  if($sync.ProcessRunning){
+  if($sync.ProcessRunning) {
     $msg = "[Invoke-WPFtweaksbutton] Install process is currently running."
     [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
     return
@@ -16,7 +16,7 @@ function Invoke-WPFtweaksbutton {
 
   Set-WinUtilDNS -DNSProvider $sync["WPFchangedns"].text
 
-  if ($tweaks.count -eq 0 -and  $sync["WPFchangedns"].text -eq "Default"){
+  if ($tweaks.count -eq 0 -and  $sync["WPFchangedns"].text -eq "Default") {
     $msg = "Please check the tweaks you wish to perform."
     [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
     return
@@ -30,17 +30,16 @@ function Invoke-WPFtweaksbutton {
 
     $sync.ProcessRunning = $true
 
-    if ($Tweaks.count -eq 1){
+    if ($Tweaks.count -eq 1) {
         $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })
     } else {
         $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Normal" -value 0.01 -overlay "logo" })
     }
     # Execute other selected tweaks
     
-    for ($i = 0; $i -lt $Tweaks.Count; $i++){
+    for ($i = 0; $i -lt $Tweaks.Count; $i++) {
       Set-WinUtilProgressBar -Label "Applying $($tweaks[$i])" -Percent ($i / $Tweaks.Count * 100)
-      Invoke-WinUtilTweaks $tweaks[$i]
+      Invoke-WinUtilTweaks $tweaks[$i]$sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -value ($i/$Tweaks.Count) })
-      $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -value ($i/$Tweaks.Count) })
     }
     Set-WinUtilProgressBar -Label "Tweaks finished" -Percent 100
     $sync.ProcessRunning = $false

functions/public/Invoke-WPFundoall.ps1

@@ -6,7 +6,7 @@ function Invoke-WPFundoall {
 
     #>
 
-    if($sync.ProcessRunning){
+    if($sync.ProcessRunning) {
         $msg = "[Invoke-WPFundoall] Install process is currently running."
         [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
         return
@@ -14,7 +14,7 @@ function Invoke-WPFundoall {
 
     $tweaks = (Get-WinUtilCheckBoxes)["WPFtweaks"]
 
-    if ($tweaks.count -eq 0){
+    if ($tweaks.count -eq 0) {
         $msg = "Please check the tweaks you wish to undo."
         [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
         return
@@ -24,14 +24,14 @@ function Invoke-WPFundoall {
         param($tweaks, $DebugPreference)
 
         $sync.ProcessRunning = $true
-        if ($tweaks.count -eq 1){
+        if ($tweaks.count -eq 1) {
             $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })
         } else {
             $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Normal" -value 0.01 -overlay "logo" })
         }
         
 
-        for ($i = 0; $i -lt $tweaks.Count; $i++){
+        for ($i = 0; $i -lt $tweaks.Count; $i++) {
             Set-WinUtilProgressBar -Label "Undoing $($tweaks[$i])" -Percent ($i / $tweaks.Count * 100)
             Invoke-WinUtiltweaks $tweaks[$i] -undo $true
             $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -value ($i/$tweaks.Count) })

pester/configs.Tests.ps1

@@ -25,19 +25,19 @@ Describe "Config Files" -ForEach @(
         name = "tweaks"
         undo = $true
     }
-){
+) {
     Context "$name config file" {
         It "Imports with no errors" {
             $global:importedconfigs.$name | should -Not -BeNullOrEmpty
         }
-        if ($config){
+        if ($config) {
             It "Imports should be the correct structure" {
                 $applications = $global:importedconfigs.$name | Get-Member -MemberType NoteProperty | Select-Object -ExpandProperty name
                 $template = $config | Get-Member -MemberType NoteProperty | Select-Object -ExpandProperty name
                 $result = New-Object System.Collections.Generic.List[System.Object]
                 Foreach ($application in $applications) {
                     $compare = $global:importedconfigs.$name.$application | Get-Member -MemberType NoteProperty | Select-Object -ExpandProperty name
-                    if ($(Compare-Object $compare $template) -ne $null){
+                    if ($(Compare-Object $compare $template) -ne $null) {
                         $result.Add($application)
                     }
                 }
@@ -45,12 +45,12 @@ Describe "Config Files" -ForEach @(
                 $result | Select-String "WPF*" | should -BeNullOrEmpty
             }
         }
-        if($undo){
+        if($undo) {
             It "Tweaks should contain original Value" {
                 $tweaks = $global:importedconfigs.$name | Get-Member -MemberType NoteProperty | Select-Object -ExpandProperty name
                 $result = New-Object System.Collections.Generic.List[System.Object]
 
-                foreach ($tweak in $tweaks){
+                foreach ($tweak in $tweaks) {
                     $Originals = @(
                         @{
                             name = "registry"
@@ -65,10 +65,10 @@ Describe "Config Files" -ForEach @(
                             value = "OriginalState"
                         }
                     )
-                    Foreach ($original in $Originals){
+                    Foreach ($original in $Originals) {
                         $TotalCount = ($global:importedconfigs.$name.$tweak.$($original.name)).count
                         $OriginalCount = ($global:importedconfigs.$name.$tweak.$($original.name).$($original.value) | Where-Object {$_}).count
-                        if($TotalCount -ne $OriginalCount){
+                        if($TotalCount -ne $OriginalCount) {
                             $result.Add("$Tweak,$($original.name)")
                         }
                     }

scripts/main.ps1

@@ -11,7 +11,7 @@ $InitialSessionState.Variables.Add($hashVars)
 
 # Get every private function and add them to the session state
 $functions = (Get-ChildItem function:\).where{$_.name -like "*winutil*" -or $_.name -like "*WPF*"}
-foreach ($function in $functions){
+foreach ($function in $functions) {
     $functionDefinition = Get-Content function:\$($function.name)
     $functionEntry = New-Object System.Management.Automation.Runspaces.SessionStateFunctionEntry -ArgumentList $($function.name), $functionDefinition
 
@@ -55,12 +55,10 @@ $inputXML = $inputXML -replace 'mc:Ignorable="d"', '' -replace "x:N", 'N' -repla
 if ((Get-WinUtilToggleStatus WPFToggleDarkMode) -eq $True) {
     if (Invoke-WinUtilGPU -eq $True) {
         $ctttheme = 'Matrix'
-    }
+    } else {
-    else {
         $ctttheme = 'Dark'
     }
-}
+} else {
-else {
     $ctttheme = 'Classic'
 }
 $inputXML = Set-WinUtilUITheme -inputXML $inputXML -themeName $ctttheme
@@ -90,9 +88,9 @@ try {
 $xaml.SelectNodes("//*[@Name]") | ForEach-Object {$sync["$("$($psitem.Name)")"] = $sync["Form"].FindName($psitem.Name)}
 
 $sync.keys | ForEach-Object {
-    if($sync.$psitem){
+    if($sync.$psitem) {
         if($($sync["$psitem"].GetType() | Select-Object -ExpandProperty Name) -eq "CheckBox" `
-                -and $sync["$psitem"].Name -like "WPFToggle*"){
+                -and $sync["$psitem"].Name -like "WPFToggle*") {
             $sync["$psitem"].IsChecked = Get-WinUtilToggleStatus $sync["$psitem"].Name
 
             $sync["$psitem"].Add_Click({
@@ -101,14 +99,14 @@ $sync.keys | ForEach-Object {
             })
         }
 
-        if($($sync["$psitem"].GetType() | Select-Object -ExpandProperty Name) -eq "ToggleButton"){
+        if($($sync["$psitem"].GetType() | Select-Object -ExpandProperty Name) -eq "ToggleButton") {
             $sync["$psitem"].Add_Click({
                 [System.Object]$Sender = $args[0]
                 Invoke-WPFButton $Sender.name
             })
         }
 
-        if($($sync["$psitem"].GetType() | Select-Object -ExpandProperty Name) -eq "Button"){
+        if($($sync["$psitem"].GetType() | Select-Object -ExpandProperty Name) -eq "Button") {
             $sync["$psitem"].Add_Click({
                 [System.Object]$Sender = $args[0]
                 Invoke-WPFButton $Sender.name
@@ -134,7 +132,7 @@ $sync.keys | ForEach-Object {
 
 # Load computer information in the background
 Invoke-WPFRunspace -ScriptBlock {
-    try{
+    try {
         $oldProgressPreference = $ProgressPreference
         $ProgressPreference = "SilentlyContinue"
         $sync.ConfigLoaded = $False
@@ -179,8 +177,7 @@ $commonKeyEvents = {
         return
     }
 
-    if ($_.Key -eq "Escape")
+    if ($_.Key -eq "Escape") {
-    {
         $sync.SearchBar.SelectAll()
         $sync.SearchBar.Text = ""
         $sync.SearchBarClearButton.Visibility = "Collapsed"
@@ -188,8 +185,7 @@ $commonKeyEvents = {
     }
 
     # don't ask, I know what I'm doing, just go...
-    if (($_.Key -eq "Q" -and $_.KeyboardDevice.Modifiers -eq "Ctrl"))
+    if (($_.Key -eq "Q" -and $_.KeyboardDevice.Modifiers -eq "Ctrl")) {
-    {
         $this.Close()
     }
     if ($_.KeyboardDevice.Modifiers -eq "Alt") {
@@ -232,12 +228,9 @@ $sync["Form"].Add_MouseLeftButtonDown({
 })
 
 $sync["Form"].Add_MouseDoubleClick({
-    if ($sync["Form"].WindowState -eq [Windows.WindowState]::Normal)
+    if ($sync["Form"].WindowState -eq [Windows.WindowState]::Normal) {
-    {
         $sync["Form"].WindowState = [Windows.WindowState]::Maximized;
-    }
+    } else {
-    else
-    {
         $sync["Form"].WindowState = [Windows.WindowState]::Normal;
     }
 })
@@ -283,11 +276,11 @@ Add-Type @"
 
    foreach ($proc in (Get-Process).where{ $_.MainWindowTitle -and $_.MainWindowTitle -like "*titus*" }) {
         # Check if the process's MainWindowHandle is valid
-    	if ($proc.MainWindowHandle -ne [System.IntPtr]::Zero) {
+        if ($proc.MainWindowHandle -ne [System.IntPtr]::Zero) {
             Write-Debug "MainWindowHandle: $($proc.Id) $($proc.MainWindowTitle) $($proc.MainWindowHandle)"
             $windowHandle = $proc.MainWindowHandle
-	    } else {
+        } else {
-        	Write-Warning "Process found, but no MainWindowHandle: $($proc.Id) $($proc.MainWindowTitle)"
+            Write-Warning "Process found, but no MainWindowHandle: $($proc.Id) $($proc.MainWindowTitle)"
 
         }
     }
@@ -328,9 +321,9 @@ Add-Type @"
 
     # maybe this is not the best place to load and execute config file?
     # maybe community can help?
-    if ($PARAM_CONFIG){
+    if ($PARAM_CONFIG) {
         Invoke-WPFImpex -type "import" -Config $PARAM_CONFIG
-        if ($PARAM_RUN){
+        if ($PARAM_RUN) {
             while ($sync.ProcessRunning) {
                 Start-Sleep -Seconds 5
             }
@@ -377,8 +370,7 @@ $sync["SearchBar"].Add_TextChanged({
 
     if ($sync.SearchBar.Text -ne "") {
         $sync.SearchBarClearButton.Visibility = "Visible"
-    }
+    } else {
-    else {
         $sync.SearchBarClearButton.Visibility = "Collapsed"
     }
 
@@ -404,8 +396,7 @@ $sync["SearchBar"].Add_TextChanged({
             if ($textBlock -ne $null) {
                 $textBlock.Visibility = "Visible"
             }
-        }
+        } else {
-        else {
              $CheckBox.Value.Visibility = "Collapsed"
             # Set the corresponding text block visibility
             if ($textBlock -ne $null) {
@@ -415,17 +406,16 @@ $sync["SearchBar"].Add_TextChanged({
     }
     $activeCategories = $activeApplications | Select-Object -ExpandProperty category -Unique
 
-    foreach ($category in $activeCategories){
+    foreach ($category in $activeCategories) {
         $label = $labels[$(Get-WPFObjectName -type "Label" -name $category)]
         $label.Visibility = "Visible"
     }
-    if ($activeCategories){
+    if ($activeCategories) {
         $inactiveCategories = Compare-Object -ReferenceObject $allCategories -DifferenceObject $activeCategories -PassThru
-    }
+    } else {
-    else{
         $inactiveCategories = $allCategories
     }
-    foreach ($category in $inactiveCategories){
+    foreach ($category in $inactiveCategories) {
         $label = $labels[$(Get-WPFObjectName -type "Label" -name $category)]
         $label.Visibility = "Collapsed"}
 })
@@ -471,8 +461,7 @@ $sync["SettingsButton"].Add_Click({
     Write-Debug "SettingsButton clicked"
     if ($sync["SettingsPopup"].IsOpen) {
         $sync["SettingsPopup"].IsOpen = $false
-    }
+    } else {
-    else {
         $sync["SettingsPopup"].IsOpen = $true
     }
     $_.Handled = $false
@@ -528,8 +517,7 @@ $sync["SponsorMenuItem"].Add_Click({
 
         # Append the sponsors to the authorInfo
         $sponsors | ForEach-Object { $authorInfo += "$_`n" }
-    }
+    } catch {
-    catch {
         $authorInfo += "An error occurred while fetching or processing the sponsors: $_`n"
     }
 

scripts/start.ps1

@@ -45,8 +45,7 @@ $sync.configs = @{}
 $sync.ProcessRunning = $false
 
 # If script isn't running as admin, show error message and quit
-If (([Security.Principal.WindowsIdentity]::GetCurrent()).Owner.Value -ne "S-1-5-32-544")
+If (([Security.Principal.WindowsIdentity]::GetCurrent()).Owner.Value -ne "S-1-5-32-544") {
-{
     Write-Host "===========================================" -Foregroundcolor Red
     Write-Host "-- Scripts must be run as Administrator ---" -Foregroundcolor Red
     Write-Host "-- Right-Click Start -> Terminal(Admin) ---" -Foregroundcolor Red

tools/Invoke-Preprocessing.ps1

@@ -0,0 +1,139 @@
+ function Invoke-Preprocessing {
+    <#
+        .SYNOPSIS
+        A function that does Code Formatting using RegEx, useful when trying to force specific coding standard(s) to a project.
+
+        .PARAMETER ThrowExceptionOnEmptyFilesList
+        A switch which'll throw an exception upon not finding any files inside the provided 'WorkingDir'.
+
+        .PARAMETER SkipExcludedFilesValidation
+        A switch to stop file path validation on 'ExcludedFiles' list.
+
+        .PARAMETER ExcludedFiles
+        A list of file paths which're *relative to* 'WorkingDir' Folder, every item in the list can be pointing to File (doesn't end with '\') or Directory (ends with '\') or None-Existing File/Directory.
+        By default, it checks if everyitem exists, and throws an exception if one or more are not found (None-Existing), if you want to skip this validation, please consider providing the '-SkipExcludedFilesValidation' switch to skip this check.
+
+        .PARAMETER WorkingDir
+        The folder to search inside recursively for files which're going to be Preprocessed (Code Formatted), unless they're found in 'ExcludedFiles' List.
+        Note: The path should be absolute, NOT relative.
+
+        .PARAMETER ProgressStatusMessage
+        The status message used when displaying the progress bar, which's done through PowerShell 'Write-Progress' Cmdlet.
+        This's a Required Parameter, as the information displayed to terminal is useful when running this function,
+        which might take less than 1 sec to minutes depending on project's scale & hardware performance.
+
+        .PARAMETER ProgressActivity
+        The activity message used when displaying the progress bar, which's done through PowerShell 'Write-Progress' Cmdlet,
+        This's an Optional Parameter, default value is 'Preprocessing', used in combination with 'ProgressStatusMessage' Parameter Value.
+
+        .EXAMPLE
+        Invoke-Preprocessing -WorkingDir "DRIVE:\Path\To\Folder\" -ExcludedFiles @('file.txt', '.\.git\', '*.png') -ProgressStatusMessage "Doing Preprocessing"
+
+        Calls 'Invoke-Preprocessing' function using Named Paramters, with 'WorkingDir' (Mandatory Parameter) which's used as the base folder when searching for files recursively (using 'Get-ChildItem'), other two paramters are, in order from right to left, the Optional 'ExcludeFiles', which can be a path to a file, folder, or pattern-matched (like '*.png'), and the 'ProgressStatusMessage', which's used in Progress Bar.
+
+        .EXAMPLE
+        Invoke-Preprocessing -WorkingDir "DRIVE:\Path\To\Folder\" -ExcludedFiles @('file.txt', '.\.git\', '*.png') -ProgressStatusMessage "Doing Preprocessing" -ProgressActivity "Re-Formatting Code"
+
+        Same as Example No. 1, but uses 'ProgressActivity' which's used in Progress Bar.
+
+        .EXAMPLE
+        Invoke-Preprocessing -ThrowExceptionOnEmptyFilesList -WorkingDir "DRIVE:\Path\To\Folder\" -ExcludedFiles @('file.txt', '.\.git\', '*.png') -ProgressStatusMessage "Doing Preprocessing"
+
+        Same as Example No. 1, but will throw an exception when 'Invoke-Preprocessing' function doesn't find any files in 'WorkingDir' (not including 'ExcludedFiles' list).
+
+        .EXAMPLE
+        Invoke-Preprocessing -Skip -WorkingDir "DRIVE:\Path\To\Folder\" -ExcludedFiles @('file.txt', '.\.git\', '*.png') -ProgressStatusMessage "Doing Preprocessing"
+
+        Same as Example No. 1, but uses '-SkipExcludedFilesValidation', which'll skip the validation step for 'ExcludedFiles' list. This can be useful when 'ExcludedFiles' list is generated from another function, or from unreliable source (you can't guarantee every item in list is a valid path), but you want to silently continue through the function.
+    #>
+
+     param (
+        [Parameter(position=0)]
+        [switch]$SkipExcludedFilesValidation,
+
+        [Parameter(position=1)]
+        [switch]$ThrowExceptionOnEmptyFilesList,
+
+        [Parameter(Mandatory, position=2)]
+        [ValidateScript({[System.IO.Path]::IsPathRooted($_)})]
+        [string]$WorkingDir,
+
+        [Parameter(position=3)]
+        [string[]]$ExcludedFiles,
+
+        [Parameter(Mandatory, position=4)]
+        [string]$ProgressStatusMessage,
+
+        [Parameter(position=5)]
+        [string]$ProgressActivity = "Preprocessing"
+     )
+
+    if (-NOT (Test-Path -PathType Container -Path "$WorkingDir")) {
+        throw "[Invoke-Preprocessing] Invalid Paramter Value for 'WorkingDir', passed value: '$WorkingDir'. Either the path is a File or Non-Existing/Invlid, please double check your code."
+    }
+
+    $count = $ExcludedFiles.Count
+    if ((-NOT ($count -eq 0)) -AND (-NOT $SkipExcludedFilesValidation)) {
+        for ($i = 0; $i -lt $count; $i++) {
+            $excludedFile = $ExcludedFiles[$i]
+            $filePath = "$(($WorkingDir -replace ('\\$', '')) + '\' + ($excludedFile -replace ('\.\\', '')))"
+            if (-NOT (Get-ChildItem -Recurse -Path "$filePath" -File)) {
+                $failedFilesList += "'$filePath', "
+            }
+        }
+        $failedFilesList = $failedFilesList -replace (',\s*$', '')
+        if (-NOT $failedFilesList -eq "") {
+            throw "[Invoke-Preprocessing] One or more File Paths & File Patterns were not found, you can use '-SkipExcludedFilesValidation' switch to skip this check, and the failed files are: $failedFilesList"
+        }
+    }
+
+    $files = Get-ChildItem $WorkingDir -Recurse -Exclude $ExcludedFiles -File
+    $numOfFiles = $files.Count
+
+    if ($numOfFiles -eq 0) {
+        if ($ThrowExceptionOnEmptyFilesList) {
+            throw "[Invoke-Preprocessing] Found 0 Files to Preprocess inside 'WorkingDir' Directory and '-ThrowExceptionOnEmptyFilesList' Switch is provided, value of 'WorkingDir': '$WorkingDir'."
+        } else {
+            return # Do an early return, there's nothing else to do
+        }
+    }
+
+    for ($i = 0; $i -lt $numOfFiles; $i++) {
+        $file = $files[$i]
+
+        # If the file is in Exclude List, don't proceed to check/modify said file.
+        $fileIsExcluded = $False
+        for ($j = 0; $j -lt $excludedFiles.Count; $j++) {
+            $excluded = $excludedFiles[$j]
+            $strToCompare = ($excluded) -replace ('^\.\\', '')
+            if ($file.FullName.Contains("$strToCompare")) {
+                $fileIsExcluded = $True
+                break
+            }
+        }
+
+        if ($fileIsExcluded) {
+            continue
+        }
+
+        # TODO:
+        #   make more formatting rules, and document them in WinUtil Official Documentation
+        (Get-Content "$file").TrimEnd() `
+            -replace ('\t', '    ') `
+            -replace ('\)\s*\{', ') {') `
+            -replace ('(?<keyword>if|for|foreach)\s*(?<condition>\([.*?]\))\s*\{', '${keyword} ${condition} {') `
+            -replace ('\}\s*elseif\s*(?<condition>\([.*?]\))\s*\{', '} elseif ${condition} {') `
+            -replace ('\}\s*else\s*\{', '} else {') `
+            -replace ('Try\s*\{', 'try {') `
+            -replace ('Catch\s*\{', 'catch {') `
+            -replace ('\}\s*Catch', '} catch') `
+            -replace ('\}\s*Catch\s*(?<exceptions>(\[.*?\]\s*(\,)?\s*)+)\s*\{', '} catch ${exceptions} {') `
+            -replace ('\}\s*Catch\s*(?<exceptions>\[.*?\])\s*\{', '} catch ${exceptions} {') `
+            -replace ('(?<parameter_type>\[.*?\])\s*(?<str_after_type>\$.*?(,|\s*\)))', '${parameter_type}${str_after_type}') `
+        | Set-Content "$file"
+
+        Write-Progress -Activity $ProgressActivity -Status "$ProgressStatusMessage - Finished $i out of $numOfFiles" -PercentComplete (($i/$numOfFiles)*100)
+    }
+
+    Write-Progress -Activity $ProgressActivity -Status "$ProgressStatusMessage - Finished Task Successfully" -Completed
+}

winget.ps1

@@ -35,15 +35,15 @@
 
 <#
 .SYNOPSIS
-	Downloads and installs the latest version of winget and its dependencies. Updates the PATH variable if needed.
+    Downloads and installs the latest version of winget and its dependencies. Updates the PATH variable if needed.
 .DESCRIPTION
-	Downloads and installs the latest version of winget and its dependencies. Updates the PATH variable if needed.
+    Downloads and installs the latest version of winget and its dependencies. Updates the PATH variable if needed.
 
 This script is designed to be straightforward and easy to use, removing the hassle of manually downloading, installing, and configuring winget. To make the newly installed winget available for use, a system reboot may be required after running the script.
 
 This function should be run with administrative privileges.
 .EXAMPLE
-	winget-install
+    winget-install
 .PARAMETER DebugMode
     Enables debug mode, which shows additional information for debugging.
 .PARAMETER DisableCleanup
@@ -57,10 +57,10 @@ This function should be run with administrative privileges.
 .PARAMETER Help
     Displays the full help information for the script.
 .NOTES
-	Version      : 3.0.1
+    Version      : 3.0.1
-	Created by   : asheroto
+    Created by   : asheroto
 .LINK
-	Project Site: https://github.com/asheroto/winget-install
+    Project Site: https://github.com/asheroto/winget-install
 #>
 [CmdletBinding()]
 param (