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><a href="https://github.com/FatBastard0"><img src="https://github.com/FatBastard0.png" width="60px" alt="" /></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 🍻.

config/tweaks.json

@@ -2430,6 +2430,12 @@
     "Order": "a001_",
     "InvokeScript": [
       "
+        # Check if the user has administrative privileges
+        if (-Not ([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)) {
+            Write-Host \"Please run this script as an administrator.\"
+            return
+        }
+
         # Check if System Restore is enabled for the main drive
         try {
             # Try getting restore points to check if System Restore is enabled
@@ -3085,8 +3091,8 @@
     "panel": "1",
     "Order": "a002_",
     "InvokeScript": [
-      "Get-ChildItem -Path \"C:\\Windows\\Temp\" *.* -Recurse | Remove-Item -Force -Recurse -ErrorAction SilentlyContinue
-    Get-ChildItem -Path $env:TEMP *.* -Recurse | Remove-Item -Force -Recurse -ErrorAction SilentlyContinue"
+      "Get-ChildItem -Path \"C:\\Windows\\Temp\" *.* -Recurse | Remove-Item -Force -Recurse
+    Get-ChildItem -Path $env:TEMP *.* -Recurse | Remove-Item -Force -Recurse"
     ],
     "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/DeleteTempFiles"
   },

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/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
@@ -170,12 +168,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) {
@@ -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/private/Invoke-WinUtilTweaks.ps1

@@ -59,8 +59,8 @@ function Invoke-WinUtilTweaks {
                         Write-Debug "Service $($service.Name) was changed in the past to $($service.StartType.ToString()) from it's original type of $($psitem.$($values.OriginalService)), will not change it to $($psitem.$($values.service))"
                         $changeservice = $false
                     }
-                } catch {
-                    write-host "Unable to get service $($psitem.Name)"
+                } catch [System.ServiceProcess.ServiceNotFoundException] {
+                    Write-Warning "Service $($psitem.Name) was not found"
                 }
             }
 

functions/private/Set-WinUtilService.ps1

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

functions/private/Set-WinUtilTaskbarItem.ps1

@@ -43,7 +43,6 @@ function Set-WinUtilTaskbaritem {
         [string]$description
     )
 
-    try {
     if ($value) {
         $sync["Form"].taskbarItemInfo.ProgressValue = $value
     }
@@ -84,7 +83,4 @@ function Set-WinUtilTaskbaritem {
     if ($description) {
         $sync["Form"].taskbarItemInfo.Description = $description
     }
-    } catch {
-        #do nothing
-    }
 }

functions/public/Invoke-WPFFeatureInstall.ps1

@@ -6,21 +6,13 @@ function Invoke-WPFFeatureInstall {
 
     #>
 
-    param (
-        $FeatureConfig
-    )
-
     if($sync.ProcessRunning) {
         $msg = "[Invoke-WPFFeatureInstall] Install process is currently running."
         [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
         return
     }
 
-    if ($FeatureConfig) {
-        $Features = $FeatureConfig
-    } else {
     $Features = (Get-WinUtilCheckBoxes)["WPFFeature"]
-    }
 
     Invoke-WPFRunspace -ArgumentList $Features -DebugPreference $DebugPreference -ScriptBlock {
         param($Features, $DebugPreference)

functions/public/Invoke-WPFInstall.ps1

@@ -6,22 +6,14 @@ function Invoke-WPFInstall {
 
     #>
 
-    param (
-        $InstallConfig
-    )
-
     if($sync.ProcessRunning) {
         $msg = "[Invoke-WPFInstall] An Install process is currently running."
         [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
         return
     }
 
-    if ($InstallConfig) {
-        $PackagesToInstall = $InstallConfig
-    } else {
     $PackagesToInstall = (Get-WinUtilCheckBoxes)["Install"]
-    }
-
+    Write-Host $PackagesToInstall
     if ($PackagesToInstall.Count -eq 0) {
         $WarningMsg = "Please select the program(s) to install or upgrade"
         [System.Windows.MessageBox]::Show($WarningMsg, $AppTitle, [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)

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"

functions/public/Invoke-WPFRunspace.ps1

@@ -25,11 +25,6 @@ function Invoke-WPFRunspace {
         $DebugPreference
     )
 
-    if ($PARAM_RUN) {
-        write-host "Running in Main Thread"
-        & $ScriptBlock @ArgumentList @DebugPreference
-    } else {
-        write-host "Running in Runspace"
     # Create a PowerShell instance
     $script:powershell = [powershell]::Create()
 
@@ -50,5 +45,4 @@ function Invoke-WPFRunspace {
         $sync.runspace.Close()
         [System.GC]::Collect()
     }
-    }
 }

functions/public/Invoke-WPFtweaksbutton.ps1

@@ -6,21 +6,13 @@ function Invoke-WPFtweaksbutton {
 
   #>
 
-  param (
-    $TweaksConfig
-  )
-
   if($sync.ProcessRunning) {
     $msg = "[Invoke-WPFtweaksbutton] Install process is currently running."
     [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
     return
   }
 
-  if ($TweaksConfig) {
-    $Tweaks = $TweaksConfig
-  } else {
   $Tweaks = (Get-WinUtilCheckBoxes)["WPFTweaks"]
-  }
 
   Set-WinUtilDNS -DNSProvider $sync["WPFchangedns"].text
 

scripts/main.ps1

@@ -145,61 +145,13 @@ Invoke-WPFRunspace -ScriptBlock {
 
 } | Out-Null
 
-#===========================================================================
-# Print Logo into Console
-#===========================================================================
-
-Invoke-WPFFormVariables
-
-#===========================================================================
-# Run Automation
-#===========================================================================
-
-if ($PARAM_CONFIG) {
-    if ($PARAM_RUN) {
-        $installConfig = Get-Content $PARAM_CONFIG -Raw | ConvertFrom-Json
-        if ($installConfig.WPFInstall) {
-            write-host "Installing Programs"
-
-            # Create a new array to hold the combined install configurations
-            $combinedInstallConfig = @()
-
-            # Iterate over each WPFInstall entry
-            for ($i = 0; $i -lt $installConfig.WPFInstall.Count; $i++) {
-                $wpfInstallEntry = $installConfig.WPFInstall[$i]
-                $installEntry = $installConfig.Install[$i]
-
-                # Create a new object with the combined values
-                $combinedEntry = @{
-                    Name = $wpfInstallEntry
-                    Winget = $installEntry.winget
-                    Choco = $installEntry.choco
-                }
-
-                # Add the combined entry to the array
-                $combinedInstallConfig += $combinedEntry
-            }
-
-            # Invoke the WPFInstall function with the combined configuration
-            Invoke-WPFInstall -InstallConfig $combinedInstallConfig
-        }
-        if ($installConfig.WPFTweaks) {
-            write-host "Running Tweaks"
-            Invoke-WPFtweaksbutton -TweaksConfig $installConfig.WPFTweaks
-        }
-        if ($installConfig.WPFFeature) {
-            write-host "Installing Features"
-            Invoke-WPFFeatureInstall -FeatureConfig $installConfig.WPFFeature
-        }
-    } else {
-        Invoke-WPFImpex -type "import" -Config $PARAM_CONFIG
-    }
-}
-
 #===========================================================================
 # Setup and Show the Form
 #===========================================================================
 
+# Print the logo
+Invoke-WPFFormVariables
+
 # Progress bar in taskbaritem > Set-WinUtilProgressbar
 $sync["Form"].TaskbarItemInfo = New-Object System.Windows.Shell.TaskbarItemInfo
 Set-WinUtilTaskbaritem -state "None"
@@ -366,6 +318,42 @@ Add-Type @"
 
     Invoke-WPFTab "WPFTab1BT"
     $sync["Form"].Focus()
+
+    # maybe this is not the best place to load and execute config file?
+    # maybe community can help?
+    if ($PARAM_CONFIG) {
+        Invoke-WPFImpex -type "import" -Config $PARAM_CONFIG
+        if ($PARAM_RUN) {
+            while ($sync.ProcessRunning) {
+                Start-Sleep -Seconds 5
+            }
+            Start-Sleep -Seconds 5
+
+            Write-Host "Applying tweaks..."
+            Invoke-WPFtweaksbutton
+            while ($sync.ProcessRunning) {
+                Start-Sleep -Seconds 5
+            }
+            Start-Sleep -Seconds 5
+
+            Write-Host "Installing features..."
+            Invoke-WPFFeatureInstall
+            while ($sync.ProcessRunning) {
+                Start-Sleep -Seconds 5
+            }
+
+            Start-Sleep -Seconds 5
+            Write-Host "Installing applications..."
+            while ($sync.ProcessRunning) {
+                Start-Sleep -Seconds 1
+            }
+            Invoke-WPFInstall
+            Start-Sleep -Seconds 5
+
+            Write-Host "Done."
+        }
+    }
+
 })
 
 # Load Checkboxes and Labels outside of the Filter function only once on startup for performance reasons
@@ -540,8 +528,5 @@ $sync["SponsorMenuItem"].Add_Click({
     $Height = $sync.configs.themes.$ctttheme.CustomDialogHeight
     Show-CustomDialog -Message $authorInfo -Width $Width -Height $Height -FontSize $FontSize -HeaderFontSize $HeaderFontSize -IconSize $IconSize -EnableScroll $true
 })
-
-if (!$PARAM_RUN) {
-    $sync["Form"].ShowDialog() | out-null
-    Stop-Transcript
-}
+$sync["Form"].ShowDialog() | out-null
+Stop-Transcript

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>
@@ -951,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">
@@ -1015,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/>