Fix typo (#3104)

- Added the ability to grab VirtIO Guest Tools
- Modified the description of the Copy ISO files function because it basically had nonsense

.github/requirements.txt

@@ -15,7 +15,7 @@ gitdb==4.0.11
 GitPython==3.1.43
 htmlmin2==0.1.13
 idna==3.7
-Jinja2==3.1.5
+Jinja2==3.1.4
 jsmin==3.0.1
 Markdown==3.6
 MarkupSafe==2.1.5

.github/workflows/pre-release.yaml

@@ -60,7 +60,7 @@ jobs:
         run: |
           $cert = Get-ChildItem -Path Cert:\CurrentUser\My -CodeSigningCert | Select-Object -First 1
           if ($null -eq $cert) { throw "Code signing certificate not found" }
-          Set-AuthenticodeSignature -FilePath ./winutil.ps1 -Certificate $cert -TimeStampServer "http://timestamp.digicert.com"
+          Set-AuthenticodeSignature -FilePath ./winutil.ps1 -Certificate $cert
 
       - name: Verify code signature
         shell: pwsh

README.md

@@ -52,7 +52,7 @@ If you have Issues, refer to [Known Issues](https://christitustech.github.io/win
 
 These are the sponsors that help keep this project alive with monthly contributions.
 
-<!-- sponsors --><a href="https://github.com/TriHydera"><img src="https:&#x2F;&#x2F;github.com&#x2F;TriHydera.png" width="60px" alt="User avatar: TriHydera" /></a><a href="https://github.com/jozozovko"><img src="https:&#x2F;&#x2F;github.com&#x2F;jozozovko.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/DelDongo"><img src="https:&#x2F;&#x2F;github.com&#x2F;DelDongo.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/markamos"><img src="https:&#x2F;&#x2F;github.com&#x2F;markamos.png" width="60px" alt="User avatar: Mark Amos" /></a><a href="https://github.com/dwelfusius"><img src="https:&#x2F;&#x2F;github.com&#x2F;dwelfusius.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/mews-se"><img src="https:&#x2F;&#x2F;github.com&#x2F;mews-se.png" width="60px" alt="User avatar: Martin Stockzell" /></a><a href="https://github.com/jdiegmueller"><img src="https:&#x2F;&#x2F;github.com&#x2F;jdiegmueller.png" width="60px" alt="User avatar: Jason A. Diegmueller" /></a><a href="https://github.com/AlanTristar"><img src="https:&#x2F;&#x2F;github.com&#x2F;AlanTristar.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/zepled112"><img src="https:&#x2F;&#x2F;github.com&#x2F;zepled112.png" width="60px" alt="User avatar: wyatt" /></a><a href="https://github.com/altugtekiner"><img src="https:&#x2F;&#x2F;github.com&#x2F;altugtekiner.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/robertsandrock"><img src="https:&#x2F;&#x2F;github.com&#x2F;robertsandrock.png" width="60px" alt="User avatar: RMS" /></a><a href="https://github.com/KenichiQaz"><img src="https:&#x2F;&#x2F;github.com&#x2F;KenichiQaz.png" width="60px" alt="User avatar: Stefan" /></a><a href="https://github.com/paulsheets"><img src="https:&#x2F;&#x2F;github.com&#x2F;paulsheets.png" width="60px" alt="User avatar: Paul" /></a><a href="https://github.com/djones369"><img src="https:&#x2F;&#x2F;github.com&#x2F;djones369.png" width="60px" alt="User avatar: Dave Jones" /></a><a href="https://github.com/anthonymendez"><img src="https:&#x2F;&#x2F;github.com&#x2F;anthonymendez.png" width="60px" alt="User avatar: Anthony Mendez" /></a><a href="https://github.com/claudemods"><img src="https:&#x2F;&#x2F;github.com&#x2F;claudemods.png" width="60px" alt="User avatar: Claudemods" /></a><a href="https://github.com/FatBastard0"><img src="https:&#x2F;&#x2F;github.com&#x2F;FatBastard0.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/Ascent7910"><img src="https:&#x2F;&#x2F;github.com&#x2F;Ascent7910.png" width="60px" alt="User avatar: Max" /></a><a href="https://github.com/DursleyGuy"><img src="https:&#x2F;&#x2F;github.com&#x2F;DursleyGuy.png" width="60px" alt="User avatar: DursleyGuy" /></a><a href="https://github.com/YamiSandman616"><img src="https:&#x2F;&#x2F;github.com&#x2F;YamiSandman616.png" width="60px" alt="User avatar: Sandman616" /></a><a href="https://github.com/realmuddy"><img src="https:&#x2F;&#x2F;github.com&#x2F;realmuddy.png" width="60px" alt="User avatar: Phillip Waters" /></a><a href="https://github.com/quaszi"><img src="https:&#x2F;&#x2F;github.com&#x2F;quaszi.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/EgoRaInevitable"><img src="https:&#x2F;&#x2F;github.com&#x2F;EgoRaInevitable.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/Unambiguous"><img src="https:&#x2F;&#x2F;github.com&#x2F;Unambiguous.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/Freestyler589"><img src="https:&#x2F;&#x2F;github.com&#x2F;Freestyler589.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/EA-1356"><img src="https:&#x2F;&#x2F;github.com&#x2F;EA-1356.png" width="60px" alt="User avatar: meris" /></a><!-- sponsors -->
+<!-- sponsors --><a href="https://github.com/TriHydera"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;39857764?u&#x3D;5dbda638f45530582eee1703b4473f2a5e229e28&amp;v&#x3D;4" width="60px" alt="TriHydera" /></a><a href="https://github.com/jozozovko"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;3272468?u&#x3D;4391ed4655e4fd8b56e23b4169e44e2ac9b6cd97&amp;v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/DelDongo"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;127976398?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/markamos"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;9561861?u&#x3D;3cca179dcff0413538591e57a3abea116d65ce56&amp;v&#x3D;4" width="60px" alt="Mark Amos" /></a><a href="https://github.com/dwelfusius"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;54533224?u&#x3D;a49ea000a8f52adb31382ea69a1a7501b27fefdd&amp;v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/mews-se"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;58894405?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/jdiegmueller"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;18660571?u&#x3D;601d0a23040a271c86b5d40339f899a6dbf27086&amp;v&#x3D;4" width="60px" alt="Jason A. Diegmueller" /></a><a href="https://github.com/AlanTristar"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;105566568?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/zepled112"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;65176625?v&#x3D;4" width="60px" alt="wyatt" /></a><a href="https://github.com/altugtekiner"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;105917451?u&#x3D;ee73ff639c7bd9feb4708ab4ba7b14eff80196f7&amp;v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/robertsandrock"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;12015331?u&#x3D;76849d3cb36b420922d235299558e00a09f2f8b4&amp;v&#x3D;4" width="60px" alt="RMS" /></a><a href="https://github.com/mmomega"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;71956566?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/KenichiQaz"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;31177857?u&#x3D;efdbae734a4c60a7bb95df4659d0535e60a6fd57&amp;v&#x3D;4" width="60px" alt="Stefan" /></a><a href="https://github.com/paulsheets"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;45240946?u&#x3D;d4db66f8e8d7a2606fe7a5521daf48ca9f097105&amp;v&#x3D;4" width="60px" alt="Paul" /></a><a href="https://github.com/djones369"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;4107092?v&#x3D;4" width="60px" alt="Dave Jones" /></a><a href="https://github.com/anthonymendez"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;19240897?u&#x3D;f82b4be098cac65c8421421b70ebd2d1da85c67e&amp;v&#x3D;4" width="60px" alt="Anthony Mendez" /></a><a href="https://github.com/claudemods"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;73653396?u&#x3D;d64c656fb8db24ef56bb000197532df9b618d06c&amp;v&#x3D;4" width="60px" alt="Claudemods" /></a><a href="https://github.com/FatBastard0"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;173957728?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/Ascent7910"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;118260621?v&#x3D;4" width="60px" alt="Max" /></a><a href="https://github.com/DursleyGuy"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;140165544?v&#x3D;4" width="60px" alt="DursleyGuy" /></a><a href="https://github.com/YamiSandman616"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;183505690?u&#x3D;c3bd20157058b6215e28f7568d4f8c4fbbe92838&amp;v&#x3D;4" width="60px" alt="Sandman616" /></a><a href="https://github.com/realmuddy"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;30978236?v&#x3D;4" width="60px" alt="Phillip Waters" /></a><a href="https://github.com/quaszi"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;51266738?u&#x3D;2e3185214607e51239c5969c866ddd5eb1bdee48&amp;v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/Psyhackological"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;47569716?u&#x3D;66dc5e86731eaf8c6bc78a1bff34420ed2e5402b&amp;v&#x3D;4" width="60px" alt="Konrad Konieczny" /></a><!-- sponsors -->
 
 ## 🏅 Thanks to all Contributors
 Thanks a lot for spending your time helping Winutil grow. Thanks a lot! Keep rocking 🍻.

config/tweaks.json

@@ -3301,7 +3301,6 @@
         "Name": "AppsUseLightTheme",
         "Value": "0",
         "OriginalValue": "1",
-        "DefaultState": "false",
         "Type": "DWord"
       },
       {
@@ -3309,7 +3308,6 @@
         "Name": "SystemUsesLightTheme",
         "Value": "0",
         "OriginalValue": "1",
-        "DefaultState": "false",
         "Type": "DWord"
       }
     ],
@@ -3344,7 +3342,6 @@
         "Name": "BingSearchEnabled",
         "Value": "1",
         "OriginalValue": "0",
-        "DefaultState": "true",
         "Type": "DWord"
       }
     ],
@@ -3363,7 +3360,6 @@
         "Name": "InitialKeyboardIndicators",
         "Value": "2",
         "OriginalValue": "0",
-        "DefaultState": "false",
         "Type": "DWord"
       },
       {
@@ -3371,7 +3367,6 @@
         "Name": "InitialKeyboardIndicators",
         "Value": "2",
         "OriginalValue": "0",
-        "DefaultState": "false",
         "Type": "DWord"
       }
     ],
@@ -3390,53 +3385,17 @@
         "Name": "VerboseStatus",
         "Value": "1",
         "OriginalValue": "0",
-        "DefaultState": "false",
         "Type": "DWord"
       }
     ],
     "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/VerboseLogon"
   },
-  "WPFToggleStartMenuRecommendations": {
-    "Content": "Recommendations in Start Menu",
-    "Description": "If disabled then you will not see recommendations in the Start Menu. | Enables 'iseducationenvironment' | Relogin Required.",
-    "category": "Customize Preferences",
-    "panel": "2",
-    "Order": "a104_",
-    "Type": "Toggle",
-    "registry": [
-      {
-        "Path": "HKLM:\\SOFTWARE\\Microsoft\\PolicyManager\\current\\device\\Start",
-        "Name": "HideRecommendedSection",
-        "Value": "0",
-        "OriginalValue": "1",
-        "DefaultState": "true",
-        "Type": "DWord"
-      },
-      {
-        "Path": "HKLM:\\SOFTWARE\\Microsoft\\PolicyManager\\current\\device\\Education",
-        "Name": "IsEducationEnvironment",
-        "Value": "0",
-        "OriginalValue": "1",
-        "DefaultState": "true",
-        "Type": "DWord"
-      },
-      {
-        "Path": "HKLM:\\SOFTWARE\\Policies\\Microsoft\\Windows\\Explorer",
-        "Name": "HideRecommendedSection",
-        "Value": "0",
-        "OriginalValue": "1",
-        "DefaultState": "true",
-        "Type": "DWord"
-      }
-    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/WPFToggleStartMenuRecommendations"
-  },
   "WPFToggleSnapWindow": {
     "Content": "Snap Window",
     "Description": "If enabled you can align windows by dragging them. | Relogin Required",
     "category": "Customize Preferences",
     "panel": "2",
-    "Order": "a105_",
+    "Order": "a104_",
     "Type": "Toggle",
     "registry": [
       {
@@ -3444,7 +3403,6 @@
         "Name": "WindowArrangementActive",
         "Value": "1",
         "OriginalValue": "0",
-        "DefaultState": "true",
         "Type": "String"
       }
     ],
@@ -3455,7 +3413,7 @@
     "Description": "If enabled then Snap preview is disabled when maximize button is hovered.",
     "category": "Customize Preferences",
     "panel": "2",
-    "Order": "a106_",
+    "Order": "a105_",
     "Type": "Toggle",
     "registry": [
       {
@@ -3463,7 +3421,6 @@
         "Name": "EnableSnapAssistFlyout",
         "Value": "1",
         "OriginalValue": "0",
-        "DefaultState": "true",
         "Type": "DWord"
       }
     ],
@@ -3484,7 +3441,7 @@
     "Description": "If enabled then you will get suggestions to snap other applications in the left over spaces.",
     "category": "Customize Preferences",
     "panel": "2",
-    "Order": "a107_",
+    "Order": "a106_",
     "Type": "Toggle",
     "registry": [
       {
@@ -3492,7 +3449,6 @@
         "Name": "SnapAssist",
         "Value": "1",
         "OriginalValue": "0",
-        "DefaultState": "true",
         "Type": "DWord"
       }
     ],
@@ -3513,7 +3469,7 @@
     "Description": "If Enabled then Cursor movement is affected by the speed of your physical mouse movements.",
     "category": "Customize Preferences",
     "panel": "2",
-    "Order": "a108_",
+    "Order": "a107_",
     "Type": "Toggle",
     "registry": [
       {
@@ -3521,7 +3477,6 @@
         "Name": "MouseSpeed",
         "Value": "1",
         "OriginalValue": "0",
-        "DefaultState": "true",
         "Type": "DWord"
       },
       {
@@ -3529,7 +3484,6 @@
         "Name": "MouseThreshold1",
         "Value": "6",
         "OriginalValue": "0",
-        "DefaultState": "true",
         "Type": "DWord"
       },
       {
@@ -3537,7 +3491,6 @@
         "Name": "MouseThreshold2",
         "Value": "10",
         "OriginalValue": "0",
-        "DefaultState": "true",
         "Type": "DWord"
       }
     ],
@@ -3548,7 +3501,7 @@
     "Description": "If Enabled then Sticky Keys is activated - Sticky keys is an accessibility feature of some graphical user interfaces which assists users who have physical disabilities or help users reduce repetitive strain injury.",
     "category": "Customize Preferences",
     "panel": "2",
-    "Order": "a109_",
+    "Order": "a108_",
     "Type": "Toggle",
     "registry": [
       {
@@ -3556,7 +3509,6 @@
         "Name": "Flags",
         "Value": "510",
         "OriginalValue": "58",
-        "DefaultState": "true",
         "Type": "DWord"
       }
     ],
@@ -3575,7 +3527,6 @@
         "Name": "Hidden",
         "Value": "1",
         "OriginalValue": "0",
-        "DefaultState": "false",
         "Type": "DWord"
       }
     ],
@@ -3604,7 +3555,6 @@
         "Name": "HideFileExt",
         "Value": "0",
         "OriginalValue": "1",
-        "DefaultState": "false",
         "Type": "DWord"
       }
     ],
@@ -3633,7 +3583,6 @@
         "Name": "SearchboxTaskbarMode",
         "Value": "1",
         "OriginalValue": "0",
-        "DefaultState": "true",
         "Type": "DWord"
       }
     ],
@@ -3652,7 +3601,6 @@
         "Name": "ShowTaskViewButton",
         "Value": "1",
         "OriginalValue": "0",
-        "DefaultState": "true",
         "Type": "DWord"
       }
     ],
@@ -3671,7 +3619,6 @@
         "Name": "TaskbarDa",
         "Value": "1",
         "OriginalValue": "0",
-        "DefaultState": "true",
         "Type": "DWord"
       }
     ],
@@ -3690,7 +3637,6 @@
         "Name": "TaskbarAl",
         "Value": "1",
         "OriginalValue": "0",
-        "DefaultState": "true",
         "Type": "DWord"
       }
     ],
@@ -3709,7 +3655,6 @@
         "Name": "DisplayParameters",
         "Value": "1",
         "OriginalValue": "0",
-        "DefaultState": "false",
         "Type": "DWord"
       },
       {
@@ -3717,7 +3662,6 @@
         "Name": "DisableEmoticon",
         "Value": "1",
         "OriginalValue": "0",
-        "DefaultState": "false",
         "Type": "DWord"
       }
     ],

functions/microwin/Invoke-Microwin.ps1

@@ -111,7 +111,7 @@ public class PowerManagement {
         Write-Host "Mounting Windows image. This may take a while."
         Mount-WindowsImage -ImagePath "$mountDir\sources\install.wim" -Index $index -Path "$scratchDir"
         if ($?) {
-            Write-Host "The Windows image has been mounted successfully. Continuing processing..."
+            Write-Host "Mounting complete! Performing removal of applications..."
         } else {
             Write-Host "Could not mount image. Exiting..."
             Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
@@ -163,12 +163,12 @@ public class PowerManagement {
         }
 
         Write-Host "Remove Features from the image"
-        Microwin-RemoveFeatures -UseCmdlets $true
+        Microwin-RemoveFeatures
         Write-Host "Removing features complete!"
         Write-Host "Removing OS packages"
-        Microwin-RemovePackages -UseCmdlets $true
+        Microwin-RemovePackages
         Write-Host "Removing Appx Bloat"
-        Microwin-RemoveProvisionedPackages -UseCmdlets $true
+        Microwin-RemoveProvisionedPackages
 
         # Detect Windows 11 24H2 and add dependency to FileExp to prevent Explorer look from going back - thanks @WitherOrNot and @thecatontheceiling
         if ((Microwin-TestCompatibleImage $imgVersion $([System.Version]::new(10,0,26100,1))) -eq $true) {
@@ -285,22 +285,20 @@ public class PowerManagement {
         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
 
-        # Prevent Windows Update Installing so called Expedited Apps - 24H2 and newer
+        # Prevent Windows Update Installing so called Expedited Apps
-        if ((Microwin-TestCompatibleImage $imgVersion $([System.Version]::new(10,0,26100,1))) -eq $true) {
+        @(
-            @(
+            'EdgeUpdate',
-                'EdgeUpdate',
+            'DevHomeUpdate',
-                'DevHomeUpdate',
+            'OutlookUpdate',
-                'OutlookUpdate',
+            'CrossDeviceUpdate'
-                'CrossDeviceUpdate'
+        ) | ForEach-Object {
-            ) | ForEach-Object {
+            Write-Host "Removing Windows Expedited App: $_"
-                Write-Host "Removing Windows Expedited App: $_"
 
-                # Copied here After Installation (Online)
+            # Copied here After Installation (Online)
-                # reg delete "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Orchestrator\UScheduler\$_" /f | Out-Null
+            # reg delete "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Orchestrator\UScheduler\$_" /f | Out-Null
 
-                # When in Offline Image
+            # When in Offline Image
-                reg delete "HKLM\zSOFTWARE\Microsoft\WindowsUpdate\Orchestrator\UScheduler_Oobe\$_" /f | Out-Null
+            reg delete "HKLM\zSOFTWARE\Microsoft\WindowsUpdate\Orchestrator\UScheduler_Oobe\$_" /f | Out-Null
-            }
         }
 
         reg add "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "SearchboxTaskbarMode" /t REG_DWORD /d 0 /f

functions/microwin/Invoke-MicrowinGetIso.ps1

@@ -169,7 +169,7 @@ function Invoke-MicrowinGetIso {
     try {
         Write-Host "Mounting Iso. Please wait."
         $mountedISO = Mount-DiskImage -PassThru "$filePath"
-        Write-Host "Done mounting Iso `"$($mountedISO.ImagePath)`""
+        Write-Host "Done mounting Iso $mountedISO"
         $driveLetter = (Get-Volume -DiskImage $mountedISO).DriveLetter
         Write-Host "Iso mounted to '$driveLetter'"
     } catch {
@@ -189,7 +189,7 @@ function Invoke-MicrowinGetIso {
         $sync.MicrowinScratchDirBox.Text =""
     }
 
-    $UseISOScratchDir = $sync.WPFMicrowinISOScratchDir.IsChecked
+     $UseISOScratchDir = $sync.WPFMicrowinISOScratchDir.IsChecked
 
     if ($UseISOScratchDir) {
         $sync.MicrowinScratchDirBox.Text=$mountedISOPath
@@ -220,8 +220,8 @@ function Invoke-MicrowinGetIso {
     $sync.BusyText.Text=" - Mounting"
     Write-Host "Mounting Iso. Please wait."
     if ($sync.MicrowinScratchDirBox.Text -eq "") {
-        $mountDir = Join-Path $env:TEMP $randomMicrowin
+    $mountDir = Join-Path $env:TEMP $randomMicrowin
-        $scratchDir = Join-Path $env:TEMP $randomMicrowinScratch
+    $scratchDir = Join-Path $env:TEMP $randomMicrowinScratch
     } else {
         $scratchDir = $sync.MicrowinScratchDirBox.Text+"Scratch"
         $mountDir = $sync.MicrowinScratchDirBox.Text+"micro"

functions/microwin/Microwin-RemoveFeatures.ps1

@@ -3,80 +3,38 @@ function Microwin-RemoveFeatures() {
         .SYNOPSIS
             Removes certain features from ISO image
 
-        .PARAMETER UseCmdlets
+        .PARAMETER Name
-            Determines whether or not to use the DISM cmdlets for processing.
+            No Params
-            - If true, DISM cmdlets will be used
-            - If false, calls to the DISM executable will be made whilst selecting bits and pieces from the output as a string (that was how MicroWin worked before
-              the DISM conversion to cmdlets)
 
         .EXAMPLE
-            Microwin-RemoveFeatures -UseCmdlets $true
+            Microwin-RemoveFeatures
     #>
-    param (
-        [Parameter(Mandatory = $true, Position = 0)] [bool]$UseCmdlets
-    )
     try {
-        if ($UseCmdlets) {
+        $featlist = (Get-WindowsOptionalFeature -Path $scratchDir)
-            $featlist = (Get-WindowsOptionalFeature -Path "$scratchDir")
 
-            $featlist = $featlist | Where-Object {
+        $featlist = $featlist | Where-Object {
-                $_.FeatureName -NotLike "*Defender*" -AND
+            $_.FeatureName -NotLike "*Defender*" -AND
-                $_.FeatureName -NotLike "*Printing*" -AND
+            $_.FeatureName -NotLike "*Printing*" -AND
-                $_.FeatureName -NotLike "*TelnetClient*" -AND
+            $_.FeatureName -NotLike "*TelnetClient*" -AND
-                $_.FeatureName -NotLike "*PowerShell*" -AND
+            $_.FeatureName -NotLike "*PowerShell*" -AND
-                $_.FeatureName -NotLike "*NetFx*" -AND
+            $_.FeatureName -NotLike "*NetFx*" -AND
-                $_.FeatureName -NotLike "*Media*" -AND
+            $_.FeatureName -NotLike "*Media*" -AND
-                $_.FeatureName -NotLike "*NFS*" -AND
+            $_.FeatureName -NotLike "*NFS*" -AND
-                $_.FeatureName -NotLike "*SearchEngine*" -AND
+            $_.FeatureName -NotLike "*SearchEngine*" -AND
-                $_.FeatureName -NotLike "*RemoteDesktop*" -AND
+            $_.FeatureName -NotLike "*RemoteDesktop*" -AND
-                $_.State -ne "Disabled"
+            $_.State -ne "Disabled"
-            }
-        } else {
-            $featList = dism /english /image="$scratchDir" /get-features | Select-String -Pattern "Feature Name : " -CaseSensitive -SimpleMatch
-            if ($?) {
-                $featList = $featList -split "Feature Name : " | Where-Object {$_}
-                # Exclude the same items. Note: for now, this doesn't exclude those features that are disabled.
-                # This will appear in the future
-                $featList = $featList | Where-Object {
-                    $_ -NotLike "*Defender*" -AND
-                    $_ -NotLike "*Printing*" -AND
-                    $_ -NotLike "*TelnetClient*" -AND
-                    $_ -NotLike "*PowerShell*" -AND
-                    $_ -NotLike "*NetFx*" -AND
-                    $_ -NotLike "*Media*" -AND
-                    $_ -NotLike "*NFS*" -AND
-                    $_ -NotLike "*SearchEngine*" -AND
-                    $_ -NotLike "*RemoteDesktop*"
-                }
-            } else {
-                Write-Host "Features could not be obtained with DISM. MicroWin processing will continue, but features will be skipped."
-                return
-            }
         }
 
-        if ($UseCmdlets) {
+        foreach($feature in $featlist) {
-            foreach ($feature in $featList) {
+            $status = "Removing feature $($feature.FeatureName)"
-                $status = "Removing feature $($feature.FeatureName)"
+            Write-Progress -Activity "Removing features" -Status $status -PercentComplete ($counter++/$featlist.Count*100)
-                Write-Progress -Activity "Removing features" -Status $status -PercentComplete ($counter++/$featlist.Count*100)
+            Write-Debug "Removing feature $($feature.FeatureName)"
-                Write-Debug "Removing feature $($feature.FeatureName)"
+            Disable-WindowsOptionalFeature -Path "$scratchDir" -FeatureName $($feature.FeatureName) -Remove  -ErrorAction SilentlyContinue -NoRestart
-                Disable-WindowsOptionalFeature -Path "$scratchDir" -FeatureName $($feature.FeatureName) -Remove  -ErrorAction SilentlyContinue -NoRestart
-            }
-        } else {
-            foreach ($feature in $featList) {
-                $status = "Removing feature $feature"
-                Write-Progress -Activity "Removing features" -Status $status -PercentComplete ($counter++/$featlist.Count*100)
-                Write-Debug "Removing feature $feature"
-                dism /english /image="$scratchDir" /disable-feature /featurename=$feature /remove /quiet /norestart | Out-Null
-                if ($? -eq $false) {
-                    Write-Host "Feature $feature could not be disabled."
-                }
-            }
         }
         Write-Progress -Activity "Removing features" -Status "Ready" -Completed
         Write-Host "You can re-enable the disabled features at any time, using either Windows Update or the SxS folder in <installation media>\Sources."
     } catch {
-        Write-Host "Unable to get information about the features. A fallback will be used..."
+        Write-Host "Unable to get information about the features. MicroWin processing will continue, but features will not be processed"
         Write-Host "Error information: $($_.Exception.Message)" -ForegroundColor Yellow
-        Microwin-RemoveFeatures -UseCmdlets $false
     }
 }

functions/microwin/Microwin-RemovePackages.ps1

@@ -1,103 +1,44 @@
 function Microwin-RemovePackages {
-    <#
-        .SYNOPSIS
-            Removes certain packages from ISO image
-
-        .PARAMETER UseCmdlets
-            Determines whether or not to use the DISM cmdlets for processing.
-            - If true, DISM cmdlets will be used
-            - If false, calls to the DISM executable will be made whilst selecting bits and pieces from the output as a string (that was how MicroWin worked before
-              the DISM conversion to cmdlets)
-
-        .EXAMPLE
-            Microwin-RemovePackages -UseCmdlets $true
-    #>
-    param (
-        [Parameter(Mandatory = $true, Position = 0)] [bool]$UseCmdlets
-    )
     try {
-        if ($useCmdlets) {
+        $pkglist = (Get-WindowsPackage -Path "$scratchDir").PackageName
-            $pkglist = (Get-WindowsPackage -Path "$scratchDir").PackageName
 
-            $pkglist = $pkglist | Where-Object {
+        $pkglist = $pkglist | Where-Object {
-                    $_ -NotLike "*ApplicationModel*" -AND
+                $_ -NotLike "*ApplicationModel*" -AND
-                    $_ -NotLike "*indows-Client-LanguagePack*" -AND
+                $_ -NotLike "*indows-Client-LanguagePack*" -AND
-                    $_ -NotLike "*LanguageFeatures-Basic*" -AND
+                $_ -NotLike "*LanguageFeatures-Basic*" -AND
-                    $_ -NotLike "*Package_for_ServicingStack*" -AND
+                $_ -NotLike "*Package_for_ServicingStack*" -AND
-                    $_ -NotLike "*DotNet*" -AND
+                $_ -NotLike "*DotNet*" -AND
-                    $_ -NotLike "*Notepad*" -AND
+                $_ -NotLike "*Notepad*" -AND
-                    $_ -NotLike "*WMIC*" -AND
+                $_ -NotLike "*WMIC*" -AND
-                    $_ -NotLike "*Ethernet*" -AND
+                $_ -NotLike "*Ethernet*" -AND
-                    $_ -NotLike "*Wifi*" -AND
+                $_ -NotLike "*Wifi*" -AND
-                    $_ -NotLike "*FodMetadata*" -AND
+                $_ -NotLike "*FodMetadata*" -AND
-                    $_ -NotLike "*Foundation*" -AND
+                $_ -NotLike "*Foundation*" -AND
-                    $_ -NotLike "*LanguageFeatures*" -AND
+                $_ -NotLike "*LanguageFeatures*" -AND
-                    $_ -NotLike "*VBSCRIPT*" -AND
+                $_ -NotLike "*VBSCRIPT*" -AND
-                    $_ -NotLike "*License*" -AND
+                $_ -NotLike "*License*" -AND
-                    $_ -NotLike "*Hello-Face*" -AND
+                $_ -NotLike "*Hello-Face*" -AND
-                    $_ -NotLike "*ISE*" -AND
+                $_ -NotLike "*ISE*"
-                    $_ -NotLike "*OpenSSH*"
-                }
-        } else {
-            $pkgList = dism /english /image="$scratchDir" /get-packages | Select-String -Pattern "Package Identity : " -CaseSensitive -SimpleMatch
-            if ($?) {
-                $pkgList = $pkgList -split "Package Identity : " | Where-Object {$_}
-                # Exclude the same items.
-                $pkgList = $pkgList | Where-Object {
-                    $_ -NotLike "*ApplicationModel*" -AND
-                    $_ -NotLike "*indows-Client-LanguagePack*" -AND
-                    $_ -NotLike "*LanguageFeatures-Basic*" -AND
-                    $_ -NotLike "*Package_for_ServicingStack*" -AND
-                    $_ -NotLike "*DotNet*" -AND
-                    $_ -NotLike "*Notepad*" -AND
-                    $_ -NotLike "*WMIC*" -AND
-                    $_ -NotLike "*Ethernet*" -AND
-                    $_ -NotLike "*Wifi*" -AND
-                    $_ -NotLike "*FodMetadata*" -AND
-                    $_ -NotLike "*Foundation*" -AND
-                    $_ -NotLike "*LanguageFeatures*" -AND
-                    $_ -NotLike "*VBSCRIPT*" -AND
-                    $_ -NotLike "*License*" -AND
-                    $_ -NotLike "*Hello-Face*" -AND
-                    $_ -NotLike "*ISE*" -AND
-                    $_ -NotLike "*OpenSSH*"
-                }
-            } else {
-                Write-Host "Packages could not be obtained with DISM. MicroWin processing will continue, but packages will be skipped."
-                return
             }
-        }
 
-        if ($UseCmdlets) {
+        $failedCount = 0
-            $failedCount = 0
 
-            $erroredPackages = [System.Collections.Generic.List[ErroredPackage]]::new()
+        $erroredPackages = [System.Collections.Generic.List[ErroredPackage]]::new()
 
-            foreach ($pkg in $pkglist) {
+        foreach ($pkg in $pkglist) {
-                try {
+            try {
-                    $status = "Removing $pkg"
+                $status = "Removing $pkg"
-                    Write-Progress -Activity "Removing Packages" -Status $status -PercentComplete ($counter++/$pkglist.Count*100)
+                Write-Progress -Activity "Removing Packages" -Status $status -PercentComplete ($counter++/$pkglist.Count*100)
-                    Remove-WindowsPackage -Path "$scratchDir" -PackageName $pkg -NoRestart -ErrorAction SilentlyContinue
+                Remove-WindowsPackage -Path "$scratchDir" -PackageName $pkg -NoRestart -ErrorAction SilentlyContinue
-                } catch {
+            } catch {
-                    # This can happen if the package that is being removed is a permanent one
+                # This can happen if the package that is being removed is a permanent one
-                    $erroredPackages.Add([ErroredPackage]::new($pkg, $_.Exception.Message))
+                $erroredPackages.Add([ErroredPackage]::new($pkg, $_.Exception.Message))
-                    $failedCount += 1
+                $failedCount += 1
-                    continue
+                continue
-                }
-            }
-        } else {
-            foreach ($package in $pkgList) {
-                $status = "Removing package $package"
-                Write-Progress -Activity "Removing features" -Status $status -PercentComplete ($counter++/$featlist.Count*100)
-                Write-Debug "Removing package $package"
-                dism /english /image="$scratchDir" /remove-package /packagename=$package /remove /quiet /norestart | Out-Null
-                if ($? -eq $false) {
-                    Write-Host "Package $package could not be removed."
-                }
             }
         }
         Write-Progress -Activity "Removing Packages" -Status "Ready" -Completed
-        if ($UseCmdlets -and $failedCount -gt 0)
+        if ($failedCount -gt 0)
         {
             Write-Host "$failedCount package(s) could not be removed. Your image will still work fine, however. Below is information on what packages failed to be removed and why."
             if ($erroredPackages.Count -gt 0)
@@ -122,8 +63,7 @@ function Microwin-RemovePackages {
             }
         }
     } catch {
-        Write-Host "Unable to get information about the packages. A fallback will be used..."
+        Write-Host "Unable to get information about the packages. MicroWin processing will continue, but packages will not be processed"
         Write-Host "Error information: $($_.Exception.Message)" -ForegroundColor Yellow
-        Microwin-RemovePackages -UseCmdlets $false
     }
 }

functions/microwin/Microwin-RemoveProvisionedPackages.ps1

@@ -3,94 +3,49 @@ function Microwin-RemoveProvisionedPackages() {
         .SYNOPSIS
         Removes AppX packages from a Windows image during MicroWin processing
 
-        .PARAMETER UseCmdlets
+        .PARAMETER Name
-            Determines whether or not to use the DISM cmdlets for processing.
+        No Params
-            - If true, DISM cmdlets will be used
-            - If false, calls to the DISM executable will be made whilst selecting bits and pieces from the output as a string (that was how MicroWin worked before
-              the DISM conversion to cmdlets)
 
         .EXAMPLE
         Microwin-RemoveProvisionedPackages
     #>
-    param (
-        [Parameter(Mandatory = $true, Position = 0)] [bool]$UseCmdlets
-    )
     try
     {
-        if ($UseCmdlets) {
+        $appxProvisionedPackages = Get-AppxProvisionedPackage -Path "$($scratchDir)" | Where-Object {
-            $appxProvisionedPackages = Get-AppxProvisionedPackage -Path "$($scratchDir)" | Where-Object {
+                $_.PackageName -NotLike "*AppInstaller*" -AND
-                    $_.PackageName -NotLike "*AppInstaller*" -AND
+                $_.PackageName -NotLike "*Store*" -and
-                    $_.PackageName -NotLike "*Store*" -and
+                $_.PackageName -NotLike "*Notepad*" -and
-                    $_.PackageName -NotLike "*Notepad*" -and
+                $_.PackageName -NotLike "*Printing*" -and
-                    $_.PackageName -NotLike "*Printing*" -and
+                $_.PackageName -NotLike "*YourPhone*" -and
-                    $_.PackageName -NotLike "*YourPhone*" -and
+                $_.PackageName -NotLike "*Xbox*" -and
-                    $_.PackageName -NotLike "*Xbox*" -and
+                $_.PackageName -NotLike "*WindowsTerminal*" -and
-                    $_.PackageName -NotLike "*WindowsTerminal*" -and
+                $_.PackageName -NotLike "*Calculator*" -and
-                    $_.PackageName -NotLike "*Calculator*" -and
+                $_.PackageName -NotLike "*Photos*" -and
-                    $_.PackageName -NotLike "*Photos*" -and
+                $_.PackageName -NotLike "*VCLibs*" -and
-                    $_.PackageName -NotLike "*VCLibs*" -and
+                $_.PackageName -NotLike "*Paint*" -and
-                    $_.PackageName -NotLike "*Paint*" -and
+                $_.PackageName -NotLike "*Gaming*" -and
-                    $_.PackageName -NotLike "*Gaming*" -and
+                $_.PackageName -NotLike "*Extension*" -and
-                    $_.PackageName -NotLike "*Extension*" -and
+                $_.PackageName -NotLike "*SecHealthUI*" -and
-                    $_.PackageName -NotLike "*SecHealthUI*" -and
+                $_.PackageName -NotLike "*ScreenSketch*"
-                    $_.PackageName -NotLike "*ScreenSketch*"
-            }
-        } else {
-            $appxProvisionedPackages = dism /english /image="$scratchDir" /get-provisionedappxpackages | Select-String -Pattern "PackageName : " -CaseSensitive -SimpleMatch
-            if ($?) {
-                $appxProvisionedPackages = $appxProvisionedPackages -split "PackageName : " | Where-Object {$_}
-                # Exclude the same items.
-                $appxProvisionedPackages = $appxProvisionedPackages | Where-Object {
-                    $_ -NotLike "*AppInstaller*" -AND
-                    $_ -NotLike "*Store*" -and
-                    $_ -NotLike "*Notepad*" -and
-                    $_ -NotLike "*Printing*" -and
-                    $_ -NotLike "*YourPhone*" -and
-                    $_ -NotLike "*Xbox*" -and
-                    $_ -NotLike "*WindowsTerminal*" -and
-                    $_ -NotLike "*Calculator*" -and
-                    $_ -NotLike "*Photos*" -and
-                    $_ -NotLike "*VCLibs*" -and
-                    $_ -NotLike "*Paint*" -and
-                    $_ -NotLike "*Gaming*" -and
-                    $_ -NotLike "*Extension*" -and
-                    $_ -NotLike "*SecHealthUI*" -and
-                    $_ -NotLike "*ScreenSketch*"
-                }
-            } else {
-                Write-Host "AppX packages could not be obtained with DISM. MicroWin processing will continue, but AppX packages will be skipped."
-                return
-            }
         }
 
         $counter = 0
-        if ($UseCmdlets) {
+        foreach ($appx in $appxProvisionedPackages) {
-            foreach ($appx in $appxProvisionedPackages) {
+            $status = "Removing Provisioned $($appx.PackageName)"
-                $status = "Removing Provisioned $($appx.PackageName)"
+            Write-Progress -Activity "Removing Provisioned Apps" -Status $status -PercentComplete ($counter++/$appxProvisionedPackages.Count*100)
-                Write-Progress -Activity "Removing Provisioned Apps" -Status $status -PercentComplete ($counter++/$appxProvisionedPackages.Count*100)
+            try {
-                try {
+                Remove-AppxProvisionedPackage -Path "$scratchDir" -PackageName $appx.PackageName -ErrorAction SilentlyContinue
-                    Remove-AppxProvisionedPackage -Path "$scratchDir" -PackageName $appx.PackageName -ErrorAction SilentlyContinue
+            } catch {
-                } catch {
+                Write-Host "Application $($appx.PackageName) could not be removed"
-                    Write-Host "Application $($appx.PackageName) could not be removed"
+                continue
-                    continue
-                }
-            }
-        } else {
-            foreach ($appx in $appxProvisionedPackages) {
-                $status = "Removing Provisioned $appx"
-                Write-Progress -Activity "Removing Provisioned Apps" -Status $status -PercentComplete ($counter++/$appxProvisionedPackages.Count*100)
-                dism /english /image="$scratchDir" /remove-provisionedappxpackage /packagename=$appx /quiet /norestart | Out-Null
-                if ($? -eq $false) {
-                    Write-Host "AppX package $appx could not be removed."
-                }
             }
         }
         Write-Progress -Activity "Removing Provisioned Apps" -Status "Ready" -Completed
     }
     catch
     {
-        Write-Host "Unable to get information about the AppX packages. A fallback will be used..."
+        # This can happen if getting AppX packages fails
+        Write-Host "Unable to get information about the AppX packages. MicroWin processing will continue, but AppX packages will not be processed"
         Write-Host "Error information: $($_.Exception.Message)" -ForegroundColor Yellow
-        Microwin-RemoveProvisionedPackages -UseCmdlets $false
     }
 }

functions/private/Get-WinUtilToggleStatus.ps1

@@ -35,9 +35,6 @@ Function Get-WinUtilToggleStatus {
 
         foreach ($regentry in $ToggleSwitchReg) {
             try {
-                if (!(Test-Path $regentry.Path)) {
-                    New-Item -Path $regentry.Path -Force | Out-Null
-                }
                 $regstate = (Get-ItemProperty -path $regentry.Path).$($regentry.Name)
                 if ($regstate -eq $regentry.Value) {
                     $count += 1
@@ -45,23 +42,8 @@ Function Get-WinUtilToggleStatus {
                 } else {
                     Write-Debug "$($regentry.Name) is false (state: $regstate, value: $($regentry.Value), original: $($regentry.OriginalValue))"
                 }
-                if (!$regstate) {
-                    switch ($regentry.DefaultState) {
-                        "true" {
-                            $regstate = $regentry.Value
-                            $count += 1
-                        }
-                        "false" {
-                            $regstate = $regentry.OriginalValue
-                        }
-                        default {
-                            Write-Error "Entry for $($regentry.Name) does not exist and no DefaultState is defined."
-                            $regstate = $regentry.OriginalValue
-                        }
-                    }
-                }
             } catch {
-                Write-Error "An unexpected error occurred: $_"
+                Write-Error "An error occurred while accessing registry entry $($regentry.Path): $_"
             }
         }
 

functions/private/Set-WinUtilRegistry.ps1

@@ -47,8 +47,6 @@ function Set-WinUtilRegistry {
         Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
     } catch [System.Management.Automation.ItemNotFoundException] {
         Write-Warning $psitem.Exception.ErrorRecord
-    } catch [System.UnauthorizedAccessException]{
-       Write-Warning $psitem.Exception.Message
     } catch {
         Write-Warning "Unable to set $Name due to unhandled exception"
         Write-Warning $psitem.Exception.StackTrace

functions/public/Invoke-WPFButton.ps1

@@ -59,6 +59,6 @@ function Invoke-WPFButton {
         "MicrowinScratchDirBT" {Invoke-ScratchDialog}
         "WPFWinUtilInstallPSProfile" {Invoke-WinUtilInstallPSProfile}
         "WPFWinUtilUninstallPSProfile" {Invoke-WinUtilUninstallPSProfile}
-        "WPFWinUtilSSHServer" {Invoke-WPFSSHServer}
+        "WPFWinUtilSSHServer" {Invoke-WinUtilSSHServer}
     }
 }

functions/public/Invoke-WPFSSHServer.ps1

@@ -1,17 +0,0 @@
-function Invoke-WPFSSHServer {
-    <#
-
-    .SYNOPSIS
-        Invokes the OpenSSH Server install in a runspace
-
-  #>
-
-    Invoke-WPFRunspace -DebugPreference $DebugPreference -ScriptBlock {
-
-        Invoke-WinUtilSSHServer
-
-        Write-Host "======================================="
-        Write-Host "--     OpenSSH Server installed!    ---"
-        Write-Host "======================================="
-    }
-}

xaml/inputXML.xaml

@@ -1266,13 +1266,7 @@
                                 - Once complete, the target ISO file will be in the directory you have specified <LineBreak/>
                                 - Copy this image to your Ventoy USB Stick, boot to this image, gg
                                 <LineBreak/>
-                                If you are injecting drivers ensure you put all your inf, sys, and dll files for each driver into a separate directory <LineBreak/><LineBreak/>
+                                If you are injecting drivers ensure you put all your inf, sys, and dll files for each driver into a separate directory
-                                <Bold>Installing VirtIO drivers</Bold><LineBreak/>
-                                If you plan on using your ISO on QEMU/Proxmox VE, you can bundle VirtIO drivers with your ISO to automatically install drivers. Simply tick the "Include VirtIO drivers" checkbox before starting the process. Then, follow these instructions:<LineBreak/><LineBreak/>
-                                    <TextBlock TextWrapping="WrapWithOverflow" Margin="15,0,0,0" Text="1. Proceed with Setup until you reach the disk selection screen, in which you won't see any drives" Foreground="{DynamicResource ComboBoxForegroundColor}"/><LineBreak/>
-                                    <TextBlock TextWrapping="WrapWithOverflow" Margin="15,0,0,0" Text="2. Click &quot;Load Driver&quot; and click Browse" Foreground="{DynamicResource ComboBoxForegroundColor}"/><LineBreak/>
-                                    <TextBlock TextWrapping="WrapWithOverflow" Margin="15,0,0,0" Text="3. In the folder selection dialog, point to this path: &quot;D:\VirtIO\vioscsi\w11\amd64&quot; (replace amd64 with ARM64 if you are using Windows on ARM, and &quot;D:&quot; with the drive letter of the ISO)" Foreground="{DynamicResource ComboBoxForegroundColor}"/><LineBreak/>
-                                    <TextBlock TextWrapping="WrapWithOverflow" Margin="15,0,0,0" Text="4. Select all drivers that will appear in the list box and click OK" Foreground="{DynamicResource ComboBoxForegroundColor}"/><LineBreak/>
                             </TextBlock>
                             <TextBlock Margin="15,0,15,15"
                                 Padding = "1"
@@ -1283,7 +1277,7 @@
                                 Foreground = "{DynamicResource ComboBoxForegroundColor}"
                                 xml:space = "preserve"
                             >
-<Bold>Driver structure example:</Bold>
+<Bold>Example:</Bold>
      C:\drivers\
           |-- Driver1\
           |   |-- Driver1.inf
@@ -1292,7 +1286,7 @@
           |   |-- Driver2.inf
           |   |-- Driver2.sys
           |-- OtherFiles...
-                            </TextBlock>
+                                </TextBlock>
                             </StackPanel>
                         </Border>
                     </Grid>