From c7043ff0fbce83ec75661ce872f7cdd4bd5c1bf7 Mon Sep 17 00:00:00 2001
From: Carter <60557606+Carterpersall@users.noreply.github.com>
Date: Tue, 17 May 2022 09:31:18 -0500
Subject: [PATCH] A few grammar, wording, and formatting tweaks (#6)

* A few grammar tweaks and sort services

 - Made a few grammar and wording tweaks
  - Install Tab1 -> Tab 1 - Install
  - Tweaks Buttons -> Tweak Buttons
  - Service tweaks to Manual -> Set Services to Manual
- Improve $services
  - The behavior of $services has not changed, just the formatting and grammar
  - Alphabetize the services to make any service easier to find
  - Improve the grammar and formatting of the comments next to the services
   - Capitalizes the first letter
   - Makes sure there is a space between # and the first word
   - Makes the spacing of each comment consistent so they all appear on the same column

* Fix winget indentation

 - Fixed the Indentation on the winget buttons

* If-statement and indentation

 - Made the format of all If-Statements consistent
   - if(statement){}else{} -> If (statement) {} else {}
 - Improve formatting and indentation
---
 winutil.ps1 | 365 ++++++++++++++++++++++++++--------------------------
 1 file changed, 181 insertions(+), 184 deletions(-)

diff --git a/winutil.ps1 b/winutil.ps1
index 0ea7c47e..92d7e8df 100644
--- a/winutil.ps1
+++ b/winutil.ps1
@@ -253,15 +253,16 @@ $inputXML = $inputXML -replace 'mc:Ignorable="d"','' -replace "x:N",'N' -replace
 [xml]$XAML = $inputXML
 #Read XAML
  
-    $reader=(New-Object System.Xml.XmlNodeReader $xaml) 
-  try{$Form=[Windows.Markup.XamlReader]::Load( $reader )}
+$reader=(New-Object System.Xml.XmlNodeReader $xaml) 
+try{$Form=[Windows.Markup.XamlReader]::Load( $reader )}
 catch [System.Management.Automation.MethodInvocationException] {
     Write-Warning "We ran into a problem with the XAML code.  Check the syntax for this control..."
     write-host $error[0].Exception.Message -ForegroundColor Red
-    if ($error[0].Exception.Message -like "*button*"){
-        write-warning "Ensure your &lt;button in the `$inputXML does NOT have a Click=ButtonClick property.  PS can't handle this`n`n`n`n"}
+    If ($error[0].Exception.Message -like "*button*") {
+        write-warning "Ensure your &lt;button in the `$inputXML does NOT have a Click=ButtonClick property.  PS can't handle this`n`n`n`n"
+    }
 }
-catch{#if it broke some other way <img draggable="false" role="img" class="emoji" alt="😀" src="https://s0.wp.com/wp-content/mu-plugins/wpcom-smileys/twemoji/2/svg/1f600.svg">
+catch{# If it broke some other way <img draggable="false" role="img" class="emoji" alt="😀" src="https://s0.wp.com/wp-content/mu-plugins/wpcom-smileys/twemoji/2/svg/1f600.svg">
     Write-Host "Unable to load Windows.Markup.XamlReader. Double-check syntax and ensure .net is installed."
         }
  
@@ -272,7 +273,7 @@ catch{#if it broke some other way <img draggable="false" role="img" class="emoji
 $xaml.SelectNodes("//*[@Name]") | %{Set-Variable -Name "WPF$($_.Name)" -Value $Form.FindName($_.Name)}
  
 Function Get-FormVariables{
-if ($global:ReadmeDisplay -ne $true){Write-host "If you need to reference this display again, run Get-FormVariables" -ForegroundColor Yellow;$global:ReadmeDisplay=$true}
+If ($global:ReadmeDisplay -ne $true){Write-host "If you need to reference this display again, run Get-FormVariables" -ForegroundColor Yellow;$global:ReadmeDisplay=$true}
 write-host "Found the following interactable elements from our form" -ForegroundColor Cyan
 get-variable WPF*
 }
@@ -309,7 +310,7 @@ $WPFTab4BT.Add_Click({
     })
 
 #===========================================================================
-# Install Tab1
+# Tab 1 - Install
 #===========================================================================
 $WPFinstall.Add_Click({
     $wingetinstall = New-Object System.Collections.Generic.List[System.Object]
@@ -318,304 +319,302 @@ $WPFinstall.Add_Click({
         $WPFInstalladobe.IsChecked = $false
     }
     If ( $WPFInstalladvancedip.IsChecked -eq $true ) { 
-	   $wingetinstall.Add("Famatech.AdvancedIPScanner")
-       $WPFInstalladvancedip.IsChecked = $false
+	    $wingetinstall.Add("Famatech.AdvancedIPScanner")
+        $WPFInstalladvancedip.IsChecked = $false
     }
     If ( $WPFInstallatom.IsChecked -eq $true ) { 
         $wingetinstall.Add("GitHub.Atom")
         $WPFInstallatom.IsChecked = $false
-     }
-     If ( $WPFInstallaudacity.IsChecked -eq $true ) { 
-         $wingetinstall.Add("Audacity.Audacity")
-         $WPFInstallaudacity.IsChecked = $false
-      }
+    }
+    If ( $WPFInstallaudacity.IsChecked -eq $true ) { 
+        $wingetinstall.Add("Audacity.Audacity")
+        $WPFInstallaudacity.IsChecked = $false
+    }
     If ( $WPFInstallautohotkey.IsChecked -eq $true ) { 
-       $wingetinstall.Add("Lexikos.AutoHotkey")
+        $wingetinstall.Add("Lexikos.AutoHotkey")
         $WPFInstallautohotkey.IsChecked = $false
     }  
     If ( $WPFInstallbrave.IsChecked -eq $true ) { 
-       $wingetinstall.Add("BraveSoftware.BraveBrowser")
+        $wingetinstall.Add("BraveSoftware.BraveBrowser")
         $WPFInstallbrave.IsChecked = $false
     }
     If ( $WPFInstallchrome.IsChecked -eq $true ) { 
-       $wingetinstall.Add("Google.Chrome")
+        $wingetinstall.Add("Google.Chrome")
         $WPFInstallchrome.IsChecked = $false
     }
     If ( $WPFInstalldiscord.IsChecked -eq $true ) { 
-       $wingetinstall.Add("Discord.Discord")
+        $wingetinstall.Add("Discord.Discord")
         $WPFInstalldiscord.IsChecked = $false
     }
     If ( $WPFInstallesearch.IsChecked -eq $true ) { 
-       $wingetinstall.Add("voidtools.Everything --source winget")
+        $wingetinstall.Add("voidtools.Everything --source winget")
         $WPFInstallesearch.IsChecked = $false
     }
     If ( $WPFInstalletcher.IsChecked -eq $true ) { 
-       $wingetinstall.Add("Balena.Etcher")
+        $wingetinstall.Add("Balena.Etcher")
         $WPFInstalletcher.IsChecked = $false
     }
     If ( $WPFInstallfirefox.IsChecked -eq $true ) { 
-       $wingetinstall.Add("Mozilla.Firefox")
+        $wingetinstall.Add("Mozilla.Firefox")
         $WPFInstallfirefox.IsChecked = $false
     }
     If ( $WPFInstallgimp.IsChecked -eq $true ) { 
-       $wingetinstall.Add("GIMP.GIMP")
+        $wingetinstall.Add("GIMP.GIMP")
         $WPFInstallgimp.IsChecked = $false
     }
     If ( $WPFInstallgithubdesktop.IsChecked -eq $true ) { 
-       $wingetinstall.Add("Git.Git")
-       $wingetinstall.Add("GitHub.GitHubDesktop")
+        $wingetinstall.Add("Git.Git")
+        $wingetinstall.Add("GitHub.GitHubDesktop")
         $WPFInstallgithubdesktop.IsChecked = $false
     }
     If ( $WPFInstallimageglass.IsChecked -eq $true ) { 
         $wingetinstall.Add("DuongDieuPhap.ImageGlass")
-         $WPFInstallimageglass.IsChecked = $false
-     }
+        $WPFInstallimageglass.IsChecked = $false
+    }
     If ( $WPFInstalljava8.IsChecked -eq $true ) { 
         $wingetinstall.Add("AdoptOpenJDK.OpenJDK.8")
-         $WPFInstalljava8.IsChecked = $false
-     }
-     If ( $WPFInstalljava16.IsChecked -eq $true ) { 
+        $WPFInstalljava8.IsChecked = $false
+    }
+    If ( $WPFInstalljava16.IsChecked -eq $true ) { 
         $wingetinstall.Add("AdoptOpenJDK.OpenJDK.16")
-         $WPFInstalljava16.IsChecked = $false
-     }
-     If ( $WPFInstalljava18.IsChecked -eq $true ) { 
+        $WPFInstalljava16.IsChecked = $false
+    }
+    If ( $WPFInstalljava18.IsChecked -eq $true ) { 
         $wingetinstall.Add("Oracle.JDK.18")
-         $WPFInstalljava18.IsChecked = $false
-     }
-     If ( $WPFInstalljetbrains.IsChecked -eq $true ) { 
+        $WPFInstalljava18.IsChecked = $false
+    }
+    If ( $WPFInstalljetbrains.IsChecked -eq $true ) { 
         $wingetinstall.Add("JetBrains.Toolbox")
-         $WPFInstalljetbrains.IsChecked = $false
-     } 
-    
+        $WPFInstalljetbrains.IsChecked = $false
+    }
     If ( $WPFInstallmpc.IsChecked -eq $true ) { 
-       $wingetinstall.Add("clsid2.mpc-hc")
+        $wingetinstall.Add("clsid2.mpc-hc")
         $WPFInstallmpc.IsChecked = $false
     }
     If ( $WPFInstallnodejs.IsChecked -eq $true ) { 
         $wingetinstall.Add("OpenJS.NodeJS")
-         $WPFInstallnodejs.IsChecked = $false
-     }
-     If ( $WPFInstallnodejslts.IsChecked -eq $true ) { 
+        $WPFInstallnodejs.IsChecked = $false
+    }
+    If ( $WPFInstallnodejslts.IsChecked -eq $true ) { 
         $wingetinstall.Add("OpenJS.NodeJS.LTS")
-         $WPFInstallnodejslts.IsChecked = $false
-     }
+        $WPFInstallnodejslts.IsChecked = $false
+    }
     If ( $WPFInstallnotepadplus.IsChecked -eq $true ) { 
-       $wingetinstall.Add("Notepad++.Notepad++")
+        $wingetinstall.Add("Notepad++.Notepad++")
         $WPFInstallnotepadplus.IsChecked = $false
     }
     If ( $WPFInstallpowertoys.IsChecked -eq $true ) { 
-       $wingetinstall.Add("Microsoft.PowerToys")
+        $wingetinstall.Add("Microsoft.PowerToys")
         $WPFInstallpowertoys.IsChecked = $false
     }
     If ( $WPFInstallputty.IsChecked -eq $true ) { 
-       $wingetinstall.Add("PuTTY.PuTTY")
+        $wingetinstall.Add("PuTTY.PuTTY")
         $WPFInstallputty.IsChecked = $false
     }
     If ( $WPFInstallpython3.IsChecked -eq $true ) { 
         $wingetinstall.Add("Python.Python.3")
-         $WPFInstallpython3.IsChecked = $false
+        $WPFInstallpython3.IsChecked = $false
     }
     If ( $WPFInstallsevenzip.IsChecked -eq $true ) { 
-       $wingetinstall.Add("7zip.7zip")
+        $wingetinstall.Add("7zip.7zip")
         $WPFInstallsevenzip.IsChecked = $false
     }
     If ( $WPFInstallsharex.IsChecked -eq $true ) { 
-       $wingetinstall.Add("ShareX.ShareX")
+        $wingetinstall.Add("ShareX.ShareX")
         $WPFInstallsharex.IsChecked = $false
     }
     If ( $WPFInstallsublime.IsChecked -eq $true ) { 
         $wingetinstall.Add("SublimeHQ.SublimeText.4")
-         $WPFInstallsublime.IsChecked = $false
+        $WPFInstallsublime.IsChecked = $false
     }
     If ( $WPFInstallsumatra.IsChecked -eq $true ) { 
-       $wingetinstall.Add("SumatraPDF.SumatraPDF")
+        $wingetinstall.Add("SumatraPDF.SumatraPDF")
         $WPFInstallsumatra.IsChecked = $false
     }
     If ( $WPFInstallterminal.IsChecked -eq $true ) { 
-       $wingetinstall.Add("Microsoft.WindowsTerminal")
+        $wingetinstall.Add("Microsoft.WindowsTerminal")
         $WPFInstallterminal.IsChecked = $false
     }
     If ( $WPFInstallttaskbar.IsChecked -eq $true ) { 
-       $wingetinstall.Add("TranslucentTB.TranslucentTB")
+        $wingetinstall.Add("TranslucentTB.TranslucentTB")
         $WPFInstallttaskbar.IsChecked = $false
     }
     If ( $WPFInstallvlc.IsChecked -eq $true ) { 
-       $wingetinstall.Add("VideoLAN.VLC")
+        $wingetinstall.Add("VideoLAN.VLC")
         $WPFInstallvlc.IsChecked = $false
     }
     If ( $WPFInstallvscode.IsChecked -eq $true ) { 
-       $wingetinstall.Add("Git.Git")
-       $wingetinstall.Add("Microsoft.VisualStudioCode --source winget")
+        $wingetinstall.Add("Git.Git")
+        $wingetinstall.Add("Microsoft.VisualStudioCode --source winget")
         $WPFInstallvscode.IsChecked = $false
     }
     If ( $WPFInstallvscodium.IsChecked -eq $true ) { 
-       $wingetinstall.Add("Git.Git")
-       $wingetinstall.Add("VSCodium.VSCodium")
+        $wingetinstall.Add("Git.Git")
+        $wingetinstall.Add("VSCodium.VSCodium")
         $WPFInstallvscodium.IsChecked = $false
     }
     If ( $WPFInstallwinscp.IsChecked -eq $true ) { 
         $wingetinstall.Add("WinSCP.WinSCP")
-         $WPFInstallputty.IsChecked = $false
-     }
+        $WPFInstallputty.IsChecked = $false
+    }
     If ( $WPFInstallanydesk.IsChecked -eq $true ) { 
-       $wingetinstall.Add("AnyDeskSoftwareGmbH.AnyDesk")
+        $wingetinstall.Add("AnyDeskSoftwareGmbH.AnyDesk")
         $WPFInstallanydesk.IsChecked = $false
     }
     If ( $WPFInstallbitwarden.IsChecked -eq $true ) { 
-       $wingetinstall.Add("Bitwarden.Bitwarden")
+        $wingetinstall.Add("Bitwarden.Bitwarden")
         $WPFInstallbitwarden.IsChecked = $false
     }        
     If ( $WPFInstallblender.IsChecked -eq $true ) { 
-       $wingetinstall.Add("BlenderFoundation.Blender")
+        $wingetinstall.Add("BlenderFoundation.Blender")
         $WPFInstallblender.IsChecked = $false
     }                    
     If ( $WPFInstallchromium.IsChecked -eq $true ) { 
-       $wingetinstall.Add("eloston.ungoogled-chromium")
+        $wingetinstall.Add("eloston.ungoogled-chromium")
         $WPFInstallchromium.IsChecked = $false
     }             
     If ( $WPFInstallcpuz.IsChecked -eq $true ) { 
-       $wingetinstall.Add("CPUID.CPU-Z")
+        $wingetinstall.Add("CPUID.CPU-Z")
         $WPFInstallcpuz.IsChecked = $false
     }                            
     If ( $WPFInstalleartrumpet.IsChecked -eq $true ) { 
-       $wingetinstall.Add("File-New-Project.EarTrumpet")
+        $wingetinstall.Add("File-New-Project.EarTrumpet")
         $WPFInstalleartrumpet.IsChecked = $false
     }           
     If ( $WPFInstallepicgames.IsChecked -eq $true ) { 
-       $wingetinstall.Add("EpicGames.EpicGamesLauncher")
+        $wingetinstall.Add("EpicGames.EpicGamesLauncher")
         $WPFInstallepicgames.IsChecked = $false
     }                                      
     If ( $WPFInstallflameshot.IsChecked -eq $true ) { 
-       $wingetinstall.Add("Flameshot.Flameshot")
+        $wingetinstall.Add("Flameshot.Flameshot")
         $WPFInstallflameshot.IsChecked = $false
     }            
     If ( $WPFInstallfoobar.IsChecked -eq $true ) { 
-       $wingetinstall.Add("PeterPawlowski.foobar2000")
+        $wingetinstall.Add("PeterPawlowski.foobar2000")
         $WPFInstallfoobar.IsChecked = $false
     }                     
     If ( $WPFInstallgog.IsChecked -eq $true ) { 
-       $wingetinstall.Add("GOG.Galaxy")
+        $wingetinstall.Add("GOG.Galaxy")
         $WPFInstallgog.IsChecked = $false
     }                  
     If ( $WPFInstallgpuz.IsChecked -eq $true ) { 
-       $wingetinstall.Add("TechPowerUp.GPU-Z")
+        $wingetinstall.Add("TechPowerUp.GPU-Z")
         $WPFInstallgpuz.IsChecked = $false
     }                 
     If ( $WPFInstallgreenshot.IsChecked -eq $true ) { 
-       $wingetinstall.Add("Greenshot.Greenshot")
+        $wingetinstall.Add("Greenshot.Greenshot")
         $WPFInstallgreenshot.IsChecked = $false
     }            
     If ( $WPFInstallhandbrake.IsChecked -eq $true ) { 
-       $wingetinstall.Add("HandBrake.HandBrake")
+        $wingetinstall.Add("HandBrake.HandBrake")
         $WPFInstallhandbrake.IsChecked = $false
     }      
     If ( $WPFInstallhexchat.IsChecked -eq $true ) { 
         $wingetinstall.Add("HexChat.HexChat")
-         $WPFInstallhexchat.IsChecked = $false
-     }       
+        $WPFInstallhexchat.IsChecked = $false
+    }       
     If ( $WPFInstallhwinfo.IsChecked -eq $true ) { 
-       $wingetinstall.Add("REALiX.HWiNFO")
+        $wingetinstall.Add("REALiX.HWiNFO")
         $WPFInstallhwinfo.IsChecked = $false
     }                       
     If ( $WPFInstallinkscape.IsChecked -eq $true ) { 
-       $wingetinstall.Add("Inkscape.Inkscape")
+        $wingetinstall.Add("Inkscape.Inkscape")
         $WPFInstallinkscape.IsChecked = $false
     }             
     If ( $WPFInstallkeepass.IsChecked -eq $true ) { 
-       $wingetinstall.Add("KeePassXCTeam.KeePassXC")
+        $wingetinstall.Add("KeePassXCTeam.KeePassXC")
         $WPFInstallkeepass.IsChecked = $false
     }              
     If ( $WPFInstalllibrewolf.IsChecked -eq $true ) { 
-       $wingetinstall.Add("LibreWolf.LibreWolf")
+        $wingetinstall.Add("LibreWolf.LibreWolf")
         $WPFInstalllibrewolf.IsChecked = $false
     }            
     If ( $WPFInstallmalwarebytes.IsChecked -eq $true ) { 
-       $wingetinstall.Add("Malwarebytes.Malwarebytes")
+        $wingetinstall.Add("Malwarebytes.Malwarebytes")
         $WPFInstallmalwarebytes.IsChecked = $false
     }          
     If ( $WPFInstallmatrix.IsChecked -eq $true ) { 
         $wingetinstall.Add("Element.Element")
-         $WPFInstallmatrix.IsChecked = $false
-     } 
+        $WPFInstallmatrix.IsChecked = $false
+    } 
     If ( $WPFInstallmremoteng.IsChecked -eq $true ) { 
-       $wingetinstall.Add("mRemoteNG.mRemoteNG")
+        $wingetinstall.Add("mRemoteNG.mRemoteNG")
         $WPFInstallmremoteng.IsChecked = $false
     }                    
     If ( $WPFInstallnvclean.IsChecked -eq $true ) { 
-       $wingetinstall.Add("TechPowerUp.NVCleanstall")
+        $wingetinstall.Add("TechPowerUp.NVCleanstall")
         $WPFInstallnvclean.IsChecked = $false
     }              
     If ( $WPFInstallobs.IsChecked -eq $true ) { 
-       $wingetinstall.Add("OBSProject.OBSStudio")
+        $wingetinstall.Add("OBSProject.OBSStudio")
         $WPFInstallobs.IsChecked = $false
     }                  
     If ( $WPFInstallobsidian.IsChecked -eq $true ) { 
-       $wingetinstall.Add("Obsidian.Obsidian")
+        $wingetinstall.Add("Obsidian.Obsidian")
         $WPFInstallobsidian.IsChecked = $false
     }                           
     If ( $WPFInstallrevo.IsChecked -eq $true ) { 
-       $wingetinstall.Add("RevoUninstaller.RevoUninstaller")
+        $wingetinstall.Add("RevoUninstaller.RevoUninstaller")
         $WPFInstallrevo.IsChecked = $false
     }                 
     If ( $WPFInstallrufus.IsChecked -eq $true ) { 
-       $wingetinstall.Add("Rufus.Rufus")
+        $wingetinstall.Add("Rufus.Rufus")
         $WPFInstallrufus.IsChecked = $false
     }   
     If ( $WPFInstallsignal.IsChecked -eq $true ) { 
         $wingetinstall.Add("OpenWhisperSystems.Signal")
-         $WPFInstallsignal.IsChecked = $false
-     }
+        $WPFInstallsignal.IsChecked = $false
+    }
      If ( $WPFInstallskype.IsChecked -eq $true ) { 
         $wingetinstall.Add("Microsoft.Skype")
-         $WPFInstallskype.IsChecked = $false
-     }                               
+        $WPFInstallskype.IsChecked = $false
+    }                               
     If ( $WPFInstallslack.IsChecked -eq $true ) { 
-       $wingetinstall.Add("SlackTechnologies.Slack")
+        $wingetinstall.Add("SlackTechnologies.Slack")
         $WPFInstallslack.IsChecked = $false
     }                
     If ( $WPFInstallspotify.IsChecked -eq $true ) { 
-       $wingetinstall.Add("Spotify.Spotify")
+        $wingetinstall.Add("Spotify.Spotify")
         $WPFInstallspotify.IsChecked = $false
     }              
     If ( $WPFInstallsteam.IsChecked -eq $true ) { 
-       $wingetinstall.Add("Valve.Steam")
+        $wingetinstall.Add("Valve.Steam")
         $WPFInstallsteam.IsChecked = $false
     }                             
     If ( $WPFInstallteamviewer.IsChecked -eq $true ) { 
         $wingetinstall.Add("TeamViewer.TeamViewer")
-         $WPFInstallteamviewer.IsChecked = $false
-     }
+        $WPFInstallteamviewer.IsChecked = $false
+    }
      If ( $WPFInstallteams.IsChecked -eq $true ) { 
         $wingetinstall.Add("Microsoft.Teams")
-         $WPFInstallteams.IsChecked = $false
-     }
-                              
+        $WPFInstallteams.IsChecked = $false
+    }                        
     If ( $WPFInstalltreesize.IsChecked -eq $true ) { 
-       $wingetinstall.Add("JAMSoftware.TreeSize.Free")
+        $wingetinstall.Add("JAMSoftware.TreeSize.Free")
         $WPFInstalltreesize.IsChecked = $false
     }                         
     If ( $WPFInstallvisualstudio.IsChecked -eq $true ) { 
-       $wingetinstall.Add("Microsoft.VisualStudio.2022.Community")
+        $wingetinstall.Add("Microsoft.VisualStudio.2022.Community")
         $WPFInstallvisualstudio.IsChecked = $false
     }         
     If ( $WPFInstallvivaldi.IsChecked -eq $true ) { 
-       $wingetinstall.Add("VivaldiTechnologies.Vivaldi")
+        $wingetinstall.Add("VivaldiTechnologies.Vivaldi")
         $WPFInstallvivaldi.IsChecked = $false
     }                              
     If ( $WPFInstallvoicemeeter.IsChecked -eq $true ) { 
-       $wingetinstall.Add("VB-Audio.Voicemeeter")
+        $wingetinstall.Add("VB-Audio.Voicemeeter")
         $WPFInstallvoicemeeter.IsChecked = $false
     }                    
     If ( $WPFInstallwindirstat.IsChecked -eq $true ) { 
-       $wingetinstall.Add("WinDirStat.WinDirStat")
+        $wingetinstall.Add("WinDirStat.WinDirStat")
         $WPFInstallwindirstat.IsChecked = $false
     }           
     If ( $WPFInstallwireshark.IsChecked -eq $true ) { 
-       $wingetinstall.Add("WiresharkFoundation.Wireshark")
+        $wingetinstall.Add("WiresharkFoundation.Wireshark")
         $WPFInstallwireshark.IsChecked = $false
     }            
     If ( $WPFInstallzoom.IsChecked -eq $true ) { 
-       $wingetinstall.Add("Zoom.Zoom")
+        $wingetinstall.Add("Zoom.Zoom")
         $WPFInstallzoom.IsChecked = $false
     }    
 
@@ -653,7 +652,7 @@ $WPFInstallUpgrade.Add_Click({
 })
 
 #===========================================================================
-# Tab 2 - Tweaks Buttons
+# Tab 2 - Tweak Buttons
 #===========================================================================
 $WPFdesktop.Add_Click({
 
@@ -777,94 +776,93 @@ $WPFtweaksbutton.Add_Click({
         $WPFEssTweaksRP.IsChecked = $false
     }
     If ( $WPFEssTweaksServices.IsChecked -eq $true ) {
-        # Service tweaks to Manual 
+        # Set Services to Manual 
 
         $services = @(
+            "ALG"                                          # Application Layer Gateway Service(Provides support for 3rd party protocol plug-ins for Internet Connection Sharing)
+            "AJRouter"                                     # Needed for AllJoyn Router Service
+            "BcastDVRUserService_48486de"                  # GameDVR and Broadcast is used for Game Recordings and Live Broadcasts
+            #"BDESVC"                                      # Bitlocker Drive Encryption Service
+            #"BFE"                                         # Base Filtering Engine (Manages Firewall and Internet Protocol security)
+            #"BluetoothUserService_48486de"                # Bluetooth user service supports proper functionality of Bluetooth features relevant to each user session.
+            #"BrokerInfrastructure"                        # Windows Infrastructure Service (Controls which background tasks can run on the system)
+            "Browser"                                      # Let users browse and locate shared resources in neighboring computers
+            "BthAvctpSvc"                                  # AVCTP service (needed for Bluetooth Audio Devices or Wireless Headphones)
+            "CaptureService_48486de"                       # Optional screen capture functionality for applications that call the Windows.Graphics.Capture API.
+            "cbdhsvc_48486de"                              # Clipboard Service
             "diagnosticshub.standardcollector.service"     # Microsoft (R) Diagnostics Hub Standard Collector Service
             "DiagTrack"                                    # Diagnostics Tracking Service
-            "DPS"
-            "dmwappushservice"                             # WAP Push Message Routing Service (see known issues)
+            "dmwappushservice"                             # WAP Push Message Routing Service
+            "DPS"                                          # Diagnostic Policy Service (Detects and Troubleshoots Potential Problems)
+            "edgeupdate"                                   # Edge Update Service
+            "edgeupdatem"                                  # Another Update Service
+            "EntAppSvc"                                    # Enterprise Application Management.
+            "Fax"                                          # Fax Service
+            "fhsvc"                                        # Fax History
+            "FontCache"                                    # Windows font cache
+            #"FrameServer"                                 # Windows Camera Frame Server (Allows multiple clients to access video frames from camera devices)
+            "gupdate"                                      # Google Update
+            "gupdatem"                                     # Another Google Update Service
+            "iphlpsvc"                                     # ipv6(Most websites use ipv4 instead)
             "lfsvc"                                        # Geolocation Service
+            #"LicenseManager"                              # Disable LicenseManager (Windows Store may not work properly)
+            "lmhosts"                                      # TCP/IP NetBIOS Helper
             "MapsBroker"                                   # Downloaded Maps Manager
+            "MicrosoftEdgeElevationService"                # Another Edge Update Service
+            "MSDTC"                                        # Distributed Transaction Coordinator
+            "ndu"                                          # Windows Network Data Usage Monitor (Disabling Breaks Task Manager Per-Process Network Monitoring)
             "NetTcpPortSharing"                            # Net.Tcp Port Sharing Service
+            "PcaSvc"                                       # Program Compatibility Assistant Service
+            "PerfHost"                                     # Remote users and 64-bit processes to query performance.
+            "PhoneSvc"                                     # Phone Service(Manages the telephony state on the device)
+            #"PNRPsvc"                                     # Peer Name Resolution Protocol (Some peer-to-peer and collaborative applications, such as Remote Assistance, may not function, Discord will still work)
+            #"p2psvc"                                      # Peer Name Resolution Protocol(Enables multi-party communication using Peer-to-Peer Grouping.  If disabled, some applications, such as HomeGroup, may not function. Discord will still work)iscord will still work)
+            #"p2pimsvc"                                    # Peer Networking Identity Manager (Peer-to-Peer Grouping services may not function, and some applications, such as HomeGroup and Remote Assistance, may not function correctly. Discord will still work)
+            "PrintNotify"                                  # Windows printer notifications and extentions
+            "QWAVE"                                        # Quality Windows Audio Video Experience (audio and video might sound worse)
             "RemoteAccess"                                 # Routing and Remote Access
             "RemoteRegistry"                               # Remote Registry
+            "RetailDemo"                                   # Demo Mode for Store Display
+            "RtkBtManServ"                                 # Realtek Bluetooth Device Manager Service
+            "SCardSvr"                                     # Windows Smart Card Service
+            "seclogon"                                     # Secondary Logon (Disables other credentials only password will work)
+            "SEMgrSvc"                                     # Payments and NFC/SE Manager (Manages payments and Near Field Communication (NFC) based secure elements)
             "SharedAccess"                                 # Internet Connection Sharing (ICS)
+            #"Spooler"                                     # Printing
+            "stisvc"                                       # Windows Image Acquisition (WIA)
+            #"StorSvc"                                     # StorSvc (usb external hard drive will not be reconized by windows)
+            "SysMain"                                      # Analyses System Usage and Improves Performance
             "TrkWks"                                       # Distributed Link Tracking Client
-            #"WbioSrvc"                                     # Windows Biometric Service (required for Fingerprint reader / facial detection)
-            #"WlanSvc"                                      # WLAN AutoConfig
+            #"WbioSrvc"                                    # Windows Biometric Service (required for Fingerprint reader / facial detection)
+            "WerSvc"                                       # Windows error reporting
+            "wisvc"                                        # Windows Insider program(Windows Insider will not work if Disabled)
+            #"WlanSvc"                                     # WLAN AutoConfig
             "WMPNetworkSvc"                                # Windows Media Player Network Sharing Service
-            #"wscsvc"                                       # Windows Security Center Service
+            "WpcMonSvc"                                    # Parental Controls
+            "WPDBusEnum"                                   # Portable Device Enumerator Service
+            "WpnService"                                   # WpnService (Push Notifications may not work)
+            #"wscsvc"                                      # Windows Security Center Service
             "WSearch"                                      # Windows Search
-            "XblAuthManager"                               # Xbox Live Auth Manager
-            "XblGameSave"                                  # Xbox Live Game Save Service
-            "XboxNetApiSvc"                                # Xbox Live Networking Service
-            "XboxGipSvc"                                   #Disables Xbox Accessory Management Service
-            "ndu"                                          # Windows Network Data Usage Monitor
-            "WerSvc"                                       #disables windows error reporting
-            #"Spooler"                                      #Disables your printer
-            "Fax"                                          #Disables fax
-            "fhsvc"                                        #Disables fax histroy
-            "gupdate"                                      #Disables google update
-            "gupdatem"                                     #Disable another google update
-            "stisvc"                                       #Disables Windows Image Acquisition (WIA)
-            "AJRouter"                                     #Disables (needed for AllJoyn Router Service)
-            "MSDTC"                                        # Disables Distributed Transaction Coordinator
-            "WpcMonSvc"                                    #Disables Parental Controls
-            "PhoneSvc"                                     #Disables Phone Service(Manages the telephony state on the device)
-            "PrintNotify"                                  #Disables Windows printer notifications and extentions
-            "PcaSvc"                                       #Disables Program Compatibility Assistant Service
-            "WPDBusEnum"                                   #Disables Portable Device Enumerator Service
-            #"LicenseManager"                               #Disable LicenseManager(Windows store may not work properly)
-            "seclogon"                                     #Disables  Secondary Logon(disables other credentials only password will work)
-            "SysMain"                                      #Disables sysmain
-            "lmhosts"                                      #Disables TCP/IP NetBIOS Helper
-            "wisvc"                                        #Disables Windows Insider program(Windows Insider will not work)
-            "FontCache"                                    #Disables Windows font cache
-            "RetailDemo"                                   #Disables RetailDemo whic is often used when showing your device
-            "ALG"                                          # Disables Application Layer Gateway Service(Provides support for 3rd party protocol plug-ins for Internet Connection Sharing)
-            #"BFE"                                         #Disables Base Filtering Engine (BFE) (is a service that manages firewall and Internet Protocol security)
-            #"BrokerInfrastructure"                         #Disables Windows infrastructure service that controls which background tasks can run on the system.
-            "SCardSvr"                                      #Disables Windows smart card
-            "EntAppSvc"                                     #Disables enterprise application management.
-            "BthAvctpSvc"                                   #Disables AVCTP service (if you use  Bluetooth Audio Device or Wireless Headphones. then don't disable this)
-            #"FrameServer"                                   #Disables Windows Camera Frame Server(this allows multiple clients to access video frames from camera devices.)
-            "Browser"                                       #Disables computer browser
-            "BthAvctpSvc"                                   #AVCTP service (This is Audio Video Control Transport Protocol service.)
-            #"BDESVC"                                        #Disables bitlocker
-            "iphlpsvc"                                      #Disables ipv6 but most websites don't use ipv6 they use ipv4     
-            "edgeupdate"                                    # Disables one of edge update service  
-            "MicrosoftEdgeElevationService"                 # Disables one of edge  service 
-            "edgeupdatem"                                   # disbales another one of update service (disables edgeupdatem)                          
-            "SEMgrSvc"                                      #Disables Payments and NFC/SE Manager (Manages payments and Near Field Communication (NFC) based secure elements)
-            #"PNRPsvc"                                      # Disables peer Name Resolution Protocol ( some peer-to-peer and collaborative applications, such as Remote Assistance, may not function, Discord will still work)
-            #"p2psvc"                                       # Disbales Peer Name Resolution Protocol(nables multi-party communication using Peer-to-Peer Grouping.  If disabled, some applications, such as HomeGroup, may not function. Discord will still work)
-            #"p2pimsvc"                                     # Disables Peer Networking Identity Manager (Peer-to-Peer Grouping services may not function, and some applications, such as HomeGroup and Remote Assistance, may not function correctly.Discord will still work)
-            "PerfHost"                                      #Disables  remote users and 64-bit processes to query performance .
-            "BcastDVRUserService_48486de"                   #Disables GameDVR and Broadcast   is used for Game Recordings and Live Broadcasts
-            "CaptureService_48486de"                        #Disables ptional screen capture functionality for applications that call the Windows.Graphics.Capture API.  
-            "cbdhsvc_48486de"                               #Disables   cbdhsvc_48486de (clipboard service it disables)
-            #"BluetoothUserService_48486de"                  #disbales BluetoothUserService_48486de (The Bluetooth user service supports proper functionality of Bluetooth features relevant to each user session.)
-            "WpnService"                                    #Disables WpnService (Push Notifications may not work )
-            #"StorSvc"                                       #Disables StorSvc (usb external hard drive will not be reconised by windows)
-            "RtkBtManServ"                                  #Disables Realtek Bluetooth Device Manager Service
-            "QWAVE"                                         #Disables Quality Windows Audio Video Experience (audio and video might sound worse)
-            #Hp services
+            "XblAuthManager"                               # Xbox Live Auth Manager (Disabling Breaks Xbox Live Games)
+            "XblGameSave"                                  # Xbox Live Game Save Service (Disabling Breaks Xbox Live Games)
+            "XboxNetApiSvc"                                # Xbox Live Networking Service (Disabling Breaks Xbox Live Games)
+            "XboxGipSvc"                                   # Xbox Accessory Management Service
+             # Hp services
             "HPAppHelperCap"
             "HPDiagsCap"
             "HPNetworkCap"
             "HPSysInfoCap"
             "HpTouchpointAnalyticsService"
-            #hyper-v services
-            "HvHost"                          
-            "vmickvpexchange"
+             # Hyper-V services
+            "HvHost"
             "vmicguestinterface"
-            "vmicshutdown"
             "vmicheartbeat"
-            "vmicvmsession"
+            "vmickvpexchange"
             "vmicrdv"
-            "vmictimesync" 
-            # Services which cannot be disabled
+            "vmicshutdown"
+            "vmictimesync"
+            "vmicvmsession"
+             # Services that cannot be disabled
             #"WdNisSvc"
         )
         
@@ -1171,7 +1169,7 @@ $WPFtweaksbutton.Add_Click({
         "*AdobePhotoshopExpress*"
         "*HotspotShieldFreeVPN*"
 
-        #Optional: Typically not removed but you can if you need to for some reason
+        #Optional: Typically not removed but you can if you need to
         "*Microsoft.Advertising.Xaml*"
         #"*Microsoft.MSPaint*"
         #"*Microsoft.MicrosoftStickyNotes*"
@@ -1434,7 +1432,7 @@ function New-Directory($path) {
     $p, $components = $path -split '[\\/]'
     $components | ForEach-Object {
         $p = "$p\$_"
-        if (!(Test-Path $p)) {
+        If (!(Test-Path $p)) {
             New-Item -ItemType Directory $p | Out-Null
         }
     }
@@ -1471,7 +1469,7 @@ New-ItemProperty `
 # 1: PCs on my local network
 # 3: PCs on my local network, and PCs on the Internet
 $deliveryOptimizationPath = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\DeliveryOptimization\Config'
-if (Test-Path $deliveryOptimizationPath) {
+If (Test-Path $deliveryOptimizationPath) {
     New-ItemProperty `
         -Path $deliveryOptimizationPath `
         -Name DODownloadMode `
@@ -1581,10 +1579,9 @@ foreach ($service in $services) {
     Get-BitsTransfer | Remove-BitsTransfer 
     
     Write-Host "10) Attempting to install the Windows Update Agent..." 
-    if($arch -eq 64){ 
+    If ($arch -eq 64) { 
         wusa Windows8-RT-KB2937636-x64 /quiet 
-    } 
-    else{ 
+    } else { 
         wusa Windows8-RT-KB2937636-x86 /quiet 
     } 
     
@@ -1630,7 +1627,7 @@ function New-Directory($path) {
     $p, $components = $path -split '[\\/]'
     $components | ForEach-Object {
         $p = "$p\$_"
-        if (!(Test-Path $p)) {
+        If (!(Test-Path $p)) {
             New-Item -ItemType Directory $p | Out-Null
         }
     }
@@ -1667,7 +1664,7 @@ New-ItemProperty `
 # 1: PCs on my local network
 # 3: PCs on my local network, and PCs on the Internet
 $deliveryOptimizationPath = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\DeliveryOptimization\Config'
-if (Test-Path $deliveryOptimizationPath) {
+If (Test-Path $deliveryOptimizationPath) {
     New-ItemProperty `
         -Path $deliveryOptimizationPath `
         -Name DODownloadMode `