admin titus version

.github/workflows/github-pages.yaml

@@ -1,16 +1,15 @@
 name: GitHub Pages Deploy
 
 on:
-  push:
-    paths:
-      - '.github/mkdocs.yml'
-      - '.github/requirements.txt'
-      - 'docs/**'
-      - 'overrides/**'
+  release:
+    types: [published, prereleased]
   workflow_dispatch:
 
+permissions:
+  contents: write
+
 jobs:
-  build-and-deploy:
+  deploy:
     runs-on: ubuntu-latest
 
     steps:
@@ -23,10 +22,10 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: 3.x  # Install latest Stable release of Python 3
-          cache: 'pip'  # Caching pip dependencies
+          cache: 'pip'  # caching pip dependencies
 
-      - name: Install Necessary Dependencies
+      - name: Install Necessary Dependencies using 'pip install -r .github/requirements.txt'
         run: pip install -r .github/requirements.txt
 
-      - name: Build & Deploy using mkdocs
+      - name: Build & Deploy using 'mkdocs'
         run: mkdocs gh-deploy --force -f .github/mkdocs.yml

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/ysaito8015"><img src="https://github.com/ysaito8015.png" width="60px" alt="Yusuke Saito" /></a><a href="https://github.com/TriHydera"><img src="https://github.com/TriHydera.png" width="60px" alt="TriHydera" /></a><a href="https://github.com/jozozovko"><img src="https://github.com/jozozovko.png" width="60px" alt="" /></a><a href="https://github.com/DelDongo"><img src="https://github.com/DelDongo.png" width="60px" alt="" /></a><a href="https://github.com/markamos"><img src="https://github.com/markamos.png" width="60px" alt="Mark Amos" /></a><a href="https://github.com/dwelfusius"><img src="https://github.com/dwelfusius.png" width="60px" alt="" /></a><a href="https://github.com/mews-se"><img src="https://github.com/mews-se.png" width="60px" alt="" /></a><a href="https://github.com/jdiegmueller"><img src="https://github.com/jdiegmueller.png" width="60px" alt="Jason A. Diegmueller" /></a><a href="https://github.com/AlanTristar"><img src="https://github.com/AlanTristar.png" width="60px" alt="" /></a><a href="https://github.com/JennJones89"><img src="https://github.com/JennJones89.png" width="60px" alt="" /></a><a href="https://github.com/zepled112"><img src="https://github.com/zepled112.png" width="60px" alt="wyatt" /></a><a href="https://github.com/altugtekiner"><img src="https://github.com/altugtekiner.png" width="60px" alt="" /></a><a href="https://github.com/robertsandrock"><img src="https://github.com/robertsandrock.png" width="60px" alt="" /></a><a href="https://github.com/mmomega"><img src="https://github.com/mmomega.png" width="60px" alt="" /></a><a href="https://github.com/KenichiQaz"><img src="https://github.com/KenichiQaz.png" width="60px" alt="Stefan" /></a><a href="https://github.com/thaddl"><img src="https://github.com/thaddl.png" width="60px" alt="thaddl" /></a><a href="https://github.com/paulsheets"><img src="https://github.com/paulsheets.png" width="60px" alt="Paul" /></a><a href="https://github.com/djones369"><img src="https://github.com/djones369.png" width="60px" alt="Dave Jones" /></a><a href="https://github.com/anthonymendez"><img src="https://github.com/anthonymendez.png" width="60px" alt="Anthony Mendez" /></a><a href="https://github.com/woobe-studio"><img src="https://github.com/woobe-studio.png" width="60px" alt="Michael Wozniak" /></a><a href="https://github.com/xBandaku"><img src="https://github.com/xBandaku.png" width="60px" alt="xPandaku" /></a><a href="https://github.com/claudemods"><img src="https://github.com/claudemods.png" width="60px" alt="Claudemods" /></a><a href="https://github.com/hkolatan"><img src="https://github.com/hkolatan.png" width="60px" alt="Halil Kolatan" /></a><!-- sponsors -->
+<!-- sponsors --><a href="https://github.com/ysaito8015"><img src="https://github.com/ysaito8015.png" width="60px" alt="Yusuke Saito" /></a><a href="https://github.com/TriHydera"><img src="https://github.com/TriHydera.png" width="60px" alt="TriHydera" /></a><a href="https://github.com/jozozovko"><img src="https://github.com/jozozovko.png" width="60px" alt="" /></a><a href="https://github.com/DelDongo"><img src="https://github.com/DelDongo.png" width="60px" alt="" /></a><a href="https://github.com/markamos"><img src="https://github.com/markamos.png" width="60px" alt="Mark Amos" /></a><a href="https://github.com/dwelfusius"><img src="https://github.com/dwelfusius.png" width="60px" alt="" /></a><a href="https://github.com/mews-se"><img src="https://github.com/mews-se.png" width="60px" alt="" /></a><a href="https://github.com/jdiegmueller"><img src="https://github.com/jdiegmueller.png" width="60px" alt="Jason A. Diegmueller" /></a><a href="https://github.com/AlanTristar"><img src="https://github.com/AlanTristar.png" width="60px" alt="" /></a><a href="https://github.com/JennJones89"><img src="https://github.com/JennJones89.png" width="60px" alt="" /></a><a href="https://github.com/zepled112"><img src="https://github.com/zepled112.png" width="60px" alt="wyatt" /></a><a href="https://github.com/altugtekiner"><img src="https://github.com/altugtekiner.png" width="60px" alt="" /></a><a href="https://github.com/getsmor"><img src="https://github.com/getsmor.png" width="60px" alt="" /></a><a href="https://github.com/robertsandrock"><img src="https://github.com/robertsandrock.png" width="60px" alt="" /></a><a href="https://github.com/jeffnesbit"><img src="https://github.com/jeffnesbit.png" width="60px" alt="" /></a><a href="https://github.com/mmomega"><img src="https://github.com/mmomega.png" width="60px" alt="" /></a><a href="https://github.com/KenichiQaz"><img src="https://github.com/KenichiQaz.png" width="60px" alt="Stefan" /></a><a href="https://github.com/thaddl"><img src="https://github.com/thaddl.png" width="60px" alt="thaddl" /></a><a href="https://github.com/paulsheets"><img src="https://github.com/paulsheets.png" width="60px" alt="Paul" /></a><a href="https://github.com/djones369"><img src="https://github.com/djones369.png" width="60px" alt="Dave Jones" /></a><a href="https://github.com/anthonymendez"><img src="https://github.com/anthonymendez.png" width="60px" alt="Anthony Mendez" /></a><a href="https://github.com/woobe-studio"><img src="https://github.com/woobe-studio.png" width="60px" alt="Michael Wozniak" /></a><a href="https://github.com/xBandaku"><img src="https://github.com/xBandaku.png" width="60px" alt="xPandaku" /></a><!-- sponsors -->
 
 ## 🏅 Thanks to all Contributors
 Thanks a lot for spending your time helping Winutil grow. Thanks a lot! Keep rocking 🍻.

docs/userguide.md

@@ -198,7 +198,26 @@ The utility provides three distinct settings for managing Windows updates: Defau
 * Selecting a scratch directory will copy the contents of the ISO file to the directory you specify instead of an automatically generated folder in the `%TEMP%` directory.
 * You can select an edition of Windows to debloat (**SKU**) using the convenient drop-down menu.
 
-By default, MicroWin will debloat the Pro edition, but you can choose any edition you want.
+    By default, MicroWin will debloat the Pro edition, but you can choose any edition you want.
+
+
+##### Customization options
+
+* **Keep Provisioned Packages**: leaving this option unticked (default) will try to remove every operating system package.
+
+    Some packages may remain after processing. This can happen if the packages in question are permanent or have been superseded by newer versions.
+
+* **Keep Appx Packages**: leaving this option unticked (default) will try to remove every Microsoft Store app from the Windows image.
+
+    This option will exclude some applications that are essential in the event that you want or need to add a Store app later on.
+
+* **Keep Defender**: leaving this option unticked will try to remove every part of Windows Defender, including the Windows Security app.
+
+    Leaving this option unticked is **NOT recommended** unless you plan to use a third-party antivirus solution on your MicroWin installation. In that regard, don't install AVs with bad reputations or rogueware.
+
+* **Keep Edge**: leaving this option unticked will try to remove every part of the Microsoft Edge browser using the best methods available.
+
+    Leaving this option unticked is not recommended because it might break some applications that might depend on the `Edge WebView2` runtime. However, if that happens, you can easily [reinstall it](https://developer.microsoft.com/en-us/microsoft-edge/webview2)
 
 
 ##### Driver integration options
@@ -206,15 +225,7 @@ By default, MicroWin will debloat the Pro edition, but you can choose any editio
 * **Inject drivers** will add the drivers in the folder that you specify to the target Windows image.
 * **Import drivers from the current system** will add every third-party driver that is present in your active installation.
 
-This makes the target image have the same hardware compatibility as the active installation. However, this means that you will only be able to install the target Windows image and take full advantage of it on computers with **the same hardware**. To avoid this, you'll need to customize the `install.wim` file of the target ISO in the 'sources` folder.
-
-##### Custom user settings
-
-With MicroWin, you can also configure your user before proceeding if you don't want to use the default `User` account. To do this, simply type the account name (20 characters maximum), and a password. Then, let MicroWin do the rest.
-
-!!! info
-
-     Please make sure that you remember your password. MicroWin will configure auto-login settings, so you won't have to enter your password. However, if you are required to enter your password, it's best that you don't forget it.
+    This makes the target image have the same hardware compatibility as the active installation. However, this means that you will only be able to install the target Windows image and take full advantage of it on computers with **the same hardware**. To avoid this, you'll need to customize the `install.wim` file of the target ISO in the 'sources` folder.
 
 
 ##### Ventoy options

functions/private/Install-WinUtilChoco.ps1

@@ -15,8 +15,8 @@ function Install-WinUtilChoco {
         }
 
         Write-Host "Seems Chocolatey is not installed, installing now."
-        Start-Process -FilePath "powershell" -ArgumentList "Set-ExecutionPolicy Bypass -Scope Process -Force; Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) -ErrorAction Stop" -Wait -NoNewWindow
-        Start-Process -FilePath "powershell" -ArgumentList "choco feature enable -n allowGlobalConfirmation" -Wait -NoNewWindow
+        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 {
         Write-Host "===========================================" -Foregroundcolor Red

functions/private/Install-WinUtilProgramChoco.ps1

@@ -29,19 +29,19 @@ function Install-WinUtilProgramChoco {
         throw "Private Function 'Install-WinUtilProgramChoco' expected Parameter 'ProgramsToInstall' to be of size 1 or greater, instead got $count,`nPlease double check your code and re-compile WinUtil."
     }
 
-
+    Write-Progress -Activity "$manage Applications" -Status "Starting" -PercentComplete 0
     Write-Host "==========================================="
     Write-Host "--   Configuring Chocolatey pacakages   ---"
     Write-Host "==========================================="
     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") {
             write-host "Starting install of $($Program.choco) with Chocolatey."
             try {
                 $tryUpgrade = $false
         $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 -NoNewWindow).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) {
@@ -50,10 +50,7 @@ function Install-WinUtilProgramChoco {
             }
         # 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) {
-            $chocoUpdateStatus = $(Start-Process -FilePath "choco" -ArgumentList "upgrade $($Program.choco) -y" -Wait -PassThru -RedirectStandardOutput $installOutputFilePath -NoNewWindow).ExitCode
-            if ($chocoUpdateStatus -eq 0) {
-                Write-Host "$($Program.choco) was updated successfully using Chocolatey."
-            }
+            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)) {
                     Write-Host "$($Program.choco) installed successfully using Chocolatey."
@@ -77,7 +74,7 @@ function Install-WinUtilProgramChoco {
             try {
         $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 -NoNewWindow).ExitCode
+        $chocoUninstallStatus = $(Start-Process -FilePath "choco" -ArgumentList "uninstall $($Program.choco) -y" -Wait -PassThru).ExitCode
         if($chocoUninstallStatus -eq 0) {
                     Write-Host "$($Program.choco) uninstalled successfully using Chocolatey."
                     $x++
@@ -95,6 +92,7 @@ function Install-WinUtilProgramChoco {
             }
     }
     }
+    Write-Progress -Activity "$manage Applications" -Status "Finished" -Completed
 
     # Cleanup leftovers files
     if(Test-Path -Path $installOutputFilePath) { Remove-Item -Path $installOutputFilePath }

functions/private/Invoke-WinUtilMicroWin-Helper.ps1

@@ -101,9 +101,7 @@ function Remove-Packages {
                 $_ -NotLike "*DesktopAppInstaller*" -AND
                 $_ -NotLike "*WebMediaExtensions*" -AND
                 $_ -NotLike "*WMIC*" -AND
-                $_ -NotLike "*UI.XaML*" -AND
-                $_ -NotLike "*Ethernet*" -AND
-                $_ -NotLike "*Wifi*"
+                $_ -NotLike "*UI.XaML*"
             }
 
         foreach ($pkg in $pkglist) {
@@ -134,8 +132,6 @@ function Remove-ProvisionedPackages() {
         .EXAMPLE
         Remove-ProvisionedPackages
     #>
-    try
-    {
     $appxProvisionedPackages = Get-AppxProvisionedPackage -Path "$($scratchDir)" | Where-Object    {
             $_.PackageName -NotLike "*AppInstaller*" -AND
             $_.PackageName -NotLike "*Store*" -and
@@ -145,6 +141,7 @@ function Remove-ProvisionedPackages() {
             $_.PackageName -NotLike "*LanguageFeatures*" -and
             $_.PackageName -NotLike "*Notepad*" -and
             $_.PackageName -NotLike "*Printing*" -and
+            $_.PackageName -NotLike "*Wifi*" -and
             $_.PackageName -NotLike "*Foundation*" -and
             $_.PackageName -NotLike "*YourPhone*" -and
             $_.PackageName -NotLike "*Xbox*" -and
@@ -156,6 +153,7 @@ function Remove-ProvisionedPackages() {
             $_.PackageName -NotLike "*Gaming*" -and
             $_.PackageName -NotLike "*Extension*" -and
             $_.PackageName -NotLike "*SecHealthUI*"
+
         }
 
     $counter = 0
@@ -171,12 +169,6 @@ function Remove-ProvisionedPackages() {
     }
     Write-Progress -Activity "Removing Provisioned Apps" -Status "Ready" -Completed
 }
-    catch
-    {
-        # 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"
-    }
-}
 
 function Copy-ToUSB([string]$fileToCopy) {
     foreach ($volume in Get-Volume) {
@@ -247,11 +239,6 @@ function Remove-FileOrDirectory([string]$pathToDelete, [string]$mask = "", [swit
 
 function New-Unattend {
 
-    param (
-        [Parameter(Mandatory, Position = 0)] [string] $userName,
-        [Parameter(Position = 1)] [string] $userPassword
-    )
-
     $unattend = @'
     <?xml version="1.0" encoding="utf-8"?>
     <unattend xmlns="urn:schemas-microsoft-com:unattend"
@@ -274,21 +261,21 @@ function New-Unattend {
                 <UserAccounts>
                     <LocalAccounts>
                         <LocalAccount wcm:action="add">
-                            <Name>USER-REPLACEME</Name>
+                            <Name>User</Name>
                             <Group>Administrators</Group>
                             <Password>
-                                <Value>PW-REPLACEME</Value>
+                                <Value></Value>
                                 <PlainText>true</PlainText>
                             </Password>
                         </LocalAccount>
                     </LocalAccounts>
                 </UserAccounts>
                 <AutoLogon>
-                    <Username>USER-REPLACEME</Username>
+                    <Username>User</Username>
                     <Enabled>true</Enabled>
                     <LogonCount>1</LogonCount>
                     <Password>
-                        <Value>PW-REPLACEME</Value>
+                        <Value></Value>
                         <PlainText>true</PlainText>
                     </Password>
                 </AutoLogon>
@@ -548,11 +535,6 @@ function New-Unattend {
     # Replace the placeholder text with the Specialize pass
     $unattend = $unattend.Replace("<#REPLACEME#>", $specPass).Trim()
     }
-    # Replace default User and Password values with the provided parameters
-    $unattend = $unattend.Replace("USER-REPLACEME", $userName).Trim()
-    $unattend = $unattend.Replace("PW-REPLACEME", $userPassword).Trim()
-
-    # Save unattended answer file with UTF-8 encoding
     $unattend | Out-File -FilePath "$env:temp\unattend.xml" -Force -Encoding utf8
 }
 

functions/public/Invoke-WPFGetInstalled.ps1

@@ -1,6 +1,6 @@
 function Invoke-WPFGetInstalled {
     <#
-    TODO: Add the Option to use Chocolatey as Engine
+
     .SYNOPSIS
         Invokes the function that gets the checkboxes to check in a new runspace
 
@@ -19,9 +19,7 @@ function Invoke-WPFGetInstalled {
     if(((Test-WinUtilPackageManager -winget) -eq "not-installed") -and $checkbox -eq "winget") {
         return
     }
-    if ($sync.WPFpreferChocolatey.IsChecked) {
-        Write-Host "The Function `"Get Installed`" is only supported for Winget at the moment" -ForegroundColor Red
-    }
+
     Invoke-WPFRunspace -ArgumentList $checkbox -DebugPreference $DebugPreference -ScriptBlock {
         param($checkbox, $DebugPreference)
 

functions/public/Invoke-WPFInstall.ps1

@@ -19,9 +19,10 @@ function Invoke-WPFInstall {
         [System.Windows.MessageBox]::Show($WarningMsg, $AppTitle, [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
         return
     }
-    $ChocoPreference = $($sync.WPFpreferChocolatey.IsChecked)
-    Invoke-WPFRunspace -ArgumentList $PackagesToInstall,$ChocoPreference -DebugPreference $DebugPreference -ScriptBlock {
-        param($PackagesToInstall, $ChocoPreference, $DebugPreference)
+
+
+    Invoke-WPFRunspace -ArgumentList $PackagesToInstall -DebugPreference $DebugPreference -ScriptBlock {
+        param($PackagesToInstall, $DebugPreference)
         if ($PackagesToInstall.count -eq 1) {
             $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })
         } else {
@@ -30,20 +31,7 @@ function Invoke-WPFInstall {
         $packagesWinget, $packagesChoco = {
             $packagesWinget = [System.Collections.ArrayList]::new()
             $packagesChoco = [System.Collections.Generic.List`1[System.Object]]::new()
-
             foreach ($package in $PackagesToInstall) {
-            if ($ChocoPreference) {
-                Write-Host "Prefer Choco"
-                if ($package.choco -eq "na") {
-                    $packagesWinget.add($package.winget)
-                    Write-Host "Queueing $($package.winget) for Winget install"
-                } else {
-                    $null = $packagesChoco.add($package)
-                    Write-Host "Queueing $($package) for Chocolatey install"
-                }
-            }
-            else {
-                Write-Host "Prefer Winget"
                 if ($package.winget -eq "na") {
                     $packagesChoco.add($package)
                     Write-Host "Queueing $($package.choco) for Chocolatey install"
@@ -52,8 +40,6 @@ function Invoke-WPFInstall {
                     Write-Host "Queueing $($package.winget) for Winget install"
                 }
             }
-        }
-
             return $packagesWinget, $packagesChoco
         }.Invoke($PackagesToInstall)
 

functions/public/Invoke-WPFInstallUpgrade.ps1

@@ -2,20 +2,9 @@ function Invoke-WPFInstallUpgrade {
     <#
 
     .SYNOPSIS
-        Invokes the function that upgrades all installed programs
+        Invokes the function that upgrades all installed programs using winget
 
     #>
-    if ($sync.WPFpreferChocolatey.IsChecked) {
-        Install-WinUtilChoco
-        $chocoUpgradeStatus = (Start-Process "choco" -ArgumentList "upgrade all -y" -Wait -PassThru -NoNewWindow).ExitCode
-        if ($chocoUpgradeStatus -eq 0) {
-            Write-Host "Upgrade Successful"
-        }
-        else{
-            Write-Host "Error Occured. Return Code: $chocoUpgradeStatus"
-        }
-    }
-    else{
     if((Test-WinUtilPackageManager -winget) -eq "not-installed") {
         return
     }
@@ -26,6 +15,8 @@ function Invoke-WPFInstallUpgrade {
         return
     }
 
+    # Set-WinUtilTaskbaritem -state "Indeterminate"
+
     Update-WinUtilProgramWinget
 
     Write-Host "==========================================="
@@ -33,4 +24,3 @@ function Invoke-WPFInstallUpgrade {
     Write-Host "-- You can close this window if desired ---"
     Write-Host "==========================================="
 }
-}

functions/public/Invoke-WPFMicrowin.ps1

@@ -178,22 +178,7 @@ public class PowerManagement {
         Write-Host "Removal complete!"
 
         Write-Host "Create unattend.xml"
-        #New-Unattend
-        if ($sync.MicrowinUserName.Text -eq "")
-        {
-            New-Unattend -userName "User"
-        }
-        else
-        {
-            if ($sync.MicrowinUserPassword.Password -eq "")
-            {
-                New-Unattend -userName "$($sync.MicrowinUserName.Text)"
-            }
-            else
-            {
-                New-Unattend -userName "$($sync.MicrowinUserName.Text)" -userPassword "$($sync.MicrowinUserPassword.Password)"
-            }
-        }
+        New-Unattend
         Write-Host "Done Create unattend.xml"
         Write-Host "Copy unattend.xml file into the ISO"
         New-Item -ItemType Directory -Force -Path "$($scratchDir)\Windows\Panther"
@@ -263,11 +248,8 @@ public class PowerManagement {
             # reg delete "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Orchestrator\UScheduler\$_" /f | Out-Null
 
             # When in Offline Image
-            if (Test-Path "HKLM:\zSOFTWARE\Microsoft\WindowsUpdate\Orchestrator\UScheduler_Oobe\$_")
-            {
             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
         Write-Host "Setting all services to start manually"

functions/public/Invoke-WPFRunspace.ps1

@@ -30,9 +30,7 @@ function Invoke-WPFRunspace {
 
     # Add Scriptblock and Arguments to runspace
     $script:powershell.AddScript($ScriptBlock)
-    foreach ($Argument in $ArgumentList) {
-        $script:powershell.AddArgument($Argument)
-    }
+    $script:powershell.AddArgument($ArgumentList)
     $script:powershell.AddArgument($DebugPreference)  # Pass DebugPreference to the script block
     $script:powershell.RunspacePool = $sync.runspace
 

functions/public/Invoke-WPFUnInstall.ps1

@@ -28,10 +28,10 @@ function Invoke-WPFUnInstall {
     $confirm = [System.Windows.MessageBox]::Show($Messageboxbody, $MessageboxTitle, $ButtonType, $MessageIcon)
 
     if($confirm -eq "No") {return}
-    $ChocoPreference = $($sync.WPFpreferChocolatey.IsChecked)
 
-    Invoke-WPFRunspace -ArgumentList $PackagesToInstall, $ChocoPreference -DebugPreference $DebugPreference -ScriptBlock {
-        param($PackagesToInstall, $ChocoPreference, $DebugPreference)
+
+    Invoke-WPFRunspace -ArgumentList $PackagesToInstall -DebugPreference $DebugPreference -ScriptBlock {
+        param($PackagesToInstall, $DebugPreference)
         if ($PackagesToInstall.count -eq 1) {
             $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })
         } else {
@@ -41,26 +41,14 @@ function Invoke-WPFUnInstall {
             $packagesWinget = [System.Collections.Generic.List`1[System.Object]]::new()
             $packagesChoco = [System.Collections.Generic.List`1[System.Object]]::new()
             foreach ($package in $PackagesToInstall) {
-                if ($ChocoPreference) {
-                    if ($packagesChoco.choco -eq "na") {
-                        $null = $packagesWinget.add($package.winget)
-                        Write-Host "Queueing $($package.winget) for Winget Uninstall"
-                    }
-                    else {
-                        $packagesChoco.add($package)
-                        Write-Host "Queueing $($package.choco) for Chocolatey Uninstall"
-                    }
-                }
-                else {
                 if ($package.winget -eq "na") {
                     $packagesChoco.add($package)
                     Write-Host "Queueing $($package.choco) for Chocolatey Uninstall"
                 } else {
-                        $null = $packagesWinget.add($($package.winget))
+                    $packagesWinget.add($($package.winget))
                     Write-Host "Queueing $($package.winget) for Winget Uninstall"
                 }
             }
-            }
             return $packagesWinget, $packagesChoco
         }.Invoke($PackagesToInstall)
         try {

scripts/start.ps1

@@ -44,12 +44,23 @@ $sync.version = "#{replaceme}"
 $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") {
-    Write-Host "===========================================" -Foregroundcolor Red
-    Write-Host "-- Scripts must be run as Administrator ---" -Foregroundcolor Red
-    Write-Host "-- Right-Click Start -> Terminal(Admin) ---" -Foregroundcolor Red
-    Write-Host "===========================================" -Foregroundcolor Red
+if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)) {
+    Write-Output "Winutil needs to be run as Administrator. Attempting to relaunch."
+
+    $wtInstalled = Get-Command wt.exe -ErrorAction SilentlyContinue
+    $pwshInstalled = Get-Command pwsh -ErrorAction SilentlyContinue 
+    if ($pwshInstalled) {
+        $powershellcmd = "pwsh"
+    } else {
+        $powershellcmd = "powershell"
+    }
+    
+    if ($wtInstalled) {
+        Start-Process wt.exe -ArgumentList "new-tab $powershellcmd -ExecutionPolicy Bypass -Command `"irm https://christitus.com/win | iex`"" -Verb RunAs
+    } else {
+        Start-Process $powershellcmd -ArgumentList "-ExecutionPolicy Bypass -Command `"irm https://christitus.com/win | iex`"" -Verb RunAs
+    }
+
     break
 }
 

xaml/inputXML.xaml

@@ -566,36 +566,6 @@
                 </Setter.Value>
             </Setter>
         </Style>
-        <Style TargetType="PasswordBox">
-            <Setter Property="Background" Value="{MainBackgroundColor}"/>
-            <Setter Property="BorderBrush" Value="{MainForegroundColor}"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Foreground" Value="{MainForegroundColor}"/>
-            <Setter Property="FontSize" Value="{FontSize}"/>
-            <Setter Property="Padding" Value="5"/>
-            <Setter Property="HorizontalAlignment" Value="Stretch"/>
-            <Setter Property="VerticalAlignment" Value="Center"/>
-            <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="PasswordBox">
-                        <Border Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="5">
-                            <Grid>
-                                <ScrollViewer x:Name="PART_ContentHost" />
-                            </Grid>
-                        </Border>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-            <Setter Property="Effect">
-                <Setter.Value>
-                    <DropShadowEffect ShadowDepth="5" BlurRadius="5" Opacity="{BorderOpacity}" Color="{BorderColor}"/>
-                </Setter.Value>
-            </Setter>
-        </Style>
         <Style x:Key="ScrollVisibilityRectangle" TargetType="Rectangle">
             <Setter Property="Visibility" Value="Collapsed"/>
             <Style.Triggers>
@@ -793,9 +763,6 @@
                         <Button Name="WPFuninstall" Content=" Uninstall Selected" Margin="2"/>
                         <Button Name="WPFGetInstalled" Content=" Get Installed" Margin="2"/>
                         <Button Name="WPFclearWinget" Content=" Clear Selection" Margin="2"/>
-                        <CheckBox Name="WPFpreferChocolatey" VerticalAlignment="Center" VerticalContentAlignment="Center">
-                            <TextBlock Text="Prefer Chocolatey" ToolTip="Prefers Chocolatey as Download Engine instead of Winget" VerticalAlignment="Center" />
-                        </CheckBox>
                     </StackPanel>
 
                     <ScrollViewer x:Name="scrollViewer" Grid.Row="1" Grid.Column="0" Padding="-1" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"
@@ -954,23 +921,6 @@
                             <Rectangle Fill="{MainForegroundColor}" Height="2" HorizontalAlignment="Stretch" Margin="0,10,0,10"/>
                             <CheckBox Name="WPFMicrowinCopyToUsb" Content="Copy to Ventoy" Margin="-10,5,0,0" IsChecked="False" ToolTip="Copy to USB disk with a label Ventoy"/>
                             <Rectangle Fill="{MainForegroundColor}" Height="2" HorizontalAlignment="Stretch" Margin="0,10,0,10"/>
-                            <TextBlock Margin="6" Padding="1" TextWrapping="Wrap"><Bold>Custom user settings (leave empty for default user)</Bold></TextBlock>
-                            <TextBlock Margin="6" Padding="1" TextWrapping="Wrap">User name (20 characters max.):</TextBlock>
-                            <TextBox Name="MicrowinUserName" Background="Transparent" BorderThickness="1" BorderBrush="{MainForegroundColor}"
-                                Margin="6"
-                                Text=""
-                                IsReadOnly="False"
-                                TextWrapping="Wrap"
-                                Foreground="{LabelboxForegroundColor}"
-                                MaxLength="20"
-                            />
-                            <TextBlock Margin="6" Padding="1" TextWrapping="Wrap">Password (characters will not be shown for your security):</TextBlock>
-                            <PasswordBox Name="MicrowinUserPassword" Background="Transparent" BorderThickness="1" BorderBrush="{MainForegroundColor}"
-                                Margin="6"
-                                PasswordChar="*"
-                                Foreground="{LabelboxForegroundColor}"
-                            />
-                            <Rectangle Fill="{MainForegroundColor}" Height="2" HorizontalAlignment="Stretch" Margin="0,10,0,10"/>
                             <Button Name="WPFMicrowin" Content="Start the process" Margin="2" Padding="15"/>
                         </StackPanel>
                         <StackPanel HorizontalAlignment="Left" SnapsToDevicePixels="True" Margin="1" Visibility="Collapsed">
@@ -1018,14 +968,15 @@
                                 Foreground="{ComboBoxForegroundColor}">
                                 <Bold>MicroWin features:</Bold><LineBreak/>
                                 - Remove Telemetry and Tracking <LineBreak/>
-                                - Fast Install using either the "User" local account or the account of your choosing <LineBreak/>
+                                - Fast Install using "User" local account <LineBreak/>
                                 - No internet requirement for install <LineBreak/>
                                 - Apps debloat <LineBreak/>
                                 <LineBreak/>
                                 <LineBreak/>
 
                                 <Bold>INSTRUCTIONS</Bold> <LineBreak/>
-                                - <TextBlock Name="Win11DownloadLink" Style="{StaticResource HoverTextBlockStyle}" ToolTip="https://www.microsoft.com/software-download/windows11">Download</TextBlock> the latest Windows 11 image from Microsoft <LineBreak/>
+                                - Download the latest Windows 11 image from Microsoft <LineBreak/>
+                                LINK: https://www.microsoft.com/software-download/windows11 <LineBreak/>
                                 May take several minutes to process the ISO depending on your machine and connection <LineBreak/>
                                 - Put it somewhere on the C:\ drive so it is easily accessible <LineBreak/>
                                 - Launch WinUtil and MicroWin  <LineBreak/>