Merge branch 'main' into patch-1

Video with exemple : https://youtu.be/00aUECZNvbA

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,7 +7,7 @@ assignees: ''
 ---
 
 ## Describe the bug
-<!-- A clear and concise description of what the bug is. -->
+A clear and concise description of what the bug is.
 
 ## To Reproduce
 Steps to reproduce the behavior:
@@ -17,10 +17,10 @@ Steps to reproduce the behavior:
 4. See error
 
 ## Expected behavior
-<!-- A clear and concise description of what you expected to happen. -->
+A clear and concise description of what you expected to happen.
 
 ## Screenshots
-<!-- If applicable, add screenshots to help explain your problem. -->
+If applicable, add screenshots to help explain your problem.
 
 ## Additional context
-<!-- Add any other context about the problem here. -->
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -8,13 +8,13 @@ assignees: ''
 ---
 
 **Is your feature request related to a problem? Please describe.**
-<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
 **Describe the solution you'd like**
-<!-- A clear and concise description of what you want to happen. -->
+A clear and concise description of what you want to happen.
 
 **Describe alternatives you've considered**
-<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+A clear and concise description of any alternative solutions or features you've considered.
 
 **Additional context**
-<!-- Add any other context or screenshots about the feature request here. -->
+Add any other context or screenshots about the feature request here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +1,7 @@
 # Pull Request
 
-<!--Before you make this PR have you followed the docs here? - https://christitustech.github.io/winutil/contribute/ -->
-
 ## Title
-<!--[Provide a succinct and descriptive title for the pull request.]-->
+[Provide a succinct and descriptive title for the pull request.]
 
 ## Type of Change
 - [ ] New feature
@@ -15,20 +13,20 @@
 - [ ] UI/UX improvement
 
 ## Description
-<!--[Provide a detailed explanation of the changes you have made. Include the reasons behind these changes and any relevant context. Link any related issues.]-->
+[Provide a detailed explanation of the changes you have made. Include the reasons behind these changes and any relevant context. Link any related issues.]
 
 ## Testing
-<!--[Detail the testing you have performed to ensure that these changes function as intended. Include information about any added tests.]-->
+[Detail the testing you have performed to ensure that these changes function as intended. Include information about any added tests.]
 
 ## Impact
-<!--[Discuss the impact of your changes on the project. This might include effects on performance, new dependencies, or changes in behaviour.]-->
+[Discuss the impact of your changes on the project. This might include effects on performance, new dependencies, or changes in behaviour.]
 
 ## Issue related to PR
-<!--[What issue/discussion is related to this PR (if any)]-->
+[What issue/discussion is related to this PR (if any)]
 - Resolves #
 
 ## Additional Information
-<!--[Any additional information that reviewers should be aware of.]-->
+[Any additional information that reviewers should be aware of.]
 
 ## Checklist
 - [ ] My code adheres to the coding and style guidelines of the project.

.github/SECURITY.md

@@ -1,5 +0,0 @@
-# Security Policy
-
-If you find a security issue please make post it in the issues tab. If you think it should be private you can email me at contact@christitus.com.
-
-For immediate response check out our discord server @ [![](https://dcbadge.limes.pink/api/server/https://discord.gg/RUbZUZyByQ?theme=default-inverted&style=for-the-badge)](https://discord.gg/RUbZUZyByQ)

.github/release-drafter.yml

@@ -1,24 +0,0 @@
-name-template: '$RESOLVED_VERSION'
-tag-template: '$RESOLVED_VERSION'
-tag-prefix: ""
-categories:
-  - title: '🚀 Features'
-    labels:
-      - 'feature'
-      - 'enhancement'
-  - title: '🐛 Bug Fixes'
-    labels:
-      - 'fix'
-      - 'bugfix'
-      - 'bug'
-  - title: '🧰 Maintenance'
-    label: 'chore'
-change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
-template: |
-  ## Changes
-
-  $CHANGES
-
-  ## Contributors
-
-  $CONTRIBUTORS

.github/workflows/close-old-issues.yaml

@@ -22,8 +22,8 @@ jobs:
         exempt-issue-labels: "Keep Issue Open"
         # Split it into two weeks, after one week the issue will be marked as stale,
         # after another week have pasted without any update.. the issue will then be closed.
-        days-before-issue-stale: 90
-        days-before-issue-close: 365
+        days-before-issue-stale: 7
+        days-before-issue-close: 7
         # NEVER mark PRs as Stale or Close + this workflow should never have write permissions on PRs, EVER!
         days-before-pr-stale: -1
         days-before-pr-close: -1

.github/workflows/github-pages.yaml

@@ -1,17 +1,15 @@
 name: GitHub Pages Deploy
 
 on:
-  push:
-    paths:
-      - '.github/mkdocs.yml'
-      - '.github/requirements.txt'
-      - 'docs/**'
-      - 'overrides/**'
-      - '.github/CONTRIBUTING.md'
+  release:
+    types: [published, prereleased]
   workflow_dispatch:
 
+permissions:
+  contents: write
+
 jobs:
-  build-and-deploy:
+  deploy:
     runs-on: ubuntu-latest
 
     steps:
@@ -24,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
-        run: pip install -r .github/requirements.txt
+      - name: Install Necessary Dependencies using 'pip install -r requirements.txt'
+        run: pip install -r requirements.txt
 
-      - name: Build & Deploy using mkdocs
-        run: mkdocs gh-deploy --force -f .github/mkdocs.yml
+      - name: Build & Deploy using 'mkdocs'
+        run: mkdocs gh-deploy --force

.github/workflows/pre-release.yaml

@@ -74,52 +74,16 @@ jobs:
           name: winutil
           path: ./winutil.ps1
 
-      - name: Get latest release tag
-        id: get_latest_release
-        run: |
-          git fetch --tags --force
-          $latestTag = git for-each-ref --sort=-creatordate --format '%(refname:short)' refs/tags --count 1
-          if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrEmpty($latestTag)) {
-            Write-Error "Failed to get latest tag. Error code: $LASTEXITCODE"
-            exit 1
-          }
-          Write-Host "Latest tag: $latestTag"
-          echo "LATEST_TAG=$latestTag" >> $env:GITHUB_ENV
-        shell: pwsh
-
-      - name: Generate Release Notes
-        id: generate_notes
-        uses: release-drafter/release-drafter@v5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          config-name: release-drafter.yml
-          version: ${{ env.version }}
-          tag: ${{ env.LATEST_TAG }}
-
-      - name: Prepare Release Body
-        id: prepare_body
-        run: |
-          $newChanges = @'
-          ${{ steps.generate_notes.outputs.body }}
-          '@
-          $formattedChanges = "Changes since ${{ env.LATEST_TAG }}:`n`n$newChanges"
-          $encodedChanges = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($formattedChanges))
-          echo "body=$encodedChanges" >> $env:GITHUB_OUTPUT
-        shell: pwsh
-
       - name: Create and Upload Release
         id: create_release
         uses: softprops/action-gh-release@v2
         with:
-          tag_name: ${{ env.version }}
-          name: Pre-Release ${{ env.version }}
-          body: |
-            ${{ '{{' }} fromJson(format('"{0}"', steps.prepare_body.outputs.body)) | base64decode {{ '}}' }}
-            
-            ![GitHub Downloads (specific asset, specific tag)](https://img.shields.io/github/downloads/ChrisTitusTech/winutil/${{ env.VERSION }}/winutil.ps1)
+          tag_name: ${{ env.VERSION }}
+          name: Pre-Release ${{ env.VERSION }}
+          body: "![GitHub Downloads (specific asset, specific tag)](https://img.shields.io/github/downloads/ChrisTitusTech/winutil/${{ env.VERSION }}/winutil.ps1)"
           append_body: false
           files: ./winutil.ps1
           prerelease: true
+          generate_release_notes: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Compile.ps1

@@ -64,14 +64,38 @@ Get-ChildItem "$workingdir\functions" -Recurse -File | ForEach-Object {
     }
 Update-Progress "Adding: Config *.json" 40
 Get-ChildItem "$workingdir\config" | Where-Object {$psitem.extension -eq ".json"} | ForEach-Object {
+
     $json = (Get-Content $psitem.FullName).replace("'","''")
-    $jsonAsObject = $json | convertfrom-json
+
+    # Replace every XML Special Character so it'll render correctly in final build
+    # Only do so if json files has content to be displayed (for example the applications, tweaks, features json files)
+        # Make an Array List containing every name at first level of Json File
+        $jsonAsObject = $json | convertfrom-json
+        $firstLevelJsonList = [System.Collections.ArrayList]::new()
+        $jsonAsObject.PSObject.Properties.Name | ForEach-Object {$null = $firstLevelJsonList.Add($_)}
+        # Note:
+        #  Avoid using HTML Entity Codes, for example '”' (stands for "Right Double Quotation Mark"),
+        #  Use **HTML decimal/hex codes instead**, as using HTML Entity Codes will result in XML parse Error when running the compiled script.
+        for ($i = 0; $i -lt $firstLevelJsonList.Count; $i += 1) {
+            $firstLevelName = $firstLevelJsonList[$i]
+            if ($jsonAsObject.$firstLevelName.content -ne $null) {
+                $jsonAsObject.$firstLevelName.content = $jsonAsObject.$firstLevelName.content.replace('&','&#38;').replace('“','&#8220;').replace('”','&#8221;').replace("'",'&#39;').replace('<','&#60;').replace('>','&#62;').replace('—','&#8212;')
+                $jsonAsObject.$firstLevelName.content = $jsonAsObject.$firstLevelName.content.replace('&#39;&#39;',"&#39;") # resolves the Double Apostrophe caused by the first replace function in the main loop
+            }
+            if ($jsonAsObject.$firstLevelName.description -ne $null) {
+                $jsonAsObject.$firstLevelName.description = $jsonAsObject.$firstLevelName.description.replace('&','&#38;').replace('“','&#8220;').replace('”','&#8221;').replace("'",'&#39;').replace('<','&#60;').replace('>','&#62;').replace('—','&#8212;')
+                $jsonAsObject.$firstLevelName.description = $jsonAsObject.$firstLevelName.description.replace('&#39;&#39;',"&#39;") # resolves the Double Apostrophe caused by the first replace function in the main loop
+            }
+        }
 
     # Add 'WPFInstall' as a prefix to every entry-name in 'applications.json' file
     if ($psitem.Name -eq "applications.json") {
-        foreach ($appEntryName in $jsonAsObject.PSObject.Properties.Name) {
+        for ($i = 0; $i -lt $firstLevelJsonList.Count; $i += 1) {
+            $appEntryName = $firstLevelJsonList[$i]
             $appEntryContent = $jsonAsObject.$appEntryName
+            # Remove the entire app entry, so we could add it later with a different name
             $jsonAsObject.PSObject.Properties.Remove($appEntryName)
+            # Add the app entry, but with a different name (WPFInstall + The App Entry Name)
             $jsonAsObject | Add-Member -MemberType NoteProperty -Name "WPFInstall$appEntryName" -Value $appEntryContent
         }
     }
@@ -86,7 +110,20 @@ Get-ChildItem "$workingdir\config" | Where-Object {$psitem.extension -eq ".json"
 
 $xaml = (Get-Content "$workingdir\xaml\inputXML.xaml").replace("'","''")
 
+# Dot-source the Get-TabXaml function
+. "$workingdir\functions\private\Get-TabXaml.ps1"
+
+Update-Progress "Building: Xaml " 75
+$appXamlContent = Get-TabXaml "applications" 5
+$tweaksXamlContent = Get-TabXaml "tweaks"
+$featuresXamlContent = Get-TabXaml "feature"
+
+
 Update-Progress "Adding: Xaml " 90
+# Replace the placeholder in $inputXML with the content of inputApp.xaml
+$xaml = $xaml -replace "{{InstallPanel_applications}}", $appXamlContent
+$xaml = $xaml -replace "{{InstallPanel_tweaks}}", $tweaksXamlContent
+$xaml = $xaml -replace "{{InstallPanel_features}}", $featuresXamlContent
 
 $script_content.Add($(Write-output "`$inputXML =  '$xaml'"))
 

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><a href="https://github.com/tcookj66"><img src="https://github.com/tcookj66.png" width="60px" alt="Timothy Cook" /></a><!-- sponsors -->
+<!-- sponsors --><a href="https://github.com/GregoryNavasarkian"><img src="https://github.com/GregoryNavasarkian.png" width="60px" alt="Gregory Navasarkian" /></a><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/applications.json

@@ -87,6 +87,14 @@
         "link": "https://anydesk.com/",
         "winget": "AnyDeskSoftwareGmbH.AnyDesk"
     },
+    "ATLauncher": {
+        "category": "Games",
+        "choco": "na",
+        "content": "ATLauncher",
+        "description": "ATLauncher is a Launcher for Minecraft which integrates multiple different ModPacks to allow you to download and install ModPacks easily and quickly.",
+        "link": "https://github.com/ATLauncher/ATLauncher",
+        "winget": "ATLauncher.ATLauncher"
+    },
     "audacity": {
         "category": "Multimedia Tools",
         "choco": "audacity",
@@ -503,6 +511,14 @@
         "link": "https://www.epicgames.com/store/en-US/",
         "winget": "EpicGames.EpicGamesLauncher"
     },
+    "errorlookup": {
+        "category": "Utilities",
+        "choco": "na",
+        "content": "Windows Error Code Lookup",
+        "description": "ErrorLookup is a tool for looking up Windows error codes and their descriptions.",
+        "link": "https://github.com/HenryPP/ErrorLookup",
+        "winget": "Henry++.ErrorLookup"
+    },
     "esearch": {
         "category": "Utilities",
         "choco": "everything",

config/autounattend.xml

@@ -1,442 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State">
-    <!--https://schneegans.de/windows/unattend-generator/?LanguageMode=Unattended&UILanguage=en-US&Locale=en-US&Keyboard=00000409&GeoLocation=244&ProcessorArchitecture=amd64&BypassRequirementsCheck=true&BypassNetworkCheck=true&ComputerNameMode=Random&TimeZoneMode=Implicit&PartitionMode=Interactive&WindowsEditionMode=Unattended&WindowsEdition=pro&UserAccountMode=Unattended&AccountName0=User&AccountPassword0=&AccountGroup0=Administrators&AccountName1=&AccountName2=&AccountName3=&AccountName4=&AutoLogonMode=Own&PasswordExpirationMode=Unlimited&LockoutMode=Default&HideFiles=Hidden&DisableWidgets=true&ClassicContextMenu=true&DisableFastStartup=true&EnableLongPaths=true&DisableAppSuggestions=true&PreventDeviceEncryption=true&WifiMode=Skip&ExpressSettings=DisableAll&Remove3DViewer=true&RemoveBingSearch=true&RemoveCamera=true&RemoveClipchamp=true&RemoveClock=true&RemoveCopilot=true&RemoveCortana=true&RemoveDevHome=true&RemoveFamily=true&RemoveFeedbackHub=true&RemoveGetHelp=true&RemoveInternetExplorer=true&RemoveMailCalendar=true&RemoveMaps=true&RemoveMathInputPanel=true&RemoveZuneVideo=true&RemoveNews=true&RemoveNotepad=true&RemoveOffice365=true&RemoveOneDrive=true&RemoveOneNote=true&RemoveOpenSSHClient=true&RemoveOutlook=true&RemovePaint3D=true&RemovePeople=true&RemovePowerAutomate=true&RemoveQuickAssist=true&RemoveSkype=true&RemoveSolitaire=true&RemoveStepsRecorder=true&RemoveStickyNotes=true&RemoveTeams=true&RemoveGetStarted=true&RemoveToDo=true&RemoveVoiceRecorder=true&RemoveWeather=true&RemoveWindowsMediaPlayer=true&RemoveZuneMusic=true&RemoveWordPad=true&WdacMode=Skip-->
-    <settings pass="offlineServicing"></settings>
-    <settings pass="windowsPE">
-        <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
-            <SetupUILanguage>
-                <UILanguage>en-US</UILanguage>
-            </SetupUILanguage>
-            <InputLocale>0409:00000409</InputLocale>
-            <SystemLocale>en-US</SystemLocale>
-            <UILanguage>en-US</UILanguage>
-            <UserLocale>en-US</UserLocale>
-        </component>
-        <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
-            <UserData>
-                <ProductKey>
-                    <Key>VK7JG-NPHTM-C97JM-9MPGT-3V66T</Key>
-                </ProductKey>
-                <AcceptEula>true</AcceptEula>
-            </UserData>
-            <RunSynchronous>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>1</Order>
-                    <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassTPMCheck /t REG_DWORD /d 1 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>2</Order>
-                    <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassSecureBootCheck /t REG_DWORD /d 1 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>3</Order>
-                    <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassRAMCheck /t REG_DWORD /d 1 /f</Path>
-                </RunSynchronousCommand>
-            </RunSynchronous>
-        </component>
-    </settings>
-    <settings pass="generalize"></settings>
-    <settings pass="specialize">
-        <component name="Microsoft-Windows-Deployment" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
-            <RunSynchronous>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>1</Order>
-                    <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\OOBE" /v BypassNRO /t REG_DWORD /d 1 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>2</Order>
-                    <Path>reg.exe load "HKU\DefaultUser" "C:\Users\Default\NTUSER.DAT"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>3</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\Runonce" /v "UninstallCopilot" /t REG_SZ /d "powershell.exe -NoProfile -Command \"Get-AppxPackage -Name 'Microsoft.Windows.Ai.Copilot.Provider' | Remove-AppxPackage;\"" /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>4</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Policies\Microsoft\Windows\WindowsCopilot" /v TurnOffWindowsCopilot /t REG_DWORD /d 1 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>5</Order>
-                    <Path>reg.exe unload "HKU\DefaultUser"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>6</Order>
-                    <Path>reg.exe delete "HKLM\SOFTWARE\Microsoft\WindowsUpdate\Orchestrator\UScheduler_Oobe\DevHomeUpdate" /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>7</Order>
-                    <Path>reg.exe load "HKU\DefaultUser" "C:\Users\Default\NTUSER.DAT"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>8</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Notepad" /v ShowStoreBanner /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>9</Order>
-                    <Path>reg.exe unload "HKU\DefaultUser"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>10</Order>
-                    <Path>cmd.exe /c "del "C:\Users\Default\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\OneDrive.lnk""</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>11</Order>
-                    <Path>cmd.exe /c "del "C:\Windows\System32\OneDriveSetup.exe""</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>12</Order>
-                    <Path>cmd.exe /c "del "C:\Windows\SysWOW64\OneDriveSetup.exe""</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>13</Order>
-                    <Path>reg.exe load "HKU\DefaultUser" "C:\Users\Default\NTUSER.DAT"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>14</Order>
-                    <Path>reg.exe delete "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\Run" /v OneDriveSetup /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>15</Order>
-                    <Path>reg.exe unload "HKU\DefaultUser"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>16</Order>
-                    <Path>reg.exe delete "HKLM\SOFTWARE\Microsoft\WindowsUpdate\Orchestrator\UScheduler_Oobe\OutlookUpdate" /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>17</Order>
-                    <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Communications" /v ConfigureChatAutoInstall /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>18</Order>
-                    <Path>powershell.exe -NoProfile -Command "$xml = [xml]::new(); $xml.Load('C:\Windows\Panther\unattend.xml'); $sb = [scriptblock]::Create( $xml.unattend.Extensions.ExtractScript ); Invoke-Command -ScriptBlock $sb -ArgumentList $xml;"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>19</Order>
-                    <Path>powershell.exe -NoProfile -Command "Get-Content -LiteralPath 'C:\Windows\Temp\remove-packages.ps1' -Raw | Invoke-Expression;"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>20</Order>
-                    <Path>powershell.exe -NoProfile -Command "Get-Content -LiteralPath 'C:\Windows\Temp\remove-caps.ps1' -Raw | Invoke-Expression;"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>21</Order>
-                    <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\current\device\Start" /v ConfigureStartPins /t REG_SZ /d "{ \"pinnedList\": [] }" /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>22</Order>
-                    <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\current\device\Start" /v ConfigureStartPins_ProviderSet /t REG_DWORD /d 1 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>23</Order>
-                    <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\current\device\Start" /v ConfigureStartPins_WinningProvider /t REG_SZ /d B5292708-1619-419B-9923-E5D9F3925E71 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>24</Order>
-                    <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\providers\B5292708-1619-419B-9923-E5D9F3925E71\default\Device\Start" /v ConfigureStartPins /t REG_SZ /d "{ \"pinnedList\": [] }" /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>25</Order>
-                    <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\providers\B5292708-1619-419B-9923-E5D9F3925E71\default\Device\Start" /v ConfigureStartPins_LastWrite /t REG_DWORD /d 1 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>26</Order>
-                    <Path>net.exe accounts /maxpwage:UNLIMITED</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>27</Order>
-                    <Path>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>28</Order>
-                    <Path>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Power" /v HiberbootEnabled /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>29</Order>
-                    <Path>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Dsh" /v AllowNewsAndInterests /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>30</Order>
-                    <Path>reg.exe load "HKU\DefaultUser" "C:\Users\Default\NTUSER.DAT"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>31</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "ContentDeliveryAllowed" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>32</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "FeatureManagementEnabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>33</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "OEMPreInstalledAppsEnabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>34</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "PreInstalledAppsEnabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>35</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "PreInstalledAppsEverEnabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>36</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SilentInstalledAppsEnabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>37</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SoftLandingEnabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>38</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContentEnabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>39</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-310093Enabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>40</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-338387Enabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>41</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-338388Enabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>42</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-338389Enabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>43</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-338393Enabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>44</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-353698Enabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>45</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SystemPaneSuggestionsEnabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>46</Order>
-                    <Path>reg.exe unload "HKU\DefaultUser"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>47</Order>
-                    <Path>reg.exe add "HKLM\Software\Policies\Microsoft\Windows\CloudContent" /v "DisableWindowsConsumerFeatures" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>48</Order>
-                    <Path>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\BitLocker" /v "PreventDeviceEncryption" /t REG_DWORD /d 1 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>49</Order>
-                    <Path>reg.exe load "HKU\DefaultUser" "C:\Users\Default\NTUSER.DAT"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>50</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\Runonce" /v "ClassicContextMenu" /t REG_SZ /d "reg.exe add \"HKCU\Software\Classes\CLSID\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}\InprocServer32\" /ve /f" /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>51</Order>
-                    <Path>reg.exe unload "HKU\DefaultUser"</Path>
-                </RunSynchronousCommand>
-            </RunSynchronous>
-        </component>
-    </settings>
-    <settings pass="auditSystem"></settings>
-    <settings pass="auditUser"></settings>
-    <settings pass="oobeSystem">
-        <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
-            <InputLocale>0409:00000409</InputLocale>
-            <SystemLocale>en-US</SystemLocale>
-            <UILanguage>en-US</UILanguage>
-            <UserLocale>en-US</UserLocale>
-        </component>
-        <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
-            <UserAccounts>
-                <LocalAccounts>
-                    <LocalAccount wcm:action="add">
-                        <Name>User</Name>
-                        <Group>Administrators</Group>
-                        <Password>
-                            <Value></Value>
-                            <PlainText>true</PlainText>
-                        </Password>
-                    </LocalAccount>
-                </LocalAccounts>
-            </UserAccounts>
-            <AutoLogon>
-                <Username>User</Username>
-                <Enabled>true</Enabled>
-                <LogonCount>1</LogonCount>
-                <Password>
-                    <Value></Value>
-                    <PlainText>true</PlainText>
-                </Password>
-            </AutoLogon>
-            <OOBE>
-                <ProtectYourPC>3</ProtectYourPC>
-                <HideEULAPage>true</HideEULAPage>
-                <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE>
-            </OOBE>
-            <FirstLogonCommands>
-                <SynchronousCommand wcm:action="add">
-                    <Order>1</Order>
-                    <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v AutoLogonCount /t REG_DWORD /d 0 /f</CommandLine>
-                </SynchronousCommand>
-            </FirstLogonCommands>
-        </component>
-    </settings>
-    <Extensions xmlns="https://schneegans.de/windows/unattend-generator/">
-        <ExtractScript>
-param(
-    [xml] $Document
-);
-
-$scriptsDir = 'C:\Windows\Setup\Scripts\';
-foreach( $file in $Document.unattend.Extensions.File ) {
-    $path = [System.Environment]::ExpandEnvironmentVariables(
-        $file.GetAttribute( 'path' )
-    );
-    if( $path.StartsWith( $scriptsDir ) ) {
-        mkdir -Path $scriptsDir -ErrorAction 'SilentlyContinue';
-    }
-    $encoding = switch( [System.IO.Path]::GetExtension( $path ) ) {
-        { $_ -in '.ps1', '.xml' } { [System.Text.Encoding]::UTF8; }
-        { $_ -in '.reg', '.vbs', '.js' } { [System.Text.UnicodeEncoding]::new( $false, $true ); }
-        default { [System.Text.Encoding]::Default; }
-    };
-    [System.IO.File]::WriteAllBytes( $path, ( $encoding.GetPreamble() + $encoding.GetBytes( $file.InnerText.Trim() ) ) );
-}
-        </ExtractScript>
-        <File path="C:\Windows\Temp\remove-packages.ps1">
-$selectors = @(
-    'Microsoft.Microsoft3DViewer';
-    'Microsoft.BingSearch';
-    'Microsoft.WindowsCamera';
-    'Clipchamp.Clipchamp';
-    'Microsoft.WindowsAlarms';
-    'Microsoft.549981C3F5F10';
-    'Microsoft.Windows.DevHome';
-    'MicrosoftCorporationII.MicrosoftFamily';
-    'Microsoft.WindowsFeedbackHub';
-    'Microsoft.GetHelp';
-    'Microsoft.Getstarted';
-    'microsoft.windowscommunicationsapps';
-    'Microsoft.WindowsMaps';
-    'Microsoft.BingNews';
-    'Microsoft.WindowsNotepad';
-    'Microsoft.MicrosoftOfficeHub';
-    'Microsoft.Office.OneNote';
-    'Microsoft.OutlookForWindows';
-    'Microsoft.MSPaint';
-    'Microsoft.People';
-    'Microsoft.PowerAutomateDesktop';
-    'MicrosoftCorporationII.QuickAssist';
-    'Microsoft.SkypeApp';
-    'Microsoft.MicrosoftSolitaireCollection';
-    'Microsoft.MicrosoftStickyNotes';
-    'MSTeams';
-    'Microsoft.Todos';
-    'Microsoft.WindowsSoundRecorder';
-    'Microsoft.BingWeather';
-    'Microsoft.ZuneMusic';
-    'Microsoft.ZuneVideo';
-);
-$getCommand = { Get-AppxProvisionedPackage -Online; };
-$filterCommand = { $_.DisplayName -eq $selector; };
-$removeCommand = {
-  [CmdletBinding()]
-  param(
-    [Parameter( Mandatory, ValueFromPipeline )]
-    $InputObject
-  );
-  process {
-    $InputObject | Remove-AppxProvisionedPackage -AllUsers -Online -ErrorAction 'Continue';
-  }
-};
-$type = 'Package';
-$logfile = 'C:\Windows\Temp\remove-packages.log';
-&amp; {
-    $installed = &amp; $getCommand;
-    foreach( $selector in $selectors ) {
-        $result = [ordered] @{
-            Selector = $selector;
-        };
-        $found = $installed | Where-Object -FilterScript $filterCommand;
-        if( $found ) {
-            $result.Output = $found | &amp; $removeCommand;
-            if( $? ) {
-                $result.Message = "$type removed.";
-            } else {
-                $result.Message = "$type not removed.";
-                $result.Error = $Error[0];
-            }
-        } else {
-            $result.Message = "$type not installed.";
-        }
-        $result | ConvertTo-Json -Depth 3 -Compress;
-    }
-} *&gt;&amp;1 &gt;&gt; $logfile;
-        </File>
-        <File path="C:\Windows\Temp\remove-caps.ps1">
-$selectors = @(
-    'Browser.InternetExplorer';
-    'MathRecognizer';
-    'OpenSSH.Client';
-    'App.Support.QuickAssist';
-    'App.StepsRecorder';
-    'Media.WindowsMediaPlayer';
-    'Microsoft.Windows.WordPad';
-);
-$getCommand = { Get-WindowsCapability -Online; };
-$filterCommand = { ($_.Name -split '~')[0] -eq $selector; };
-$removeCommand = {
-  [CmdletBinding()]
-  param(
-    [Parameter( Mandatory, ValueFromPipeline )]
-    $InputObject
-  );
-  process {
-    $InputObject | Remove-WindowsCapability -Online -ErrorAction 'Continue';
-  }
-};
-$type = 'Capability';
-$logfile = 'C:\Windows\Temp\remove-caps.log';
-&amp; {
-    $installed = &amp; $getCommand;
-    foreach( $selector in $selectors ) {
-        $result = [ordered] @{
-            Selector = $selector;
-        };
-        $found = $installed | Where-Object -FilterScript $filterCommand;
-        if( $found ) {
-            $result.Output = $found | &amp; $removeCommand;
-            if( $? ) {
-                $result.Message = "$type removed.";
-            } else {
-                $result.Message = "$type not removed.";
-                $result.Error = $Error[0];
-            }
-        } else {
-            $result.Message = "$type not installed.";
-        }
-        $result | ConvertTo-Json -Depth 3 -Compress;
-    }
-} *&gt;&amp;1 &gt;&gt; $logfile;
-        </File>
-        <File path="C:\Users\Default\AppData\Local\Microsoft\Windows\Shell\LayoutModification.xml"><![CDATA[
-<LayoutModificationTemplate Version="1" xmlns="http://schemas.microsoft.com/Start/2014/LayoutModification">
-    <LayoutOptions StartTileGroupCellWidth="6" />
-    <DefaultLayoutOverride>
-        <StartLayoutCollection>
-            <StartLayout GroupCellWidth="6" xmlns="http://schemas.microsoft.com/Start/2014/FullDefaultLayout" />
-        </StartLayoutCollection>
-    </DefaultLayoutOverride>
-</LayoutModificationTemplate>
-        ]]></File>
-    </Extensions>
-</unattend>

config/preset.json

@@ -14,7 +14,7 @@
     "WPFTweaksDeleteTempFiles",
     "WPFTweaksEndTaskOnTaskbar",
     "WPFTweaksRestorePoint",
-    "WPFTweaksIPv46",
+    "WPFTweaksTeredo",
     "WPFTweaksPowershell7Tele"
   ],
   "Minimal": [

config/themes.json

@@ -1,169 +1,220 @@
 {
-    "_default": {
-        "CustomDialogFontSize":       "12",
-        "CustomDialogFontSizeHeader": "14",
-        "CustomDialogIconSize":       "25",
-        "CustomDialogWidth":          "400",
-        "CustomDialogHeight":         "200",
+    "Classic":  {
+                    "CustomDialogFontSize":       "12",
+                    "CustomDialogFontSizeHeader": "14",
+                    "CustomDialogIconSize":       "25",
+                    "CustomDialogWidth":          "400",
+                    "CustomDialogHeight":         "200",
 
-        "FontSize":         "14",
-        "FontFamily":       "Arial",
-        "FontSizeHeading":  "16",
-        "HeaderFontFamily": "Consolas, Monaco",
+                    "FontSize":         "12",
+                    "FontFamily":       "Arial",
+                    "FontSizeHeading":  "14",
+                    "HeaderFontFamily": "Consolas, Monaco",
 
-        "CheckBoxBulletDecoratorSize": "14",
-        "CheckBoxMargin": "15,0,0,2",
+                    "CheckBoxBulletDecoratorFontSize": "14",
+                    "CheckBoxMargin": "15,0,0,2",
 
-        "TabContentMargin":       "5",
-        "TabButtonFontSize":      "14",
-        "TabButtonWidth":         "100",
-        "TabButtonHeight":        "25",
-        "TabRowHeightInPixels":   "50",
-        "IconFontSize":     "14",
-        "IconButtonSize":   "35",
-        "WinUtilIconSize":        "Auto",
-        "SettingsIconFontSize":   "18",
-        "CloseIconFontSize":      "18",
+                    "TabButtonFontSize":      "14",
+                    "TabButtonWidth":         "100",
+                    "TabButtonHeight":        "25",
+                    "TabRowHeightInPixels":   "50",
+                    "IconFontSize":     "14",
+                    "IconButtonSize":   "35",
+                    "WinUtilIconSize":        "Auto",
+                    "SettingsIconFontSize":   "18",
 
-        "MicroWinLogoSize": "10",
+                    "MicroWinLogoSize": "10",
 
-        "ProgressBarForegroundColor": "#FFAC1C",
-        "ProgressBarBackgroundColor": "Transparent",
-        "ProgressBarTextColor": "#000000",
+                    "ProgressBarForegroundColor": "#FFAC1C",
+                    "ProgressBarBackgroundColor": "Transparent",
+                    "ProgressBarTextColor": "#000000",
 
-        "ComboBoxBackgroundColor":  "#FFFFFF",
-        "LabelboxForegroundColor":  "#000000",
-        "MainForegroundColor":  "#000000",
-        "MainBackgroundColor":  "#FFFFFF",
-        "LabelBackgroundColor":  "#FFFFFF",
-        "LinkForegroundColor":  "#000000",
-        "LinkHoverForegroundColor":  "#000000",
-        "GroupBorderBackgroundColor":  "#000000",
-        "ComboBoxForegroundColor":  "#000000",
+                    "ComboBoxBackgroundColor":  "#FFFFFF",
+                    "LabelboxForegroundColor":  "#000000",
+                    "MainForegroundColor":  "#000000",
+                    "MainBackgroundColor":  "#FFFFFF",
+                    "LabelBackgroundColor":  "#FAFAFA",
+                    "LinkForegroundColor":  "#000000",
+                    "LinkHoverForegroundColor":  "#000000",
+                    "GroupBorderBackgroundColor":  "#000000",
+                    "ComboBoxForegroundColor":  "#000000",
 
-        "ButtonFontSize":   "12",
-        "ButtonFontFamily": "Arial",
-        "ButtonWidth":      "200",
-        "ButtonHeight":     "25",
-        "ConfigTabButtonFontSize":      "16",
+                    "ButtonFontSize":   "12",
+                    "ButtonFontFamily": "Arial",
+                    "ButtonWidth":      "200",
+                    "ButtonHeight":     "25",
+                    "ConfigTabButtonFontSize":      "16",
 
-        "SearchBarWidth":               "200",
-        "SearchBarHeight":              "25",
-        "SearchBarTextBoxFontSize":     "12",
-        "SearchBarClearButtonFontSize": "14",
+                    "SearchBarWidth":               "200",
+                    "SearchBarHeight":              "25",
+                    "SearchBarTextBoxFontSize":     "16",
+                    "SearchBarClearButtonFontSize": "14",
 
-        "ButtonInstallBackgroundColor":  "#FFFFFF",
-        "ButtonTweaksBackgroundColor":  "#FFFFFF",
-        "ButtonConfigBackgroundColor":  "#FFFFFF",
-        "ButtonUpdatesBackgroundColor":  "#FFFFFF",
-        "ButtonInstallForegroundColor":  "#000000",
-        "ButtonTweaksForegroundColor":  "#000000",
-        "ButtonConfigForegroundColor":  "#000000",
-        "ButtonUpdatesForegroundColor":  "#000000",
-        "ButtonBackgroundColor":  "#F5F5F5",
-        "ButtonBackgroundPressedColor":  "#1A1A1A",
-        "CheckboxMouseOverColor": "#999999",
-        "ButtonBackgroundMouseoverColor":  "#C2C2C2",
-        "ButtonBackgroundSelectedColor":  "#F0F0F0",
-        "ButtonForegroundColor":  "#000000",
-        "ToggleButtonOnColor":  "#2e77ff",
+                    "ButtonInstallBackgroundColor":  "#FFFFFF",
+                    "ButtonTweaksBackgroundColor":  "#FFFFFF",
+                    "ButtonConfigBackgroundColor":  "#FFFFFF",
+                    "ButtonUpdatesBackgroundColor":  "#FFFFFF",
+                    "ButtonInstallForegroundColor":  "#000000",
+                    "ButtonTweaksForegroundColor":  "#000000",
+                    "ButtonConfigForegroundColor":  "#000000",
+                    "ButtonUpdatesForegroundColor":  "#000000",
+                    "ButtonBackgroundColor":  "#F5F5F5",
+                    "ButtonBackgroundPressedColor":  "#1A1A1A",
+                    "CheckboxMouseOverColor": "#999999",
+                    "ButtonBackgroundMouseoverColor":  "#C2C2C2",
+                    "ButtonBackgroundSelectedColor":  "#F0F0F0",
+                    "ButtonForegroundColor":  "#000000",
+                    "ToggleButtonOnColor":  "#2e77ff",
 
-        "ButtonBorderThickness":  "1",
-        "ButtonMargin":  "1",
-        "ButtonCornerRadius": "2",
-        "BorderColor": "#000000",
-        "BorderOpacity": "0.2",
-        "ShadowPulse": "Forever"
-    },
-    "Classic": {
-        "ComboBoxBackgroundColor":  "#FFFFFF",
-        "LabelboxForegroundColor":  "#000000",
-        "MainForegroundColor":  "#000000",
-        "MainBackgroundColor":  "#FFFFFF",
-        "LabelBackgroundColor":  "#FFFFFF",
-        "LinkForegroundColor":  "#000000",
-        "LinkHoverForegroundColor":  "#000000",
-        "GroupBorderBackgroundColor":  "#000000",
-        "ComboBoxForegroundColor":  "#000000",
+                    "ButtonBorderThickness":  "1",
+                    "ButtonMargin":  "1",
+                    "ButtonCornerRadius": "2",
+                    "BorderColor": "#000000",
+                    "BorderOpacity": "0.2",
+                    "ShadowPulse": "Forever"
+                },
+    "Matrix":  {
+                    "CustomDialogFontSize":       "12",
+                    "CustomDialogFontSizeHeader": "14",
+                    "CustomDialogIconSize":       "25",
+                    "CustomDialogWidth":          "400",
+                    "CustomDialogHeight":         "200",
 
-        "ButtonInstallBackgroundColor":  "#FFFFFF",
-        "ButtonTweaksBackgroundColor":  "#FFFFFF",
-        "ButtonConfigBackgroundColor":  "#FFFFFF",
-        "ButtonUpdatesBackgroundColor":  "#FFFFFF",
-        "ButtonInstallForegroundColor":  "#000000",
-        "ButtonTweaksForegroundColor":  "#000000",
-        "ButtonConfigForegroundColor":  "#000000",
-        "ButtonUpdatesForegroundColor":  "#000000",
-        "ButtonBackgroundColor":  "#F5F5F5",
-        "ButtonBackgroundPressedColor":  "#1A1A1A",
-        "CheckboxMouseOverColor": "#999999",
-        "ButtonBackgroundMouseoverColor":  "#C2C2C2",
-        "ButtonBackgroundSelectedColor":  "#F0F0F0",
-        "ButtonForegroundColor":  "#000000",
-        "ToggleButtonOnColor":  "#2e77ff"
-    },
-    "Matrix": {
-        "ComboBoxBackgroundColor":  "#000000",
-        "LabelboxForegroundColor":  "#FFEE58",
-        "MainForegroundColor":  "#9CCC65",
-        "MainBackgroundColor":  "#000000",
-        "LabelBackgroundColor":  "#000000",
-        "LinkForegroundColor":  "#add8e6",
-        "LinkHoverForegroundColor":  "#FFFFFF",
-        "ComboBoxForegroundColor":  "#FFEE58",
+                    "FontSize":         "12",
+                    "FontFamily":       "Arial",
+                    "FontSizeHeading":  "14",
+                    "HeaderFontFamily": "Consolas, Monaco",
 
-        "ProgressBarForegroundColor": "#222222",
-        "ProgressBarBackgroundColor": "Transparent",
-        "ProgressBarTextColor": "#cccccc",
+                    "CheckBoxBulletDecoratorFontSize": "14",
+                    "CheckBoxMargin": "15,0,0,2",
 
-        "ButtonInstallBackgroundColor":  "#222222",
-        "ButtonTweaksBackgroundColor":  "#333333",
-        "ButtonConfigBackgroundColor":  "#444444",
-        "ButtonUpdatesBackgroundColor":  "#555555",
-        "ButtonInstallForegroundColor":  "#FFFFFF",
-        "ButtonTweaksForegroundColor":  "#FFFFFF",
-        "ButtonConfigForegroundColor":  "#FFFFFF",
-        "ButtonUpdatesForegroundColor":  "#FFFFFF",
-        "ButtonBackgroundColor":  "#000019",
-        "ButtonBackgroundPressedColor":  "#FFFFFF",
-        "ButtonBackgroundMouseoverColor":  "#A55A64",
-        "ButtonBackgroundSelectedColor":  "#FF5733",
-        "ButtonForegroundColor":  "#9CCC65",
-        "ToggleButtonOnColor":  "#2e77ff",
+                    "TabButtonFontSize":      "14",
+                    "TabButtonWidth":         "100",
+                    "TabButtonHeight":        "25",
+                    "TabRowHeightInPixels":   "50",
+                    "IconFontSize":     "14",
+                    "IconButtonSize":   "35",
+                    "WinUtilIconSize":        "Auto",
+                    "SettingsIconFontSize":   "18",
 
-        "BorderColor": "#FFAC1C",
-        "BorderOpacity": "0.8",
-        "ShadowPulse": "0:0:3"
-    },
-    "Dark": {
-        "ComboBoxBackgroundColor":  "#000000",
-        "LabelboxForegroundColor":  "#FFEE58",
-        "MainForegroundColor":  "#9CCC65",
-        "MainBackgroundColor":  "#000000",
-        "LabelBackgroundColor":  "#000000",
-        "LinkForegroundColor":  "#add8e6",
-        "LinkHoverForegroundColor":  "#FFFFFF",
-        "ComboBoxForegroundColor":  "#FFEE58",
+                    "MicroWinLogoSize": "10",
 
-        "ProgressBarForegroundColor": "#222222",
-        "ProgressBarBackgroundColor": "Transparent",
-        "ProgressBarTextColor": "#cccccc",
+                    "ProgressBarForegroundColor": "#222222",
+                    "ProgressBarBackgroundColor": "Transparent",
+                    "ProgressBarTextColor": "#cccccc",
 
-        "ButtonInstallBackgroundColor": "#222222",
-        "ButtonTweaksBackgroundColor":  "#333333",
-        "ButtonConfigBackgroundColor":  "#444444",
-        "ButtonUpdatesBackgroundColor": "#555555",
-        "ButtonInstallForegroundColor": "#FFFFFF",
-        "ButtonTweaksForegroundColor":  "#FFFFFF",
-        "ButtonConfigForegroundColor":  "#FFFFFF",
-        "ButtonUpdatesForegroundColor": "#FFFFFF",
-        "ButtonBackgroundColor":  "#000019",
-        "ButtonBackgroundPressedColor":   "#9CCC65",
-        "ButtonBackgroundMouseoverColor": "#FF5733",
-        "ButtonBackgroundSelectedColor":  "#FF5733",
-        "ButtonForegroundColor":  "#9CCC65",
-        "ToggleButtonOnColor":    "#2e77ff",
+                    "ComboBoxBackgroundColor":  "#000000",
+                    "LabelboxForegroundColor":  "#FFEE58",
+                    "MainForegroundColor":  "#9CCC65",
+                    "MainBackgroundColor":  "#000000",
+                    "LabelBackgroundColor":  "#000000",
+                    "LinkForegroundColor":  "#add8e6",
+                    "LinkHoverForegroundColor":  "#FFFFFF",
+                    "ComboBoxForegroundColor":  "#FFEE58",
 
-        "BorderColor": "#FFAC1C"
-    }
+                    "ButtonFontSize":   "12",
+                    "ButtonFontFamily": "Arial",
+                    "ButtonWidth":      "200",
+                    "ButtonHeight":     "25",
+                    "ConfigTabButtonFontSize":      "16",
+
+                    "SearchBarWidth":               "200",
+                    "SearchBarHeight":              "25",
+                    "SearchBarTextBoxFontSize":     "16",
+                    "SearchBarClearButtonFontSize": "14",
+
+                    "ButtonInstallBackgroundColor":  "#222222",
+                    "ButtonTweaksBackgroundColor":  "#333333",
+                    "ButtonConfigBackgroundColor":  "#444444",
+                    "ButtonUpdatesBackgroundColor":  "#555555",
+                    "ButtonInstallForegroundColor":  "#FFFFFF",
+                    "ButtonTweaksForegroundColor":  "#FFFFFF",
+                    "ButtonConfigForegroundColor":  "#FFFFFF",
+                    "ButtonUpdatesForegroundColor":  "#FFFFFF",
+                    "ButtonBackgroundColor":  "#000019",
+                    "ButtonBackgroundPressedColor":  "#FFFFFF",
+                    "ButtonBackgroundMouseoverColor":  "#A55A64",
+                    "ButtonBackgroundSelectedColor":  "#FF5733",
+                    "ButtonForegroundColor":  "#9CCC65",
+                    "ToggleButtonOnColor":  "#2e77ff",
+
+                    "ButtonBorderThickness":  "1",
+                    "ButtonMargin":  "1",
+                    "ButtonCornerRadius": "2",
+                    "BorderColor": "#FFAC1C",
+                    "BorderOpacity": "0.8",
+                    "ShadowPulse": "0:0:3"
+               },
+     "Dark":  {
+                    "CustomDialogFontSize":       "12",
+                    "CustomDialogFontSizeHeader": "14",
+                    "CustomDialogIconSize":       "25",
+                    "CustomDialogWidth":          "400",
+                    "CustomDialogHeight":         "200",
+
+                    "FontSize":         "12",
+                    "FontFamily":       "Arial",
+                    "FontSizeHeading":  "14",
+                    "HeaderFontFamily": "Consolas, Monaco",
+
+                    "CheckBoxBulletDecoratorFontSize": "14",
+                    "CheckBoxMargin": "15,0,0,2",
+
+                    "TabButtonFontSize":      "14",
+                    "TabButtonWidth":         "100",
+                    "TabButtonHeight":        "25",
+                    "TabRowHeightInPixels":   "50",
+                    "IconFontSize":     "14",
+                    "IconButtonSize":   "35",
+                    "WinUtilIconSize":        "Auto",
+                    "SettingsIconFontSize":   "18",
+
+                    "MicroWinLogoSize": "10",
+
+                    "ProgressBarForegroundColor": "#222222",
+                    "ProgressBarBackgroundColor": "Transparent",
+                    "ProgressBarTextColor": "#FFFFFF",
+
+                    "ComboBoxBackgroundColor":  "#000000",
+                    "LabelboxForegroundColor":  "#FFEE58",
+                    "MainForegroundColor":  "#9CCC65",
+                    "MainBackgroundColor":  "#000000",
+                    "LabelBackgroundColor":  "#000000",
+                    "LinkForegroundColor":  "#add8e6",
+                    "LinkHoverForegroundColor":  "#FFFFFF",
+                    "ComboBoxForegroundColor":  "#FFEE58",
+
+                    "ButtonFontSize":   "12",
+                    "ButtonFontFamily": "Arial",
+                    "ButtonWidth":      "200",
+                    "ButtonHeight":     "25",
+                    "ConfigTabButtonFontSize":      "16",
+
+                    "SearchBarWidth":               "200",
+                    "SearchBarHeight":              "25",
+                    "SearchBarTextBoxFontSize":     "16",
+                    "SearchBarClearButtonFontSize": "14",
+
+                    "ButtonInstallBackgroundColor": "#222222",
+                    "ButtonTweaksBackgroundColor":  "#333333",
+                    "ButtonConfigBackgroundColor":  "#444444",
+                    "ButtonUpdatesBackgroundColor": "#555555",
+                    "ButtonInstallForegroundColor": "#FFFFFF",
+                    "ButtonTweaksForegroundColor":  "#FFFFFF",
+                    "ButtonConfigForegroundColor":  "#FFFFFF",
+                    "ButtonUpdatesForegroundColor": "#FFFFFF",
+                    "ButtonBackgroundColor":  "#000019",
+                    "ButtonBackgroundPressedColor":   "#9CCC65",
+                    "ButtonBackgroundMouseoverColor": "#FF5733",
+                    "ButtonBackgroundSelectedColor":  "#FF5733",
+                    "ButtonForegroundColor":  "#9CCC65",
+                    "ToggleButtonOnColor":    "#2e77ff",
+
+                    "ButtonBorderThickness":  "1",
+                    "ButtonMargin":  "1",
+                    "ButtonCornerRadius": "2",
+                    "BorderColor": "#FFAC1C",
+                    "BorderOpacity": "0.2",
+                    "ShadowPulse": "Forever"
+               }
 }

config/tweaks.json

@@ -2561,10 +2561,15 @@
     "panel": "1",
     "Order": "a029_",
     "InvokeScript": [
-      "Uninstall-WinUtilEdgeBrowser -action \"Uninstall\""
+      "
+      Uninstall-WinUtilEdgeBrowser
+      "
     ],
     "UndoScript": [
-      "Uninstall-WinUtilEdgeBrowser -action \"Install\""
+      "
+      Write-Host \"Install Microsoft Edge\"
+      Start-Process -FilePath winget -ArgumentList \"install --force -e --accept-source-agreements --accept-package-agreements --silent Microsoft.Edge \" -NoNewWindow -Wait
+      "
     ],
     "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveEdge"
   },
@@ -2713,9 +2718,6 @@
       reg delete \"HKEY_USERS\\Default\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run\" /v \"OneDriveSetup\" /f
       reg unload \"hku\\Default\"
 
-      Write-Host \"Removing autostart key\"
-      reg delete \"HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run\" /v \"OneDrive\" /f
-
       Write-Host \"Removing startmenu entry\"
       Remove-Item -Force -ErrorAction SilentlyContinue \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\Start Menu\\Programs\\OneDrive.lnk\"
 
@@ -3144,29 +3146,12 @@
     ],
     "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/DVR"
   },
-  "WPFTweaksIPv46": {
-    "Content": "Prefer IPv4 over IPv6",
-    "Description": "To set the IPv4 preference can have latency and security benefits on private networks where IPv6 is not configured.",
+  "WPFTweaksTeredo": {
+    "Content": "Disable Teredo",
+    "Description": "Teredo network tunneling is a ipv6 feature that can cause additional latency.",
     "category": "Essential Tweaks",
     "panel": "1",
     "Order": "a005_",
-    "registry": [
-      {
-        "Path": "HKLM:\\SYSTEM\\CurrentControlSet\\Services\\Tcpip6\\Parameters",
-        "Name": "DisabledComponents",
-        "Value": "32",
-        "OriginalValue": "0",
-        "Type": "DWord"
-      }
-    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/IPv46"
-  },
-  "WPFTweaksTeredo": {
-    "Content": "Disable Teredo",
-    "Description": "Teredo network tunneling is a ipv6 feature that can cause additional latency, but may cause problems with some games",
-    "category": "z__Advanced Tweaks - CAUTION",
-    "panel": "1",
-    "Order": "a023_",
     "registry": [
       {
         "Path": "HKLM:\\SYSTEM\\CurrentControlSet\\Services\\Tcpip6\\Parameters",
@@ -3182,7 +3167,7 @@
     "UndoScript": [
       "netsh interface teredo set state default"
     ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/Teredo"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/Teredo"
   },
   "WPFTweaksDisableipsix": {
     "Content": "Disable IPv6",
@@ -3402,6 +3387,22 @@
     "ComboItems": "Default DHCP Google Cloudflare Cloudflare_Malware Cloudflare_Malware_Adult Open_DNS Quad9 AdGuard_Ads_Trackers AdGuard_Ads_Trackers_Malware_Adult",
     "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/changedns"
   },
+  "WPFTweaksbutton": {
+    "Content": "Run Tweaks",
+    "category": "z__Advanced Tweaks - CAUTION",
+    "panel": "1",
+    "Order": "a041_",
+    "Type": "Button",
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/button"
+  },
+  "WPFUndoall": {
+    "Content": "Undo Selected Tweaks",
+    "category": "z__Advanced Tweaks - CAUTION",
+    "panel": "1",
+    "Order": "a042_",
+    "Type": "Button",
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/Undoall"
+  },
   "WPFAddUltPerf": {
     "Content": "Add and Activate Ultimate Performance Profile",
     "category": "Performance Plans",

devdocs-generator.ps1

@@ -563,17 +563,17 @@ function Add-LinkAttributeToJson {
 }
 
 Update-Progress "Loading JSON files" 10
-$tweaks = Get-Content -Path "../config/tweaks.json" | ConvertFrom-Json
-$features = Get-Content -Path "../config/feature.json" | ConvertFrom-Json
+$tweaks = Get-Content -Path "config/tweaks.json" | ConvertFrom-Json
+$features = Get-Content -Path "config/feature.json" | ConvertFrom-Json
 
 Update-Progress "Getting last modified dates of the JSON files" 20
-$tweaksLastModified = (Get-Item "../config/tweaks.json").LastWriteTime.ToString("yyyy-MM-dd")
-$featuresLastModified = (Get-Item "../config/feature.json").LastWriteTime.ToString("yyyy-MM-dd")
+$tweaksLastModified = (Get-Item "config/tweaks.json").LastWriteTime.ToString("yyyy-MM-dd")
+$featuresLastModified = (Get-Item "config/feature.json").LastWriteTime.ToString("yyyy-MM-dd")
 
-$tweaksOutputDir = "../docs/dev/tweaks"
-$featuresOutputDir = "../docs/dev/features"
-$privateFunctionsDir = "../functions/private"
-$publicFunctionsDir = "../functions/public"
+$tweaksOutputDir = "docs/dev/tweaks"
+$featuresOutputDir = "docs/dev/features"
+$privateFunctionsDir = "functions/private"
+$publicFunctionsDir = "functions/public"
 $functions = @{}
 $itemnametocut = "WPF(WinUtil|Toggle|Features?|Tweaks?|Panel|Fix(es)?)?"
 
@@ -592,7 +592,7 @@ Load-Functions -dir $publicFunctionsDir
 Update-Progress "Adding documentation links to JSON files" 50
 
 # Define the JSON file paths
-$jsonPaths = @("../config/feature.json", "../config/tweaks.json")
+$jsonPaths = @(".\config\feature.json", ".\config\tweaks.json")
 
 # Loop through each JSON file path
 foreach ($jsonPath in $jsonPaths) {
@@ -612,12 +612,12 @@ foreach ($jsonPath in $jsonPaths) {
     Set-Content -Path $jsonPath -Value $jsonString
 }
 
-Add-LinkAttributeToJson -jsonFilePath "../config/tweaks.json" -outputDir "dev/tweaks"
-Add-LinkAttributeToJson -jsonFilePath "../config/feature.json" -outputDir "dev/features"
+Add-LinkAttributeToJson -jsonFilePath "config/tweaks.json" -outputDir "dev/tweaks"
+Add-LinkAttributeToJson -jsonFilePath "config/feature.json" -outputDir "dev/features"
 
 Update-Progress "Generating content for documentation" 60
-$tweakResult = Generate-MarkdownFiles -data $tweaks -outputDir $tweaksOutputDir -jsonFilePath "../config/tweaks.json" -lastModified $tweaksLastModified -type "tweak" -initialProgress 60
-$featureResult = Generate-MarkdownFiles -data $features -outputDir $featuresOutputDir -jsonFilePath "../config/feature.json" -lastModified $featuresLastModified -type "feature" -initialProgress 70
+$tweakResult = Generate-MarkdownFiles -data $tweaks -outputDir $tweaksOutputDir -jsonFilePath "config/tweaks.json" -lastModified $tweaksLastModified -type "tweak" -initialProgress 60
+$featureResult = Generate-MarkdownFiles -data $features -outputDir $featuresOutputDir -jsonFilePath "config/feature.json" -lastModified $featuresLastModified -type "feature" -initialProgress 70
 
 Update-Progress "Generating table of contents" 80
 $allTocEntries = $tweakResult.TocEntries + $featureResult.TocEntries
@@ -639,6 +639,6 @@ $indexContent += Process-MultilineStrings @"
     \\
 "@
 $indexContent += $(Generate-TypeSectionContent $featureEntries) + "`r`n"
-Set-Content -Path "../docs/devdocs.md" -Value $indexContent -Encoding utf8
+Set-Content -Path "docs/devdocs.md" -Value $indexContent -Encoding utf8
 
 Update-Progress "Process Completed" 100

docs/contribute.md

@@ -1,3 +1,3 @@
---8<-- ".github/CONTRIBUTING.md"
+--8<-- "CONTRIBUTING.md"
 
 <!-- The content is sourced from "CONTRIBUTING.md," located in the root directory of the project. -->

docs/dev/tweaks/Essential-Tweaks/IPv46.md

@@ -1,63 +0,0 @@
-# Prefer IPv4 over IPv6
-
-Last Updated: 2024-08-27
-
-
-!!! info
-     The Development Documentation is auto generated for every compilation of WinUtil, meaning a part of it will always stay up-to-date. **Developers do have the ability to add custom content, which won't be updated automatically.**
-## Description
-
-To set the IPv4 preference can have latency and security benefits on private networks where IPv6 is not configured.
-
-<!-- BEGIN CUSTOM CONTENT -->
-
-<!-- END CUSTOM CONTENT -->
-
-<details>
-<summary>Preview Code</summary>
-
-```json
-{
-  "Content": "Prefer IPv4 over IPv6",
-  "Description": "To set the IPv4 preference can have latency and security benefits on private networks where IPv6 is not configured.",
-  "category": "Essential Tweaks",
-  "panel": "1",
-  "Order": "a005_",
-  "registry": [
-    {
-      "Path": "HKLM:\\SYSTEM\\CurrentControlSet\\Services\\Tcpip6\\Parameters",
-      "Name": "DisabledComponents",
-      "Value": "32",
-      "OriginalValue": "0",
-      "Type": "DWord"
-    }
-  ],
-  "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/IPv46"
-}
-```
-
-</details>
-
-## Registry Changes
-Applications and System Components store and retrieve configuration data to modify windows settings, so we can use the registry to change many settings in one place.
-
-
-You can find information about the registry on [Wikipedia](https://www.wikiwand.com/en/Windows_Registry) and [Microsoft's Website](https://learn.microsoft.com/en-us/windows/win32/sysinfo/registry).
-
-### Registry Key: DisabledComponents
-
-**Type:** DWord
-
-**Original Value:** 0
-
-**New Value:** 32
-
-
-
-<!-- BEGIN SECOND CUSTOM CONTENT -->
-
-<!-- END SECOND CUSTOM CONTENT -->
-
-
-[View the JSON file](https://github.com/ChrisTitusTech/winutil/tree/main/config/tweaks.json)
-

docs/dev/tweaks/Essential-Tweaks/Teredo.md

@@ -1,13 +1,13 @@
 # Disable Teredo
 
-Last Updated: 2024-08-27
+Last Updated: 2024-08-07
 
 
 !!! info
      The Development Documentation is auto generated for every compilation of WinUtil, meaning a part of it will always stay up-to-date. **Developers do have the ability to add custom content, which won't be updated automatically.**
 ## Description
 
-Teredo network tunneling is a ipv6 feature that can cause additional latency, but may cause problems with some games
+Teredo network tunneling is a ipv6 feature that can cause additional latency.
 
 <!-- BEGIN CUSTOM CONTENT -->
 
@@ -19,10 +19,10 @@ Teredo network tunneling is a ipv6 feature that can cause additional latency, bu
 ```json
 {
   "Content": "Disable Teredo",
-  "Description": "Teredo network tunneling is a ipv6 feature that can cause additional latency, but may cause problems with some games",
-  "category": "z__Advanced Tweaks - CAUTION",
+  "Description": "Teredo network tunneling is a ipv6 feature that can cause additional latency.",
+  "category": "Essential Tweaks",
   "panel": "1",
-  "Order": "a023_",
+  "Order": "a005_",
   "registry": [
     {
       "Path": "HKLM:\\SYSTEM\\CurrentControlSet\\Services\\Tcpip6\\Parameters",
@@ -38,7 +38,7 @@ Teredo network tunneling is a ipv6 feature that can cause additional latency, bu
   "UndoScript": [
     "netsh interface teredo set state default"
   ],
-  "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/Teredo"
+  "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/Teredo"
 }
 ```
 

docs/devdocs.md

@@ -13,7 +13,6 @@
 - [Disable IPv6](dev/tweaks/z--Advanced-Tweaks---CAUTION/Disableipsix.md)
 - [Disable Microsoft Copilot](dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveCopilot.md)
 - [Disable Notification Tray/Calendar](dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableNotifications.md)
-- [Disable Teredo](dev/tweaks/z--Advanced-Tweaks---CAUTION/Teredo.md)
 - [DNS](dev/tweaks/z--Advanced-Tweaks---CAUTION/changedns.md)
 - [Remove ALL MS Store Apps - NOT RECOMMENDED](dev/tweaks/z--Advanced-Tweaks---CAUTION/DeBloat.md)
 - [Remove Home and Gallery from explorer](dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveHomeGallery.md)
@@ -31,7 +30,6 @@
 - [Create Restore Point](dev/tweaks/Essential-Tweaks/RestorePoint.md)
 - [Debloat Edge](dev/tweaks/Essential-Tweaks/EdgeDebloat.md)
 - [Delete Temporary Files](dev/tweaks/Essential-Tweaks/DeleteTempFiles.md)
-- [Prefer IPv4 over IPv6](dev/tweaks/Essential-Tweaks/IPv46.md)
 - [Disable Activity History](dev/tweaks/Essential-Tweaks/AH.md)
 - [Disable ConsumerFeatures](dev/tweaks/Essential-Tweaks/ConsumerFeatures.md)
 - [Disable GameDVR](dev/tweaks/Essential-Tweaks/DVR.md)
@@ -41,6 +39,7 @@
 - [Disable Powershell 7 Telemetry](dev/tweaks/Essential-Tweaks/Powershell7Tele.md)
 - [Disable Storage Sense](dev/tweaks/Essential-Tweaks/Storage.md)
 - [Disable Telemetry](dev/tweaks/Essential-Tweaks/Tele.md)
+- [Disable Teredo](dev/tweaks/Essential-Tweaks/Teredo.md)
 - [Disable Wifi-Sense](dev/tweaks/Essential-Tweaks/Wifi.md)
 - [Enable End Task With Right Click](dev/tweaks/Essential-Tweaks/EndTaskOnTaskbar.md)
 - [Run Disk Cleanup](dev/tweaks/Essential-Tweaks/DiskCleanup.md)

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/Get-TabXaml.ps1

@@ -0,0 +1,221 @@
+function Get-TabXaml {
+    <#
+        .SYNOPSIS
+            Generates XAML for a tab in the WinUtil GUI
+            This function is used to generate the XAML for the applications tab in the WinUtil GUI
+            It takes the tabname and the number of columns to display the applications in as input and returns the XAML for the tab as output
+
+        .PARAMETER tabname
+            The name of the tab to generate XAML for
+            Note: the 'tabname' parameter must equal one of the json files found in $sync.configs variable
+                  Otherwise, it'll throw an exception
+
+        .PARAMETER columncount
+            The number of columns to display the applications in, default is 0
+
+        .OUTPUTS
+            The XAML for the tab
+
+        .EXAMPLE
+            Get-TabXaml "applications" 3
+    #>
+
+
+    param(
+        [Parameter(Mandatory, position=0)]
+        [string]$tabname,
+
+        [Parameter(position=1)]
+        [ValidateRange(0,10)] # 10 panels as max number is more then enough
+        [int]$columncount = 0
+    )
+
+    # Validate tabname
+    if ($sync.configs.$tabname -eq $null) {
+        throw "Invalid parameter passed, can't find '$tabname' in '`$sync.configs' variable, please double check any calls to 'Get-TabXaml' function."
+    }
+
+    $organizedData = @{}
+    # Iterate through JSON data and organize by panel and category
+    foreach ($appName in $sync.configs.$tabname.PSObject.Properties.Name) {
+        $appInfo = $sync.configs.$tabname.$appName
+
+        # Create an object for the application
+        $appObject = [PSCustomObject]@{
+            Name = $appName
+            Category = $appInfo.Category
+            Content = $appInfo.Content
+            Choco = $appInfo.choco
+            Winget = $appInfo.winget
+            Panel = if ($columncount -gt 0 ) { "0" } else {$appInfo.panel}
+            Link = $appInfo.link
+            Description = $appInfo.description
+            # Type is (Checkbox,Toggle,Button,Combobox ) (Default is Checkbox)
+            Type = $appInfo.type
+            ComboItems = $appInfo.ComboItems
+            # Checked is the property to set startup checked status of checkbox (Default is false)
+            Checked = $appInfo.Checked
+            ButtonWidth = $appInfo.ButtonWidth
+        }
+
+        if (-not $organizedData.ContainsKey($appObject.panel)) {
+            $organizedData[$appObject.panel] = @{}
+        }
+
+        if (-not $organizedData[$appObject.panel].ContainsKey($appObject.Category)) {
+            $organizedData[$appObject.panel][$appObject.Category] = @{}
+        }
+
+        # Store application data in a sub-array under the category
+        # Add Order property to keep the original order of tweaks and features
+        $organizedData[$appObject.panel][$appInfo.Category]["$($appInfo.order)$appName"] = $appObject
+    }
+
+    # Same tab amount in last line of 'inputXML.xaml' file
+    # TODO: Get the base repeat (amount) of tabs from last line (or even lines)
+    #       so it can dynamicly react to whatever is before this generated XML string.
+    #       .. may be solve this even before calling this function, and pass the result as a parameter?
+    $tab_repeat = 7
+    $spaces_per_tab = 4 # The convenction used across the code base
+    $tab_as_spaces = $(" " * $spaces_per_tab)
+    $precal_indent = $($tab_as_spaces * $tab_repeat)
+    $precal_indent_p1 = $($tab_as_spaces * ($tab_repeat + 1))
+    $precal_indent_p2 = $($tab_as_spaces * ($tab_repeat + 2))
+    $precal_indent_m1 = $($tab_as_spaces * ($tab_repeat - 1))
+    $precal_indent_m2 = $($tab_as_spaces * ($tab_repeat - 2))
+
+    # Calculate the needed number of panels
+    $panelcount = 0
+    $paneltotal = $organizedData.Keys.Count
+    if ($columncount -gt 0) {
+        $appcount = $sync.configs.$tabname.PSObject.Properties.Name.count + $organizedData["0"].Keys.count
+        $maxcount = [Math]::Round( $appcount / $columncount + 0.5)
+        $paneltotal = $columncount
+    }
+    # add ColumnDefinitions to evenly draw colums
+    $blockXml = "<Grid.ColumnDefinitions>"
+    $blockXml += $("`r`n" + " " * ($spaces_per_tab * $tab_repeat) +
+                 "<ColumnDefinition Width=""*""/>") * $paneltotal
+    $blockXml += $("`r`n" + " " * ($spaces_per_tab * ($tab_repeat - 1))) +
+                 "</Grid.ColumnDefinitions>" + "`r`n"
+
+    # Iterate through 'organizedData' by panel, category, and application
+    $count = 0
+    foreach ($panel in ($organizedData.Keys | Sort-Object)) {
+        $blockXml += $precal_indent_m1 + "<Border Grid.Row=""1"" Grid.Column=""$panelcount"">" + "`r`n"
+        $blockXml += $precal_indent + "<StackPanel Background=""{MainBackgroundColor}"" SnapsToDevicePixels=""True"">" + "`r`n"
+        $panelcount++
+        foreach ($category in ($organizedData[$panel].Keys | Sort-Object)) {
+            $count++
+            if ($columncount -gt 0) {
+                $panelcount2 = [Int](($count)/$maxcount-0.5)
+                if ($panelcount -eq $panelcount2 ) {
+                    $blockXml += $precal_indent_p2 + "</StackPanel>" + "`r`n"
+                    $blockXml += $precal_indent_p1 + "</Border>" + "`r`n"
+                    $blockXml += $precal_indent_p1 + "<Border Grid.Row=""1"" Grid.Column=""$panelcount"">" + "`r`n"
+                    $blockXml += $precal_indent_p2 + "<StackPanel Background=""{MainBackgroundColor}"" SnapsToDevicePixels=""True"">" + "`r`n"
+                    $panelcount++
+                }
+            }
+
+            # Dot-source the Get-WPFObjectName function
+            . "$($sync.PSScriptRoot)\functions\private\Get-WPFObjectName.ps1"
+
+            $categorycontent = $($category -replace '^.__', '')
+            $categoryname = Get-WPFObjectName -type "Label" -name $categorycontent
+            $blockXml += $("`r`n" + " " * ($spaces_per_tab * $tab_repeat)) +
+                            "<Label Name=""$categoryname"" Content=""$categorycontent""" + " " +
+                            "FontSize=""{FontSizeHeading}"" FontFamily=""{HeaderFontFamily}""/>" + "`r`n" + "`r`n"
+            $sortedApps = $organizedData[$panel][$category].Keys | Sort-Object
+            foreach ($appName in $sortedApps) {
+                $count++
+
+                if ($columncount -gt 0) {
+                    $panelcount2 = [Int](($count)/$maxcount-0.5)
+                    # Verify the indentation actually works...
+                    if ($panelcount -eq $panelcount2 ) {
+                        $blockXml += $precal_indent_m1 +
+                                        "</StackPanel>" + "`r`n"
+                        $blockXml += $precal_indent_m2 +
+                                        "</Border>" + "`r`n"
+                        $blockXml += $precal_indent_m2 +
+                                        "<Border Grid.Row=""1"" Grid.Column=""$panelcount"">" + "`r`n"
+                        $blockXml += $precal_indent_m1 +
+                                        "<StackPanel Background=""{MainBackgroundColor}"" SnapsToDevicePixels=""True"">" + "`r`n"
+                        $panelcount++
+                    }
+                }
+
+                $appInfo = $organizedData[$panel][$category][$appName]
+                switch ($appInfo.Type) {
+                    "Toggle" {
+                        $blockXml += $precal_indent_m1 +
+                                        "<DockPanel LastChildFill=""True"">" + "`r`n"
+                        $blockXml += $precal_indent +
+                                        "<CheckBox Name=""$($appInfo.Name)"" Style=""{StaticResource ColorfulToggleSwitchStyle}"" Margin=""4,0""" + " " +
+                                        "HorizontalAlignment=""Right"" FontSize=""{FontSize}""/>" + "`r`n"
+                        $blockXml += $precal_indent +
+                                        "<Label Content=""$($appInfo.Content)"" ToolTip=""$($appInfo.Description)""" + " " +
+                                        "HorizontalAlignment=""Left"" FontSize=""{FontSize}""/>" + "`r`n"
+                        $blockXml += $precal_indent_m1 +
+                                        "</DockPanel>" + "`r`n"
+                    }
+
+                    "Combobox" {
+                        $blockXml += $precal_indent_m1 +
+                                        "<StackPanel Orientation=""Horizontal"" Margin=""0,5,0,0"">" + "`r`n"
+                        $blockXml += $precal_indent + "<Label Content=""$($appInfo.Content)"" HorizontalAlignment=""Left""" + " " +
+                                        "VerticalAlignment=""Center"" FontSize=""{FontSize}""/>" + "`r`n"
+                        $blockXml += $precal_indent +
+                                        "<ComboBox Name=""$($appInfo.Name)""  Height=""32"" Width=""186"" HorizontalAlignment=""Left""" + " " +
+                                        "VerticalAlignment=""Center"" Margin=""5,5"" FontSize=""{FontSize}"">" + "`r`n"
+
+                        $addfirst="IsSelected=""True"""
+                        foreach ($comboitem in ($appInfo.ComboItems -split " ")) {
+                            $blockXml += $precal_indent_p1 +
+                                            "<ComboBoxItem $addfirst Content=""$comboitem"" FontSize=""{FontSize}""/>" + "`r`n"
+                            $addfirst=""
+                        }
+
+                        $blockXml += $precal_indent_p1 + "</ComboBox>" + "`r`n"
+                        $blockXml += $precal_indent + "</StackPanel>" + "`r`n"
+                    }
+
+                    "Button" {
+                        if ($appInfo.ButtonWidth -ne $null) {
+                            $ButtonWidthStr = "Width=""$($appInfo.ButtonWidth)"""
+                        }
+                        $blockXml += $precal_indent +
+                                        "<Button Name=""$($appInfo.Name)"" Content=""$($appInfo.Content)""" + " " +
+                                        "HorizontalAlignment=""Left"" Margin=""5"" Padding=""20,5"" $($ButtonWidthStr)/>" + "`r`n"
+                    }
+
+                    # else it is a checkbox
+                    default {
+                        $checkedStatus = If ($appInfo.Checked -eq $null) {""} else {" IsChecked=""$($appInfo.Checked)"""}
+                        if ($appInfo.Link -eq $null) {
+                            $blockXml += $precal_indent +
+                                            "<CheckBox Name=""$($appInfo.Name)"" Content=""$($appInfo.Content)""$($checkedStatus) Margin=""5,0""" + " " +
+                                            "ToolTip=""$($appInfo.Description)""/>" + "`r`n"
+                        } else {
+                            $blockXml += $precal_indent +
+                                            "<StackPanel Orientation=""Horizontal"">" + "`r`n"
+                            $blockXml += $precal_indent_p1 +
+                                            "<CheckBox Name=""$($appInfo.Name)"" Content=""$($appInfo.Content)""$($checkedStatus)" + " " +
+                                            "ToolTip=""$($appInfo.Description)"" Margin=""0,0,2,0""/>" + "`r`n"
+                            $blockXml += $precal_indent_p1 +
+                                            "<TextBlock Name=""$($appInfo.Name)Link"" Style=""{StaticResource HoverTextBlockStyle}"" Text=""(?)""" + " " +
+                                            "ToolTip=""$($appInfo.Link)""/>" + "`r`n"
+                            $blockXml += $precal_indent +
+                                            "</StackPanel>" + "`r`n"
+                        }
+                    }
+                }
+            }
+        }
+
+        $blockXml += $precal_indent_p1 + "</StackPanel>" + "`r`n"
+        $blockXml += $precal_indent + "</Border>" + "`r`n"
+    }
+    return ($blockXml)
+}

functions/private/Invoke-MicroWin-Helper.ps1

@@ -25,22 +25,25 @@ function Test-CompatibleImage() {
     }
 }
 
-function Remove-Features() {
+function Remove-Features([switch]$dumpFeatures = $false, [switch]$keepDefender = $false) {
     <#
         .SYNOPSIS
             Removes certain features from ISO image
 
         .PARAMETER Name
-            No Params
+            dumpFeatures - Dumps all features found in the ISO into a file called allfeaturesdump.txt. This file can be examined and used to decide what to remove.
+            keepDefender - Should Defender be removed from the ISO?
 
         .EXAMPLE
-            Remove-Features
+            Remove-Features -keepDefender:$false
     #>
     try {
         $featlist = (Get-WindowsOptionalFeature -Path $scratchDir).FeatureName
+        if ($dumpFeatures) {
+            $featlist > allfeaturesdump.txt
+        }
 
         $featlist = $featlist | Where-Object {
-            $_ -NotLike "*Defender*" -AND
             $_ -NotLike "*Printing*" -AND
             $_ -NotLike "*TelnetClient*" -AND
             $_ -NotLike "*PowerShell*" -AND
@@ -49,6 +52,8 @@ function Remove-Features() {
             $_ -NotLike "*NFS*"
         }
 
+        if ($keepDefender) { $featlist = $featlist | Where-Object { $_ -NotLike "*Defender*" }}
+
         foreach($feature in $featlist) {
             $status = "Removing feature $feature"
             Write-Progress -Activity "Removing features" -Status $status -PercentComplete ($counter++/$featlist.Count*100)
@@ -101,9 +106,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) {
@@ -123,41 +126,32 @@ function Remove-Packages {
     }
 }
 
-function Remove-ProvisionedPackages() {
+function Remove-ProvisionedPackages([switch]$keepSecurity = $false) {
     <#
         .SYNOPSIS
         Removes AppX packages from a Windows image during MicroWin processing
 
         .PARAMETER Name
-        No Params
+        keepSecurity - Boolean that determines whether to keep "Microsoft.SecHealthUI" (Windows Security) in the Windows image
 
         .EXAMPLE
-        Remove-ProvisionedPackages
+        Remove-ProvisionedPackages -keepSecurity:$false
     #>
-    try
-    {
-        $appxProvisionedPackages = Get-AppxProvisionedPackage -Path "$($scratchDir)" | Where-Object {
-                $_.PackageName -NotLike "*AppInstaller*" -AND
-                $_.PackageName -NotLike "*Store*" -and
-                $_.PackageName -NotLike "*dism*" -and
-                $_.PackageName -NotLike "*Foundation*" -and
-                $_.PackageName -NotLike "*FodMetadata*" -and
-                $_.PackageName -NotLike "*LanguageFeatures*" -and
-                $_.PackageName -NotLike "*Notepad*" -and
-                $_.PackageName -NotLike "*Printing*" -and
-                $_.PackageName -NotLike "*Foundation*" -and
-                $_.PackageName -NotLike "*YourPhone*" -and
-                $_.PackageName -NotLike "*Xbox*" -and
-                $_.PackageName -NotLike "*WindowsTerminal*" -and
-                $_.PackageName -NotLike "*Calculator*" -and
-                $_.PackageName -NotLike "*Photos*" -and
-                $_.PackageName -NotLike "*VCLibs*" -and
-                $_.PackageName -NotLike "*Paint*" -and
-                $_.PackageName -NotLike "*Gaming*" -and
-                $_.PackageName -NotLike "*Extension*" -and
-                $_.PackageName -NotLike "*SecHealthUI*"
+    $appxProvisionedPackages = Get-AppxProvisionedPackage -Path "$($scratchDir)" | Where-Object    {
+            $_.PackageName -NotLike "*AppInstaller*" -AND
+            $_.PackageName -NotLike "*Store*" -and
+            $_.PackageName -NotLike "*dism*" -and
+            $_.PackageName -NotLike "*Foundation*" -and
+            $_.PackageName -NotLike "*FodMetadata*" -and
+            $_.PackageName -NotLike "*LanguageFeatures*" -and
+            $_.PackageName -NotLike "*Notepad*" -and
+            $_.PackageName -NotLike "*Printing*" -and
+            $_.PackageName -NotLike "*Wifi*" -and
+            $_.PackageName -NotLike "*Foundation*"
         }
 
+    if ($?) {
+    if ($keepSecurity) { $appxProvisionedPackages = $appxProvisionedPackages | Where-Object { $_.PackageName -NotLike "*SecHealthUI*" }}
         $counter = 0
         foreach ($appx in $appxProvisionedPackages) {
             $status = "Removing Provisioned $($appx.PackageName)"
@@ -170,11 +164,8 @@ 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"
+    } else {
+    Write-Host "Could not get Provisioned App information. Skipping process..."
     }
 }
 
@@ -209,6 +200,22 @@ function Remove-FileOrDirectory([string]$pathToDelete, [string]$mask = "", [swit
     $yesNo = Get-LocalizedYesNo
     Write-Host "[INFO] In Your local takeown expects '$($yesNo[0])' as a Yes answer."
 
+    # Specify the path to the directory
+    # $directoryPath = "$($scratchDir)\Windows\System32\LogFiles\WMI\RtBackup"
+    # takeown /a /r /d $yesNo[0] /f "$($directoryPath)" > $null
+    # icacls "$($directoryPath)" /q /c /t /reset > $null
+    # icacls $directoryPath /setowner "*S-1-5-32-544"
+    # icacls $directoryPath /grant "*S-1-5-32-544:(OI)(CI)F" /t /c /q
+    # Remove-Item -Path $directoryPath -Recurse -Force
+
+    # # Grant full control to BUILTIN\Administrators using icacls
+    # $directoryPath = "$($scratchDir)\Windows\System32\WebThreatDefSvc"
+    # takeown /a /r /d $yesNo[0] /f "$($directoryPath)" > $null
+    # icacls "$($directoryPath)" /q /c /t /reset > $null
+    # icacls $directoryPath /setowner "*S-1-5-32-544"
+    # icacls $directoryPath /grant "*S-1-5-32-544:(OI)(CI)F" /t /c /q
+    # Remove-Item -Path $directoryPath -Recurse -Force
+
     $itemsToDelete = [System.Collections.ArrayList]::new()
 
     if ($mask -eq "") {
@@ -247,10 +254,45 @@ function Remove-FileOrDirectory([string]$pathToDelete, [string]$mask = "", [swit
 
 function New-Unattend {
 
-    param (
-        [Parameter(Mandatory, Position = 0)] [string]$userName,
-        [Parameter(Position = 1)] [string] $userPassword
-    )
+    # later if we wont to remove even more bloat EU requires MS to remove everything from English(world)
+    # Below is an example how to do it we probably should create a drop down with common locals
+    #     <settings pass="specialize">
+    #     <!-- Specify English (World) locale -->
+    #     <component name="Microsoft-Windows-International-Core" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    #       <SetupUILanguage>
+    #     <UILanguage>en-US</UILanguage>
+    #       </SetupUILanguage>
+    #       <InputLocale>en-US</InputLocale>
+    #       <SystemLocale>en-US</SystemLocale>
+    #       <UILanguage>en-US</UILanguage>
+    #       <UserLocale>en-US</UserLocale>
+    #     </component>
+    #   </settings>
+
+    #   <settings pass="oobeSystem">
+    #     <!-- Specify English (World) locale -->
+    #     <component name="Microsoft-Windows-International-Core" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    #       <InputLocale>en-US</InputLocale>
+    #       <SystemLocale>en-US</SystemLocale>
+    #       <UILanguage>en-US</UILanguage>
+    #       <UserLocale>en-US</UserLocale>
+    #     </component>
+    #   </settings>
+    # using here string to embedd unattend
+    #     <RunSynchronousCommand wcm:action="add">
+    #     <Order>1</Order>
+    #     <Path>net user administrator /active:yes</Path>
+    # </RunSynchronousCommand>
+
+    # this section doesn't work in win10/????
+#     <settings pass="specialize">
+#     <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+#         <CEIPEnabled>0</CEIPEnabled>
+#     </component>
+#     <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+#         <ConfigureChatAutoInstall>false</ConfigureChatAutoInstall>
+#     </component>
+# </settings>
 
     $unattend = @'
     <?xml version="1.0" encoding="utf-8"?>
@@ -271,31 +313,10 @@ function New-Unattend {
         </settings>
         <settings pass="oobeSystem">
             <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-                <UserAccounts>
-                    <LocalAccounts>
-                        <LocalAccount wcm:action="add">
-                            <Name>USER-REPLACEME</Name>
-                            <Group>Administrators</Group>
-                            <Password>
-                                <Value>PW-REPLACEME</Value>
-                                <PlainText>true</PlainText>
-                            </Password>
-                        </LocalAccount>
-                    </LocalAccounts>
-                </UserAccounts>
-                <AutoLogon>
-                    <Username>USER-REPLACEME</Username>
-                    <Enabled>true</Enabled>
-                    <LogonCount>1</LogonCount>
-                    <Password>
-                        <Value>PW-REPLACEME</Value>
-                        <PlainText>true</PlainText>
-                    </Password>
-                </AutoLogon>
                 <OOBE>
-                    <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen>
-                    <SkipUserOOBE>true</SkipUserOOBE>
-                    <SkipMachineOOBE>true</SkipMachineOOBE>
+            <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen>
+            <SkipUserOOBE>false</SkipUserOOBE>
+            <SkipMachineOOBE>false</SkipMachineOOBE>
                     <HideOnlineAccountScreens>true</HideOnlineAccountScreens>
                     <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE>
                     <HideEULAPage>true</HideEULAPage>
@@ -304,18 +325,14 @@ function New-Unattend {
                 <FirstLogonCommands>
                     <SynchronousCommand wcm:action="add">
                         <Order>1</Order>
-                        <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v AutoLogonCount /t REG_DWORD /d 0 /f</CommandLine>
-                    </SynchronousCommand>
-                    <SynchronousCommand wcm:action="add">
-                        <Order>2</Order>
                         <CommandLine>cmd.exe /c echo 23&gt;c:\windows\csup.txt</CommandLine>
                     </SynchronousCommand>
                     <SynchronousCommand wcm:action="add">
-                        <Order>3</Order>
+                        <Order>2</Order>
                         <CommandLine>CMD /C echo GG&gt;C:\Windows\LogOobeSystem.txt</CommandLine>
                     </SynchronousCommand>
                     <SynchronousCommand wcm:action="add">
-                        <Order>4</Order>
+                        <Order>3</Order>
                         <CommandLine>powershell -ExecutionPolicy Bypass -File c:\windows\FirstStartup.ps1</CommandLine>
                     </SynchronousCommand>
                 </FirstLogonCommands>
@@ -326,218 +343,10 @@ function New-Unattend {
     $specPass = @'
 <settings pass="specialize">
         <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <CEIPEnabled>0</CEIPEnabled>
+        <CEIPEnabled>0</CEIPEnabled>
         </component>
         <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <ConfigureChatAutoInstall>false</ConfigureChatAutoInstall>
-        </component>
-        <component name="Microsoft-Windows-Deployment" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
-            <RunSynchronous>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>1</Order>
-                    <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\OOBE" /v BypassNRO /t REG_DWORD /d 1 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>2</Order>
-                    <Path>reg.exe load "HKU\DefaultUser" "C:\Users\Default\NTUSER.DAT"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>3</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\Runonce" /v "UninstallCopilot" /t REG_SZ /d "powershell.exe -NoProfile -Command \"Get-AppxPackage -Name 'Microsoft.Windows.Ai.Copilot.Provider' | Remove-AppxPackage;\"" /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>4</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Policies\Microsoft\Windows\WindowsCopilot" /v TurnOffWindowsCopilot /t REG_DWORD /d 1 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>5</Order>
-                    <Path>reg.exe unload "HKU\DefaultUser"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>6</Order>
-                    <Path>reg.exe delete "HKLM\SOFTWARE\Microsoft\WindowsUpdate\Orchestrator\UScheduler_Oobe\DevHomeUpdate" /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>7</Order>
-                    <Path>reg.exe load "HKU\DefaultUser" "C:\Users\Default\NTUSER.DAT"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>8</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Notepad" /v ShowStoreBanner /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>9</Order>
-                    <Path>reg.exe unload "HKU\DefaultUser"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>10</Order>
-                    <Path>cmd.exe /c "del "C:\Users\Default\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\OneDrive.lnk""</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>11</Order>
-                    <Path>cmd.exe /c "del "C:\Windows\System32\OneDriveSetup.exe""</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>12</Order>
-                    <Path>cmd.exe /c "del "C:\Windows\SysWOW64\OneDriveSetup.exe""</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>13</Order>
-                    <Path>reg.exe load "HKU\DefaultUser" "C:\Users\Default\NTUSER.DAT"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>14</Order>
-                    <Path>reg.exe delete "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\Run" /v OneDriveSetup /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>15</Order>
-                    <Path>reg.exe unload "HKU\DefaultUser"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>16</Order>
-                    <Path>reg.exe delete "HKLM\SOFTWARE\Microsoft\WindowsUpdate\Orchestrator\UScheduler_Oobe\OutlookUpdate" /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>17</Order>
-                    <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Communications" /v ConfigureChatAutoInstall /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>18</Order>
-                    <Path>powershell.exe -NoProfile -Command "$xml = [xml]::new(); $xml.Load('C:\Windows\Panther\unattend.xml'); $sb = [scriptblock]::Create( $xml.unattend.Extensions.ExtractScript ); Invoke-Command -ScriptBlock $sb -ArgumentList $xml;"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>19</Order>
-                    <Path>powershell.exe -NoProfile -Command "Get-Content -LiteralPath 'C:\Windows\Temp\remove-packages.ps1' -Raw | Invoke-Expression;"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>20</Order>
-                    <Path>powershell.exe -NoProfile -Command "Get-Content -LiteralPath 'C:\Windows\Temp\remove-caps.ps1' -Raw | Invoke-Expression;"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>21</Order>
-                    <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\current\device\Start" /v ConfigureStartPins /t REG_SZ /d "{ \"pinnedList\": [] }" /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>22</Order>
-                    <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\current\device\Start" /v ConfigureStartPins_ProviderSet /t REG_DWORD /d 1 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>23</Order>
-                    <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\current\device\Start" /v ConfigureStartPins_WinningProvider /t REG_SZ /d B5292708-1619-419B-9923-E5D9F3925E71 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>24</Order>
-                    <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\providers\B5292708-1619-419B-9923-E5D9F3925E71\default\Device\Start" /v ConfigureStartPins /t REG_SZ /d "{ \"pinnedList\": [] }" /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>25</Order>
-                    <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\providers\B5292708-1619-419B-9923-E5D9F3925E71\default\Device\Start" /v ConfigureStartPins_LastWrite /t REG_DWORD /d 1 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>26</Order>
-                    <Path>net.exe accounts /maxpwage:UNLIMITED</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>27</Order>
-                    <Path>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>28</Order>
-                    <Path>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Power" /v HiberbootEnabled /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>29</Order>
-                    <Path>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Dsh" /v AllowNewsAndInterests /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>30</Order>
-                    <Path>reg.exe load "HKU\DefaultUser" "C:\Users\Default\NTUSER.DAT"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>31</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "ContentDeliveryAllowed" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>32</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "FeatureManagementEnabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>33</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "OEMPreInstalledAppsEnabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>34</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "PreInstalledAppsEnabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>35</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "PreInstalledAppsEverEnabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>36</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SilentInstalledAppsEnabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>37</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SoftLandingEnabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>38</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContentEnabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>39</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-310093Enabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>40</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-338387Enabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>41</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-338388Enabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>42</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-338389Enabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>43</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-338393Enabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>44</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-353698Enabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>45</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SystemPaneSuggestionsEnabled" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>46</Order>
-                    <Path>reg.exe unload "HKU\DefaultUser"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>47</Order>
-                    <Path>reg.exe add "HKLM\Software\Policies\Microsoft\Windows\CloudContent" /v "DisableWindowsConsumerFeatures" /t REG_DWORD /d 0 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>48</Order>
-                    <Path>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\BitLocker" /v "PreventDeviceEncryption" /t REG_DWORD /d 1 /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>49</Order>
-                    <Path>reg.exe load "HKU\DefaultUser" "C:\Users\Default\NTUSER.DAT"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>50</Order>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\Runonce" /v "ClassicContextMenu" /t REG_SZ /d "reg.exe add \"HKCU\Software\Classes\CLSID\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}\InprocServer32\" /ve /f" /f</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>51</Order>
-                    <Path>reg.exe unload "HKU\DefaultUser"</Path>
-                </RunSynchronousCommand>
-            </RunSynchronous>
+        <ConfigureChatAutoInstall>false</ConfigureChatAutoInstall>
         </component>
     </settings>
 '@
@@ -548,11 +357,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
 }
 
@@ -662,8 +466,94 @@ function New-FirstRun {
         }
     }
 
+    function Stop-UnnecessaryServices {
+        $servicesToExclude = @(
+            "AudioSrv",
+            "AudioEndpointBuilder",
+            "BFE",
+            "BITS",
+            "BrokerInfrastructure",
+            "CDPSvc",
+            "CDPUserSvc_dc2a4",
+            "CoreMessagingRegistrar",
+            "CryptSvc",
+            "DPS",
+            "DcomLaunch",
+            "Dhcp",
+            "DispBrokerDesktopSvc",
+            "Dnscache",
+            "DoSvc",
+            "DusmSvc",
+            "EventLog",
+            "EventSystem",
+            "FontCache",
+            "LSM",
+            "LanmanServer",
+            "LanmanWorkstation",
+            "MapsBroker",
+            "MpsSvc",
+            "OneSyncSvc_dc2a4",
+            "Power",
+            "ProfSvc",
+            "RpcEptMapper",
+            "RpcSs",
+            "SCardSvr",
+            "SENS",
+            "SamSs",
+            "Schedule",
+            "SgrmBroker",
+            "ShellHWDetection",
+            "Spooler",
+            "SysMain",
+            "SystemEventsBroker",
+            "TextInputManagementService",
+            "Themes",
+            "TrkWks",
+            "UserManager",
+            "VGAuthService",
+            "VMTools",
+            "WSearch",
+            "Wcmsvc",
+            "WinDefend",
+            "Winmgmt",
+            "WlanSvc",
+            "WpnService",
+            "WpnUserService_dc2a4",
+            "cbdhsvc_dc2a4",
+            "edgeupdate",
+            "gpsvc",
+            "iphlpsvc",
+            "mpssvc",
+            "nsi",
+            "sppsvc",
+            "tiledatamodelsvc",
+            "vm3dservice",
+            "webthreatdefusersvc_dc2a4",
+            "wscsvc"
+)
+
+        $runningServices = Get-Service | Where-Object { $servicesToExclude -notcontains $_.Name }
+        foreach($service in $runningServices) {
+        Stop-Service -Name $service.Name -PassThru
+            Set-Service $service.Name -StartupType Manual
+            "Stopping service $($service.Name)" | Out-File -FilePath c:\windows\LogFirstRun.txt -Append -NoClobber
+        }
+    }
+
     "FirstStartup has worked" | Out-File -FilePath c:\windows\LogFirstRun.txt -Append -NoClobber
 
+    $Theme = "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize"
+    Set-ItemProperty -Path $Theme -Name AppsUseLightTheme -Value 1
+    Set-ItemProperty -Path $Theme -Name SystemUsesLightTheme -Value 1
+
+    # figure this out later how to set updates to security only
+    #Import-Module -Name PSWindowsUpdate;
+    #Stop-Service -Name wuauserv
+    #Set-WUSettings -MicrosoftUpdateEnabled -AutoUpdateOption 'Never'
+    #Start-Service -Name wuauserv
+
+    Stop-UnnecessaryServices
+
     $taskbarPath = "$env:AppData\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar"
     # Delete all files on the Taskbar
     Get-ChildItem -Path $taskbarPath -File | Remove-Item -Force
@@ -671,6 +561,14 @@ function New-FirstRun {
     Remove-RegistryValue -RegistryPath "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Taskband" -ValueName "FavoritesChanges"
     Remove-RegistryValue -RegistryPath "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Taskband" -ValueName "Favorites"
 
+    # Stop-Process -Name explorer -Force
+
+    $process = Get-Process -Name "explorer"
+    Stop-Process -InputObject $process
+    # Wait for the process to exit
+    Wait-Process -InputObject $process
+    Start-Sleep -Seconds 3
+
     # Delete Edge Icon from the desktop
     $edgeShortcutFiles = Get-ChildItem -Path $desktopPath -Filter "*Edge*.lnk"
     # Check if Edge shortcuts exist on the desktop

functions/private/Invoke-WinUtilGPU.ps1

@@ -7,9 +7,7 @@ function Invoke-WinUtilGPU {
         "*NVIDIA GeForce*Laptop*",
         "*NVIDIA GeForce*GT*",
         "*AMD Radeon(TM)*",
-        "*Intel(R) HD Graphics*",
         "*UHD*"
-
     )
 
     foreach ($gpu in $gpuInfo) {
@@ -20,4 +18,4 @@ function Invoke-WinUtilGPU {
         }
     }
     return $true
-}
+}

functions/private/Invoke-WinUtilSnapFlyout.ps1

@@ -14,7 +14,7 @@ function Invoke-WinUtilSnapFlyout {
             Write-Host "Disabling Snap Assist Flyout On startup"
             $value = 0
         }
-
+        # taskkill.exe /F /IM "explorer.exe"
         $Path = "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced"
         taskkill.exe /F /IM "explorer.exe"
         Set-ItemProperty -Path $Path -Name EnableSnapAssistFlyout -Value $value

functions/private/Set-WinUtilUITheme.ps1

@@ -1,83 +0,0 @@
-function Set-WinUtilUITheme {
-    <#
-        .SYNOPSIS
-            Sets the theme of the XAML file
-
-        .PARAMETER inputXML
-            A string representing the XAML object to modify
-
-        .PARAMETER customThemeName
-            The name of the custom theme to set the XAML to. Defaults to 'matrix'
-
-        .PARAMETER defaultThemeName
-            The name of the default theme to use when setting the XAML. Defaults to '_default'
-
-        .EXAMPLE
-            $returnVal = Set-WinUtilUITheme -inputXAML $inputXAML
-            if ($returnVal[0] -eq "") {
-                Write-Host "Failed to process inputXML"
-            } else {
-                $inputXML = $returnVal[0]
-            }
-            # to know which theme this function has used, access the second item in returned value.
-            Write-Host "Theme used in processing: $($returnVal[1])"
-    #>
-
-    param (
-        [Parameter(Mandatory, position=0)]
-        [string]$inputXML,
-
-        [Parameter(position=1)]
-        [string]$customThemeName = 'matrix',
-
-        [Parameter(position=2)]
-        [string]$defaultThemeName = '_default'
-    )
-
-    try {
-        # Note:
-        #    Reason behind not caching the '$sync.configs.themes` object into a variable,
-        #    because this code can modify the themes object.. meaning it's better to access it
-        #    using the more verbose way, rather than introduce possible bugs into the code, just for the sake of readability.
-        #
-        if (-NOT $sync.configs.themes) {
-            throw [GenericException]::new("[Set-WinUtilTheme] Did not find 'config.themes' inside `$sync variable.")
-        }
-
-        if (-NOT $sync.configs.themes.$defaultThemeName) {
-            throw [GenericException]::new("[Set-WinUtilTheme] Did not find '$defaultThemeName' theme in the themes config file.")
-        }
-
-        $themeToUse = $customThemeName
-        if ($sync.configs.themes.$themeToUse) {
-            # Loop through every default theme option, and modify the custom theme in $sync variable,
-            # so that it has full options available for other functions to use.
-            foreach ($option in $sync.configs.themes.$defaultThemeName.PSObject.Properties) {
-                $optionName = $option.Name
-                $optionValue = $option.Value
-                if (-NOT $sync.configs.themes.$themeToUse.$optionName) {
-                    $sync.configs.themes.$themeToUse | Add-Member -MemberType NoteProperty -Name $optionName -Value $optionValue
-                }
-            }
-        } else {
-            Write-Debug "[Set-WinUtilTheme] Theme '$customThemeName' was not found, using '$defaultThemeName' instead."
-            $themeToUse = $defaultThemeName
-        }
-
-        foreach ($property in $sync.configs.themes.$themeToUse.PSObject.Properties) {
-            $key = $property.Name
-            $value = $property.Value
-            # Add curly braces around the key
-            $formattedKey = "{$key}"
-            # Replace the key with the value in the input XML
-            $inputXML = $inputXML.Replace($formattedKey, $value)
-        }
-    }
-    catch {
-        Write-Host "[Set-WinUtilTheme] Unable to apply theme" -ForegroundColor Red
-        Write-Host "$($psitem.Exception.Message)" -ForegroundColor Red
-        $inputXML = "" # Make inputXML equal an empty string, indicating something went wrong to the function caller.
-    }
-
-    return @($inputXML, $themeToUse);
-}

functions/private/Set-WinUtilUiTheme.ps1

@@ -0,0 +1,50 @@
+function Set-WinUtilUITheme {
+    <#
+        .SYNOPSIS
+            Sets the theme of the XAML file
+
+        .PARAMETER inputXML
+            A string representing the XAML object to modify
+
+        .PARAMETER themeName
+            The name of the theme to set the XAML to. Defaults to 'matrix'
+
+        .EXAMPLE
+            Set-WinUtilUITheme -inputXAML $inputXAML
+    #>
+
+    param
+    (
+         [Parameter(Mandatory, position=0)]
+         [string]$inputXML,
+         [Parameter(position=1)]
+         [string]$themeName = 'matrix'
+    )
+
+    try {
+        # Convert the JSON to a PowerShell object
+        $themes = $sync.configs.themes
+        # Select the specified theme
+        $selectedTheme = $themes.$themeName
+
+        if ($selectedTheme) {
+            # Loop through all key-value pairs in the selected theme
+            foreach ($property in $selectedTheme.PSObject.Properties) {
+                $key = $property.Name
+                $value = $property.Value
+                # Add curly braces around the key
+                $formattedKey = "{$key}"
+                # Replace the key with the value in the input XML
+                $inputXML = $inputXML.Replace($formattedKey, $value)
+            }
+        } else {
+            Write-Host "Theme '$themeName' not found."
+        }
+
+    } catch {
+        Write-Warning "Unable to apply theme"
+        Write-Warning $psitem.Exception.StackTrace
+    }
+
+    return $inputXML;
+}

functions/private/Uninstall-WinUtilEdgeBrowser.ps1

@@ -6,12 +6,6 @@ Function Uninstall-WinUtilEdgeBrowser {
         This will switch up the region to one of the EEA countries temporarily and uninstall the Edge Browser (Chromium).
     #>
 
-    param (
-        [Parameter(Mandatory = $true)]
-        [ValidateSet("install", "uninstall")]
-        [string]$action
-    )
-
     function Uninstall-EdgeClient {
         param (
             [Parameter(Mandatory = $true)]
@@ -71,16 +65,6 @@ Function Uninstall-WinUtilEdgeBrowser {
         [microsoft.win32.registry]::SetValue("HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\EdgeUpdateDev", "AllowUninstall", 1, [Microsoft.Win32.RegistryValueKind]::DWord) | Out-Null
 
         Uninstall-EdgeClient -Key '{56EB18F8-B008-4CBD-B6D2-8C97FE7E9062}'
-
-        Remove-Item -Path "Computer\\HKEY_CLASSES_ROOT\\MSEdgePDF" -ErrorAction SilentlyContinue | Out-Null
-        Remove-Item -Path "Computer\\HKEY_CLASSES_ROOT\\MSEdgeHTM" -ErrorAction SilentlyContinue | Out-Null
-        Remove-Item -Path "Computer\\HKEY_CLASSES_ROOT\\MSEdgeMHT" -ErrorAction SilentlyContinue | Out-Null
-
-        # Remove Edge Polocy reg keys
-        Remove-Item -Path "HKLM:\SOFTWARE\Policies\Microsoft\Edge" -Recurse -ErrorAction SilentlyContinue | Out-Null
-
-        # Remove Edge reg keys
-        Remove-Item -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Edge" -Recurse -ErrorAction SilentlyContinue | Out-Null
     }
 
     function Uninstall-WebView {
@@ -109,30 +93,9 @@ Function Uninstall-WinUtilEdgeBrowser {
         }
 
         Start-Process cmd.exe "/c $uninstallCmdLine" -WindowStyle Hidden -Wait
-
-        # Remove EdgeUpdate reg keys
-        Remove-Item -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate" -Recurse -ErrorAction SilentlyContinue | Out-Null
     }
 
-    function Install-Edge {
-        $tempEdgePath = "$env:TEMP\MicrosoftEdgeSetup.exe"
-
-        try {
-            write-host "Installing Edge ..."
-            Invoke-WebRequest -Uri "https://go.microsoft.com/fwlink/?linkid=2109047&Channel=Stable&language=en&consent=1" -OutFile $tempEdgePath
-            Start-Process -FilePath $tempEdgePath -ArgumentList "/silent /install" -Wait
-            Remove-item $tempEdgePath
-            write-host "Edge Installed Successfully"
-        } catch {
-            write-host "Failed to install Edge"
-        }
-    }
-
-    if ($action -eq "Install") {
-        Install-Edge
-    } elseif ($action -eq "Uninstall") {
-        Uninstall-Edge
-        Uninstall-EdgeUpdate
-        # Uninstall-WebView - WebView is needed for Visual Studio and some MS Store Games like Forza
-    }
+    Uninstall-Edge
+    # Uninstall-WebView - WebView is needed for Visual Studio and some MS Store Games like Forza
+    Uninstall-EdgeUpdate
 }

functions/private/Update-WinUtilProgramWinget.ps1

@@ -11,7 +11,7 @@ Function Update-WinUtilProgramWinget {
 
         $host.ui.RawUI.WindowTitle = """Winget Install"""
 
-        Start-Transcript "$logdir\winget-update_$dateTime.log" -Append
+        Start-Transcript $ENV:TEMP\winget-update.log -Append
         winget upgrade --all --accept-source-agreements --accept-package-agreements --scope=machine --silent
 
     }

functions/public/Invoke-WPFButton.ps1

@@ -21,13 +21,13 @@ function Invoke-WPFButton {
     Switch -Wildcard ($Button) {
 
         "WPFTab?BT" {Invoke-WPFTab $Button}
-        "WPFInstall" {Invoke-WPFInstall}
-        "WPFUninstall" {Invoke-WPFUnInstall}
+        "WPFinstall" {Invoke-WPFInstall}
+        "WPFuninstall" {Invoke-WPFUnInstall}
         "WPFInstallUpgrade" {Invoke-WPFInstallUpgrade}
-        "WPFStandard" {Invoke-WPFPresets "Standard" -checkboxfilterpattern "WPFTweak*"}
-        "WPFMinimal" {Invoke-WPFPresets "Minimal" -checkboxfilterpattern "WPFTweak*"}
-        "WPFClearTweaksSelection" {Invoke-WPFPresets -imported $true -checkboxfilterpattern "WPFTweak*"}
-        "WPFClearInstallSelection" {Invoke-WPFPresets -imported $true -checkboxfilterpattern "WPFInstall*"}
+        "WPFstandard" {Invoke-WPFPresets "Standard"}
+        "WPFminimal" {Invoke-WPFPresets "Minimal"}
+        "WPFclear" {Invoke-WPFPresets -preset $null -imported $true}
+        "WPFclearWinget" {Invoke-WPFPresets -preset $null -imported $true -CheckBox "WPFInstall"}
         "WPFtweaksbutton" {Invoke-WPFtweaksbutton}
         "WPFOOSUbutton" {Invoke-WPFOOSU}
         "WPFAddUltPerf" {Invoke-WPFUltimatePerformance -State "Enable"}

functions/public/Invoke-WPFMicrowin.ps1

@@ -151,16 +151,40 @@ public class PowerManagement {
         }
 
         Write-Host "Remove Features from the image"
-        Remove-Features
+        Remove-Features -keepDefender:$keepDefender
         Write-Host "Removing features complete!"
-        Write-Host "Removing OS packages"
-        Remove-Packages
-        Write-Host "Removing Appx Bloat"
-        Remove-ProvisionedPackages
 
+        if (!$keepPackages) {
+            Write-Host "Removing OS packages"
+            Remove-Packages
+        }
+        if (!$keepProvisionedPackages) {
+            Write-Host "Removing Appx Bloat"
+            Remove-ProvisionedPackages -keepSecurity:$keepDefender
+        }
+
+        # special code, for some reason when you try to delete some inbox apps
+        # we have to get and delete log files directory.
         Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\LogFiles\WMI\RtBackup" -Directory
+        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\WebThreatDefSvc" -Directory
+
+        # Defender is hidden in 2 places we removed a feature above now need to remove it from the disk
+        if (!$keepDefender) {
+            Write-Host "Removing Defender"
+            Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Windows Defender" -Directory
+            Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Windows Defender"
+        }
+        # if (!$keepEdge) {
+        #     # this is destructive and might result in touching SystemApps is not recommended unless you going complete rogue on trimming edge and telemetry
+        #     Write-Host "Removing Edge"
+        #     Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Microsoft" -mask "*edge*" -Directory
+        #     Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Microsoft" -mask "*edge*" -Directory
+        #     Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\SystemApps" -mask "*edge*" -Directory
+        # }
+
         Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\DiagTrack" -Directory
         Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\InboxApps" -Directory
+        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\SecurityHealthSystray.exe"
         Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\LocationNotificationWindows.exe"
         Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Windows Photo Viewer" -Directory
         Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Windows Photo Viewer" -Directory
@@ -173,27 +197,14 @@ public class PowerManagement {
         Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\GameBarPresenceWriter"
         Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\OneDriveSetup.exe"
         Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\OneDrive.ico"
+        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\SystemApps" -mask "*Windows.Search*" -Directory
         Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\SystemApps" -mask "*narratorquickstart*" -Directory
+        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\SystemApps" -mask "*Xbox*" -Directory
         Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\SystemApps" -mask "*ParentalControls*" -Directory
         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"
@@ -215,6 +226,28 @@ public class PowerManagement {
         New-Item -ItemType Directory -Force -Path "$desktopDir"
         dism /English /image:$($scratchDir) /set-profilepath:"$($scratchDir)\Windows\Users\Default"
 
+        # $command = "powershell.exe -NoProfile -ExecutionPolicy Bypass -Command 'irm https://christitus.com/win | iex'"
+        # $shortcutPath = "$desktopDir\WinUtil.lnk"
+        # $shell = New-Object -ComObject WScript.Shell
+        # $shortcut = $shell.CreateShortcut($shortcutPath)
+
+        # if (Test-Path -Path "$env:TEMP\cttlogo.png")
+        # {
+        #     $pngPath = "$env:TEMP\cttlogo.png"
+        #     $icoPath = "$env:TEMP\cttlogo.ico"
+        #     ConvertTo-Icon -bitmapPath $pngPath -iconPath $icoPath
+        #     Write-Host "ICO file created at: $icoPath"
+        #     Copy-Item "$env:TEMP\cttlogo.png" "$($scratchDir)\Windows\cttlogo.png" -force
+        #     Copy-Item "$env:TEMP\cttlogo.ico" "$($scratchDir)\Windows\cttlogo.ico" -force
+        #     $shortcut.IconLocation = "c:\Windows\cttlogo.ico"
+        # }
+
+        # $shortcut.TargetPath = "powershell.exe"
+        # $shortcut.Arguments = "-NoProfile -ExecutionPolicy Bypass -Command `"$command`""
+        # $shortcut.Save()
+        # Write-Host "Shortcut to winutil created at: $shortcutPath"
+        # *************************** Automation black ***************************
+
         Write-Host "Copy checkinstall.cmd into the ISO"
         New-CheckInstall
         Copy-Item "$env:temp\checkinstall.cmd" "$($scratchDir)\Windows\checkinstall.cmd" -force
@@ -250,6 +283,59 @@ 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
 
+        if (!$keepEdge) {
+            # Undo changes made by -> Dism Add-Edge Edge.wim (Trust Me: this is the non-destructive way to unintegrate Edge)
+
+            Write-Host "Removing Edge"
+
+            # Microsoft Edge
+            reg delete "HKLM\zSOFTWARE\Microsoft\Active Setup\Installed Components\{9459C573-B17A-45AE-9F64-1857B5D58CEE}" /f | Out-Null
+
+            reg delete "HKLM\zSOFTWARE\Wow6432Node\Microsoft\EdgeUpdate\Clients\{56EB18F8-B008-4CBD-B6D2-8C97FE7E9062}" /f | Out-Null
+            reg delete "HKLM\zSOFTWARE\Wow6432Node\Microsoft\EdgeUpdate\ClientState\{56EB18F8-B008-4CBD-B6D2-8C97FE7E9062}" /f | Out-Null
+
+            reg delete "HKLM\zSOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge" /f | Out-Null
+
+            if (Test-Path "$scratchDir\Program Files (x86)\Microsoft\Edge" -Type Container) {
+                Remove-Item "$scratchDir\Program Files (x86)\Microsoft\Edge" -Recurse -Force | Out-Null
+            }
+
+            # Extra
+            reg delete "HKLM\zSOFTWARE\Microsoft\MicrosoftEdge" /f | Out-Null
+
+            # Microsoft EdgeWebView
+            reg delete "HKLM\zSOFTWARE\Wow6432Node\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" /f | Out-Null
+            reg delete "HKLM\zSOFTWARE\Wow6432Node\Microsoft\EdgeUpdate\ClientState\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" /f | Out-Null
+
+            reg delete "HKLM\zSOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft EdgeWebView" /f | Out-Null
+
+            if (Test-Path "$scratchDir\Program Files (x86)\Microsoft\EdgeWebView" -Type Container) {
+                Remove-Item "$scratchDir\Program Files (x86)\Microsoft\EdgeWebView" -Recurse -Force | Out-Null
+            }
+
+            # Edge Core
+            if (Test-Path "$scratchDir\Program Files (x86)\Microsoft\EdgeCore" -Type Container) {
+                Remove-Item "$scratchDir\Program Files (x86)\Microsoft\EdgeCore" -Recurse -Force | Out-Null
+            }
+
+            # Microsoft Edge Update
+            reg delete "HKLM\zSOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\MicrosoftEdgeUpdate.exe" /f | Out-Null
+
+            reg delete "HKLM\zSOFTWARE\Wow6432Node\Microsoft\EdgeUpdate" /f | Out-Null
+            reg delete "HKLM\zSOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge Update" /f | Out-Null
+
+            # Microsoft Edge Update :: Services
+            reg delete "HKLM\zSYSTEM\ControlSet001\Services\edgeupdate" /f | Out-Null
+            reg delete "HKLM\zSYSTEM\ControlSet001\Services\edgeupdatem" /f | Out-Null
+
+            if (Test-Path "$scratchDir\Program Files (x86)\Microsoft\EdgeUpdate" -Type Container) {
+                Remove-Item "$scratchDir\Program Files (x86)\Microsoft\EdgeUpdate" -Recurse -Force | Out-Null
+            }
+
+            # Prevent EdgeChromium from Installing in the future
+            reg add "HKLM\zSOFTWARE\Microsoft\EdgeUpdate" /v "DoNotUpdateToEdgeWithChromium" /t REG_DWORD /d "1" /f | Out-Null
+        }
+
         # Prevent Windows Update Installing so called Expedited Apps
         @(
             'EdgeUpdate',
@@ -261,7 +347,7 @@ public class PowerManagement {
 
             # Copied here After Installation (Online)
             # reg delete "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Orchestrator\UScheduler\$_" /f | Out-Null
-
+            
             # When in Offline Image
             reg delete "HKLM\zSOFTWARE\Microsoft\WindowsUpdate\Orchestrator\UScheduler_Oobe\$_" /f | Out-Null
         }

functions/public/Invoke-WPFPresets.ps1

@@ -10,36 +10,29 @@ function Invoke-WPFPresets {
     .PARAMETER imported
         If the preset is imported from a file, defaults to false
 
-    .PARAMETER checkboxfilterpattern
-        The Pattern to use when filtering through CheckBoxes, defaults to "**"
+    .PARAMETER checkbox
+        The checkbox to set the options to, defaults to 'WPFTweaks'
 
     #>
 
-    param (
-        [Parameter(position=0)]
-        [string]$preset = "",
-
-        [Parameter(position=1)]
-        [bool]$imported = $false,
-
-        [Parameter(position=2)]
-        [string]$checkboxfilterpattern = "**"
+    param(
+        $preset,
+        [bool]$imported = $false
     )
 
-    if ($imported -eq $true) {
+    if($imported -eq $true) {
         $CheckBoxesToCheck = $preset
     } else {
         $CheckBoxesToCheck = $sync.configs.preset.$preset
     }
 
-    $CheckBoxes = ($sync.GetEnumerator()).where{ $_.Value -is [System.Windows.Controls.CheckBox] -and $_.Name -notlike "WPFToggle*" -and $_.Name -like "$checkboxfilterpattern"}
-    Write-Debug "Getting checkboxes to set, number of checkboxes: $($CheckBoxes.Count)"
+    $CheckBoxes = $sync.GetEnumerator() | Where-Object { $_.Value -is [System.Windows.Controls.CheckBox] -and $_.Name -notlike "WPFToggle*" }
+    Write-Debug "Getting checkboxes to set $($CheckBoxes.Count)"
 
-    if ($CheckBoxesToCheck -ne "") {
-        $debugMsg = "CheckBoxes to Check are: "
-        $CheckBoxesToCheck | ForEach-Object { $debugMsg += "$_, " }
-        $debugMsg = $debugMsg -replace (',\s*$', '')
-        Write-Debug "$debugMsg"
+    $CheckBoxesToCheck | ForEach-Object {
+        if ($_ -ne $null) {
+            Write-Debug $_
+        }
     }
 
     foreach ($CheckBox in $CheckBoxes) {

functions/public/Invoke-WPFToggle.ps1

@@ -15,25 +15,23 @@ function Invoke-WPFToggle {
     # Use this to get the name of the button
     #[System.Windows.MessageBox]::Show("$Button","Chris Titus Tech's Windows Utility","OK","Info")
 
-    $ToggleStatus = (Get-WinUtilToggleStatus $Button)
-
     Switch -Wildcard ($Button) {
 
-        "WPFToggleDarkMode" {Invoke-WinUtilDarkMode $ToggleStatus}
-        "WPFToggleBingSearch" {Invoke-WinUtilBingSearch $ToggleStatus}
-        "WPFToggleNumLock" {Invoke-WinUtilNumLock $ToggleStatus}
-        "WPFToggleVerboseLogon" {Invoke-WinUtilVerboseLogon $ToggleStatus}
-        "WPFToggleShowExt" {Invoke-WinUtilShowExt $ToggleStatus}
-        "WPFToggleSnapWindow" {Invoke-WinUtilSnapWindow $ToggleStatus}
-        "WPFToggleSnapFlyout" {Invoke-WinUtilSnapFlyout $ToggleStatus}
-        "WPFToggleSnapSuggestion" {Invoke-WinUtilSnapSuggestion $ToggleStatus}
-        "WPFToggleMouseAcceleration" {Invoke-WinUtilMouseAcceleration $ToggleStatus}
-        "WPFToggleStickyKeys" {Invoke-WinUtilStickyKeys $ToggleStatus}
-        "WPFToggleTaskbarWidgets" {Invoke-WinUtilTaskbarWidgets $ToggleStatus}
-        "WPFToggleTaskbarSearch" {Invoke-WinUtilTaskbarSearch $ToggleStatus}
-        "WPFToggleTaskView" {Invoke-WinUtilTaskView $ToggleStatus}
-        "WPFToggleHiddenFiles" {Invoke-WinUtilHiddenFiles $ToggleStatus}
-        "WPFToggleTaskbarAlignment" {Invoke-WinUtilTaskbarAlignment $ToggleStatus}
-        "WPFToggleDetailedBSoD" {Invoke-WinUtilDetailedBSoD $ToggleStatus}
+        "WPFToggleDarkMode" {Invoke-WinUtilDarkMode -DarkMoveEnabled $(Get-WinUtilToggleStatus WPFToggleDarkMode)}
+        "WPFToggleBingSearch" {Invoke-WinUtilBingSearch $(Get-WinUtilToggleStatus WPFToggleBingSearch)}
+        "WPFToggleNumLock" {Invoke-WinUtilNumLock $(Get-WinUtilToggleStatus WPFToggleNumLock)}
+        "WPFToggleVerboseLogon" {Invoke-WinUtilVerboseLogon $(Get-WinUtilToggleStatus WPFToggleVerboseLogon)}
+        "WPFToggleShowExt" {Invoke-WinUtilShowExt $(Get-WinUtilToggleStatus WPFToggleShowExt)}
+        "WPFToggleSnapWindow" {Invoke-WinUtilSnapWindow $(Get-WinUtilToggleStatus WPFToggleSnapWindow)}
+        "WPFToggleSnapFlyout" {Invoke-WinUtilSnapFlyout $(Get-WinUtilToggleStatus WPFToggleSnapFlyout)}
+        "WPFToggleSnapSuggestion" {Invoke-WinUtilSnapSuggestion $(Get-WinUtilToggleStatus WPFToggleSnapSuggestion)}
+        "WPFToggleMouseAcceleration" {Invoke-WinUtilMouseAcceleration $(Get-WinUtilToggleStatus WPFToggleMouseAcceleration)}
+        "WPFToggleStickyKeys" {Invoke-WinUtilStickyKeys $(Get-WinUtilToggleStatus WPFToggleStickyKeys)}
+        "WPFToggleTaskbarWidgets" {Invoke-WinUtilTaskbarWidgets $(Get-WinUtilToggleStatus WPFToggleTaskbarWidgets)}
+        "WPFToggleTaskbarSearch" {Invoke-WinUtilTaskbarSearch $(Get-WinUtilToggleStatus WPFToggleTaskbarSearch)}
+        "WPFToggleTaskView" {Invoke-WinUtilTaskView $(Get-WinUtilToggleStatus WPFToggleTaskView)}
+        "WPFToggleHiddenFiles" {Invoke-WinUtilHiddenFiles $(Get-WinUtilToggleStatus WPFToggleHiddenFiles)}
+        "WPFToggleTaskbarAlignment" {Invoke-WinUtilTaskbarAlignment $(Get-WinUtilToggleStatus WPFToggleTaskbarAlignment)}
+        "WPFToggleDetailedBSoD" {Invoke-WinUtilDetailedBSoD $(Get-WinUtilToggleStatus WPFToggleDetailedBSoD)}
     }
 }

functions/public/Invoke-WPFUIElements.ps1

@@ -1,326 +0,0 @@
-function Invoke-WPFUIElements {
-    <#
-    .SYNOPSIS
-        Adds UI elements to a specified Grid in the WinUtil GUI based on a JSON configuration.
-    .PARAMETER configVariable
-        The variable/link containing the JSON configuration.
-    .PARAMETER targetGridName
-        The name of the grid to which the UI elements should be added.
-    .PARAMETER columncount
-        The number of columns to be used in the Grid. If not provided, a default value is used based on the panel.
-    .EXAMPLE
-        Invoke-WPFUIElements -configVariable $sync.configs.applications -targetGridName "install" -columncount 5
-    .NOTES
-        Future me/contributer: If possible please wrap this into a runspace to make it load all panels at the same time.
-    #>
-
-    param(
-        [Parameter(Mandatory, position=0)]
-        [PSCustomObject]$configVariable,
-
-        [Parameter(Mandatory, position=1)]
-        [string]$targetGridName,
-
-        [Parameter(Mandatory, position=2)]
-        [int]$columncount
-    )
-
-    $window = $sync["Form"]
-
-    $theme = $sync.configs.themes.$ctttheme
-    $borderstyle = $window.FindResource("BorderStyle")
-    $HoverTextBlockStyle = $window.FindResource("HoverTextBlockStyle")
-    $ColorfulToggleSwitchStyle = $window.FindResource("ColorfulToggleSwitchStyle")
-
-    if (!$borderstyle -or !$HoverTextBlockStyle -or !$ColorfulToggleSwitchStyle) {
-        throw "Failed to retrieve Styles using 'FindResource' from main window element."
-    }
-
-    $targetGrid = $window.FindName($targetGridName)
-
-    if (!$targetGrid) {
-        throw "Failed to retrieve Target Grid by name, provided name: $targetGrid"
-    }
-
-    # Clear existing ColumnDefinitions and Children
-    $targetGrid.ColumnDefinitions.Clear() | Out-Null
-    $targetGrid.Children.Clear() | Out-Null
-
-    # Add ColumnDefinitions to the target Grid
-    for ($i = 0; $i -lt $columncount; $i++) {
-        $colDef = New-Object Windows.Controls.ColumnDefinition
-        $colDef.Width = New-Object Windows.GridLength(1, [Windows.GridUnitType]::Star)
-        $targetGrid.ColumnDefinitions.Add($colDef) | Out-Null
-    }
-
-    # Convert PSCustomObject to Hashtable
-    $configHashtable = @{}
-    $configVariable.PSObject.Properties.Name | ForEach-Object {
-        $configHashtable[$_] = $configVariable.$_
-    }
-
-    $organizedData = @{}
-    # Iterate through JSON data and organize by panel and category
-    foreach ($entry in $configHashtable.Keys) {
-        $entryInfo = $configHashtable[$entry]
-
-        # Create an object for the application
-        $entryObject = [PSCustomObject]@{
-            Name = $entry
-            Order = $entryInfo.order
-            Category = $entryInfo.Category
-            Content = $entryInfo.Content
-            Choco = $entryInfo.choco
-            Winget = $entryInfo.winget
-            Panel = if ($entryInfo.Panel) { $entryInfo.Panel } else { "0" }
-            Link = $entryInfo.link
-            Description = $entryInfo.description
-            Type = $entryInfo.type
-            ComboItems = $entryInfo.ComboItems
-            Checked = $entryInfo.Checked
-            ButtonWidth = $entryInfo.ButtonWidth
-        }
-
-        if (-not $organizedData.ContainsKey($entryObject.Panel)) {
-            $organizedData[$entryObject.Panel] = @{}
-        }
-
-        if (-not $organizedData[$entryObject.Panel].ContainsKey($entryObject.Category)) {
-            $organizedData[$entryObject.Panel][$entryObject.Category] = @()
-        }
-
-        # Store application data in an array under the category
-        $organizedData[$entryObject.Panel][$entryObject.Category] += $entryObject
-
-        # Only apply the logic for distributing entries across columns if the targetGridName is "appspanel"
-        if ($targetGridName -eq "appspanel") {
-            $panelcount = 0
-            $entrycount = $configHashtable.Keys.Count + $organizedData["0"].Keys.Count
-            $maxcount = [Math]::Round($entrycount / $columncount + 0.5)
-        }
-    }
-
-    # Iterate through 'organizedData' by panel, category, and application
-    $count = 0
-    foreach ($panelKey in ($organizedData.Keys | Sort-Object)) {
-        # Create a Border for each column
-        $border = New-Object Windows.Controls.Border
-        $border.VerticalAlignment = "Stretch" # Ensure the border stretches vertically
-        [System.Windows.Controls.Grid]::SetColumn($border, $panelcount)
-        $border.style = $borderstyle
-        $targetGrid.Children.Add($border) | Out-Null
-
-        # Create a StackPanel inside the Border
-        $stackPanel = New-Object Windows.Controls.StackPanel
-        $stackPanel.Background = [Windows.Media.Brushes]::Transparent
-        $stackPanel.SnapsToDevicePixels = $true
-        $stackPanel.VerticalAlignment = "Stretch" # Ensure the stack panel stretches vertically
-        $border.Child = $stackPanel
-        $panelcount++
-
-        foreach ($category in ($organizedData[$panelKey].Keys | Sort-Object)) {
-            $count++
-            if ($targetGridName -eq "appspanel" -and $columncount -gt 0) {
-                $panelcount2 = [Int](($count) / $maxcount - 0.5)
-                if ($panelcount -eq $panelcount2) {
-                    # Create a new Border for the new column
-                    $border = New-Object Windows.Controls.Border
-                    $border.VerticalAlignment = "Stretch" # Ensure the border stretches vertically
-                    [System.Windows.Controls.Grid]::SetColumn($border, $panelcount)
-                    $border.style = $borderstyle
-                    $targetGrid.Children.Add($border) | Out-Null
-
-                    # Create a new StackPanel inside the Border
-                    $stackPanel = New-Object Windows.Controls.StackPanel
-                    $stackPanel.Background = [Windows.Media.Brushes]::Transparent
-                    $stackPanel.SnapsToDevicePixels = $true
-                    $stackPanel.VerticalAlignment = "Stretch" # Ensure the stack panel stretches vertically
-                    $border.Child = $stackPanel
-                    $panelcount++
-                }
-            }
-
-            $label = New-Object Windows.Controls.Label
-            $label.Content = $category -replace ".*__", ""
-            $label.FontSize = $theme.FontSizeHeading
-            $label.FontFamily = $theme.HeaderFontFamily
-            $stackPanel.Children.Add($label) | Out-Null
-
-            $sync[$category] = $label
-
-            # Sort entries by Order and then by Name, but only display Name
-            $entries = $organizedData[$panelKey][$category] | Sort-Object Order, Name
-            foreach ($entryInfo in $entries) {
-                $count++
-                if ($targetGridName -eq "appspanel" -and $columncount -gt 0) {
-                    $panelcount2 = [Int](($count) / $maxcount - 0.5)
-                    if ($panelcount -eq $panelcount2) {
-                        # Create a new Border for the new column
-                        $border = New-Object Windows.Controls.Border
-                        $border.VerticalAlignment = "Stretch" # Ensure the border stretches vertically
-                        [System.Windows.Controls.Grid]::SetColumn($border, $panelcount)
-                        $border.style = $borderstyle
-                        $targetGrid.Children.Add($border) | Out-Null
-
-                        # Create a new StackPanel inside the Border
-                        $stackPanel = New-Object Windows.Controls.StackPanel
-                        $stackPanel.Background = [Windows.Media.Brushes]::Transparent
-                        $stackPanel.SnapsToDevicePixels = $true
-                        $stackPanel.VerticalAlignment = "Stretch" # Ensure the stack panel stretches vertically
-                        $border.Child = $stackPanel
-                        $panelcount++
-                    }
-                }
-
-                switch ($entryInfo.Type) {
-                    "Toggle" {
-                        $dockPanel = New-Object Windows.Controls.DockPanel
-                        $checkBox = New-Object Windows.Controls.CheckBox
-                        $checkBox.Name = $entryInfo.Name
-                        $checkBox.HorizontalAlignment = "Right"
-                        $dockPanel.Children.Add($checkBox) | Out-Null
-                        $checkBox.Style = $ColorfulToggleSwitchStyle
-
-                        $label = New-Object Windows.Controls.Label
-                        $label.Content = $entryInfo.Content
-                        $label.ToolTip = $entryInfo.Description
-                        $label.HorizontalAlignment = "Left"
-                        $label.FontSize = $theme.FontSize
-                        $label.Foreground = $theme.MainForegroundColor
-                        $dockPanel.Children.Add($label) | Out-Null
-                        $stackPanel.Children.Add($dockPanel) | Out-Null
-
-                        $sync[$entryInfo.Name] = $checkBox
-
-                        $sync[$entryInfo.Name].IsChecked = Get-WinUtilToggleStatus $sync[$entryInfo.Name].Name
-
-                        $sync[$entryInfo.Name].Add_Click({
-                            [System.Object]$Sender = $args[0]
-                            Invoke-WPFToggle $Sender.name
-                        })
-                    }
-
-                    "ToggleButton" {
-                        $toggleButton = New-Object Windows.Controls.ToggleButton
-                        $toggleButton.Name = $entryInfo.Name
-                        $toggleButton.Name = "WPFTab" + ($stackPanel.Children.Count + 1) + "BT"
-                        $toggleButton.HorizontalAlignment = "Left"
-                        $toggleButton.Height = $theme.TabButtonHeight
-                        $toggleButton.Width = $theme.TabButtonWidth
-                        $toggleButton.Background = $theme.ButtonInstallBackgroundColor
-                        $toggleButton.Foreground = [Windows.Media.Brushes]::White
-                        $toggleButton.FontWeight = [Windows.FontWeights]::Bold
-
-                        $textBlock = New-Object Windows.Controls.TextBlock
-                        $textBlock.FontSize = $theme.TabButtonFontSize
-                        $textBlock.Background = [Windows.Media.Brushes]::Transparent
-                        $textBlock.Foreground = $theme.ButtonInstallForegroundColor
-
-                        $underline = New-Object Windows.Documents.Underline
-                        $underline.Inlines.Add($entryInfo.name -replace "(.).*", "`$1")
-
-                        $run = New-Object Windows.Documents.Run
-                        $run.Text = $entryInfo.name -replace "^.", ""
-
-                        $textBlock.Inlines.Add($underline)
-                        $textBlock.Inlines.Add($run)
-
-                        $toggleButton.Content = $textBlock
-
-                        $stackPanel.Children.Add($toggleButton) | Out-Null
-
-                        $sync[$entryInfo.Name] = $toggleButton
-                    }
-
-                    "Combobox" {
-                        $horizontalStackPanel = New-Object Windows.Controls.StackPanel
-                        $horizontalStackPanel.Orientation = "Horizontal"
-                        $horizontalStackPanel.Margin = "0,5,0,0"
-
-                        $label = New-Object Windows.Controls.Label
-                        $label.Content = $entryInfo.Content
-                        $label.HorizontalAlignment = "Left"
-                        $label.VerticalAlignment = "Center"
-                        $label.FontSize = $theme.ButtonFontSize
-                        $horizontalStackPanel.Children.Add($label) | Out-Null
-
-                        $comboBox = New-Object Windows.Controls.ComboBox
-                        $comboBox.Name = $entryInfo.Name
-                        $comboBox.Height = $theme.ButtonHeight
-                        $comboBox.Width = $theme.ButtonWidth
-                        $comboBox.HorizontalAlignment = "Left"
-                        $comboBox.VerticalAlignment = "Center"
-                        $comboBox.Margin = $theme.ButtonMargin
-
-                        foreach ($comboitem in ($entryInfo.ComboItems -split " ")) {
-                            $comboBoxItem = New-Object Windows.Controls.ComboBoxItem
-                            $comboBoxItem.Content = $comboitem
-                            $comboBoxItem.FontSize = $theme.ButtonFontSize
-                            $comboBox.Items.Add($comboBoxItem) | Out-Null
-                        }
-
-                        $horizontalStackPanel.Children.Add($comboBox) | Out-Null
-                        $stackPanel.Children.Add($horizontalStackPanel) | Out-Null
-
-                        $comboBox.SelectedIndex = 0
-
-                        $sync[$entryInfo.Name] = $comboBox
-                    }
-
-                    "Button" {
-                        $button = New-Object Windows.Controls.Button
-                        $button.Name = $entryInfo.Name
-                        $button.Content = $entryInfo.Content
-                        $button.HorizontalAlignment = "Left"
-                        $button.Margin = $theme.ButtonMargin
-                        $button.FontSize = $theme.ButtonFontSize
-                        if ($entryInfo.ButtonWidth) {
-                            $button.Width = $entryInfo.ButtonWidth
-                        }
-                        $stackPanel.Children.Add($button) | Out-Null
-
-                        $sync[$entryInfo.Name] = $button
-                    }
-
-                    default {
-                        $horizontalStackPanel = New-Object Windows.Controls.StackPanel
-                        $horizontalStackPanel.Orientation = "Horizontal"
-
-                        $checkBox = New-Object Windows.Controls.CheckBox
-                        $checkBox.Name = $entryInfo.Name
-                        $checkBox.Content = $entryInfo.Content
-                        $checkBox.FontSize = $theme.FontSize
-                        $checkBox.ToolTip = $entryInfo.Description
-                        $checkBox.Margin = $theme.CheckBoxMargin
-                        if ($entryInfo.Checked) {
-                            $checkBox.IsChecked = $entryInfo.Checked
-                        }
-                        $horizontalStackPanel.Children.Add($checkBox) | Out-Null
-
-                        if ($entryInfo.Link) {
-                            $textBlock = New-Object Windows.Controls.TextBlock
-                            $textBlock.Name = $checkBox.Name + "Link"
-                            $textBlock.Text = "(?)"
-                            $textBlock.ToolTip = $entryInfo.Link
-                            $textBlock.Style = $HoverTextBlockStyle
-
-                            # Add event handler for click to open link
-                            $handler = [System.Windows.Input.MouseButtonEventHandler]{
-                                param($sender, $e)
-                                Start-Process $sender.ToolTip.ToString()
-                            }
-                            $textBlock.AddHandler([Windows.Controls.TextBlock]::MouseLeftButtonUpEvent, $handler)
-
-                            $horizontalStackPanel.Children.Add($textBlock) | Out-Null
-
-                            $sync[$textBlock.Name] = $textBlock
-                        }
-
-                        $stackPanel.Children.Add($horizontalStackPanel) | Out-Null
-                        $sync[$entryInfo.Name] = $checkBox
-                    }
-                }
-            }
-        }
-    }
-}

gpedit-home.ps1

@@ -0,0 +1,4 @@
+Get-ChildItem @(
+    "$env:SystemRoot\servicing\Packages\Microsoft-Windows-GroupPolicy-ClientTools-Package*.mum",
+    "$env:SystemRoot\servicing\Packages\Microsoft-Windows-GroupPolicy-ClientExtensions-Package*.mum"
+) | ForEach-Object { dism.exe /online /norestart /add-package:"$_" }

mkdocs.yml

@@ -1,5 +1,4 @@
 site_name: WinUtil Documentation
-docs_dir: '../docs'
 repo_url: https://github.com/ChrisTitusTech/winutil
 
 nav:
@@ -13,7 +12,7 @@ nav:
 
 theme:
   name: material
-  custom_dir: '../overrides'
+  custom_dir: 'overrides'
   features:
     - navigation.tabs
     - navigation.sections

overrides/main.html

@@ -1,12 +1,5 @@
 {% extends "base.html" %}
 
-{% block header %}
-    {{ super() }}
-    <div style="color: red; text-align: center; padding: 10px; font-size: 20px;">
-        <strong>Announcement:</strong> We are currently not adding any applications to WinUtil and any apps that will be added through a PR will be declined by the maintainer.
-    </div>
-{% endblock %}
-
 {% block footer %}
     {# Empty block to override the footer #}
 {% endblock %}

pester/configs.Tests.ps1

@@ -37,12 +37,6 @@ Describe "Config Files" -ForEach @(
                 $result = New-Object System.Collections.Generic.List[System.Object]
                 Foreach ($application in $applications) {
                     $compare = $global:importedconfigs.$name.$application | Get-Member -MemberType NoteProperty | Select-Object -ExpandProperty name
-                    if (-not $compare) {
-                        throw "Comparison object for application '$application' is null."
-                    }
-                    if (-not $template) {
-                        throw "Template object for application '$application' is null."
-                    }
                     if ($(Compare-Object $compare $template) -ne $null) {
                         $result.Add($application)
                     }

scripts/main.ps1

@@ -52,7 +52,6 @@ $sync.runspace.Open()
 
 $inputXML = $inputXML -replace 'mc:Ignorable="d"', '' -replace "x:N", 'N' -replace '^<Win.*', '<Window'
 
-$defaulttheme = '_default'
 if ((Get-WinUtilToggleStatus WPFToggleDarkMode) -eq $True) {
     if (Invoke-WinUtilGPU -eq $True) {
         $ctttheme = 'Matrix'
@@ -62,54 +61,26 @@ if ((Get-WinUtilToggleStatus WPFToggleDarkMode) -eq $True) {
 } else {
     $ctttheme = 'Classic'
 }
-
-$returnVal = Set-WinUtilUITheme -inputXML $inputXML -customThemeName $ctttheme -defaultThemeName $defaulttheme
-if ($returnVal[0] -eq "") {
-    Write-Host "Failed to statically apply theming to xaml content using Set-WinUtilTheme, please check previous Error/Warning messages." -ForegroundColor Red
-    Write-Host "Quitting winutil..." -ForegroundColor Red
-    $sync.runspace.Dispose()
-    $sync.runspace.Close()
-    [System.GC]::Collect()
-    exit 1
-}
-$inputXML = $returnVal[0]
-$ctttheme = $returnVal[1]
+$inputXML = Set-WinUtilUITheme -inputXML $inputXML -themeName $ctttheme
 
 [void][System.Reflection.Assembly]::LoadWithPartialName('presentationframework')
 [xml]$XAML = $inputXML
 
 # Read the XAML file
-$readerOperationSuccessful = $false # There's more cases of failure then success.
 $reader = (New-Object System.Xml.XmlNodeReader $xaml)
 try {
     $sync["Form"] = [Windows.Markup.XamlReader]::Load( $reader )
-    $readerOperationSuccessful = $true
 } catch [System.Management.Automation.MethodInvocationException] {
-    Write-Host "We ran into a problem with the XAML code.  Check the syntax for this control..." -ForegroundColor Red
+    Write-Warning "We ran into a problem with the XAML code.  Check the syntax for this control..."
     Write-Host $error[0].Exception.Message -ForegroundColor Red
 
     If ($error[0].Exception.Message -like "*button*") {
-        write-Host "Ensure your &lt;button in the `$inputXML does NOT have a Click=ButtonClick property.  PS can't handle this`n`n`n`n" -ForegroundColor Red
+        write-warning "Ensure your &lt;button in the `$inputXML does NOT have a Click=ButtonClick property.  PS can't handle this`n`n`n`n"
     }
 } catch {
-    Write-Host "Unable to load Windows.Markup.XamlReader. Double-check syntax and ensure .net is installed." -ForegroundColor Red
+    Write-Host "Unable to load Windows.Markup.XamlReader. Double-check syntax and ensure .net is installed."
 }
 
-if (-NOT ($readerOperationSuccessful)) {
-    Write-Host "Failed to parse xaml content using Windows.Markup.XamlReader's Load Method." -ForegroundColor Red
-    Write-Host "Quitting winutil..." -ForegroundColor Red
-    $sync.runspace.Dispose()
-    $sync.runspace.Close()
-    [System.GC]::Collect()
-    exit 1
-}
-
-# Load the configuration files
-#Invoke-WPFUIElements -configVariable $sync.configs.nav -targetGridName "WPFMainGrid"
-Invoke-WPFUIElements -configVariable $sync.configs.applications -targetGridName "appspanel" -columncount 5
-Invoke-WPFUIElements -configVariable $sync.configs.tweaks -targetGridName "tweakspanel" -columncount 2
-Invoke-WPFUIElements -configVariable $sync.configs.feature -targetGridName "featurespanel" -columncount 2
-
 #===========================================================================
 # Store Form Objects In PowerShell
 #===========================================================================
@@ -118,6 +89,16 @@ $xaml.SelectNodes("//*[@Name]") | ForEach-Object {$sync["$("$($psitem.Name)")"]
 
 $sync.keys | ForEach-Object {
     if($sync.$psitem) {
+        if($($sync["$psitem"].GetType() | Select-Object -ExpandProperty Name) -eq "CheckBox" `
+                -and $sync["$psitem"].Name -like "WPFToggle*") {
+            $sync["$psitem"].IsChecked = Get-WinUtilToggleStatus $sync["$psitem"].Name
+
+            $sync["$psitem"].Add_Click({
+                [System.Object]$Sender = $args[0]
+                Invoke-WPFToggle $Sender.name
+            })
+        }
+
         if($($sync["$psitem"].GetType() | Select-Object -ExpandProperty Name) -eq "ToggleButton") {
             $sync["$psitem"].Add_Click({
                 [System.Object]$Sender = $args[0]
@@ -386,6 +367,7 @@ $labels = @{}
 $allCategories = $checkBoxes.Name | ForEach-Object {$sync.configs.applications.$_} | Select-Object  -Unique -ExpandProperty category
 
 $sync["SearchBar"].Add_TextChanged({
+
     if ($sync.SearchBar.Text -ne "") {
         $sync.SearchBarClearButton.Visibility = "Visible"
     } else {
@@ -394,14 +376,13 @@ $sync["SearchBar"].Add_TextChanged({
 
     $activeApplications = @()
 
-    $textToSearch = $sync.SearchBar.Text.ToLower()
-
     foreach ($CheckBox in $CheckBoxes) {
         # Check if the checkbox is null or if it doesn't have content
         if ($CheckBox -eq $null -or $CheckBox.Value -eq $null -or $CheckBox.Value.Content -eq $null) {
             continue
         }
 
+        $textToSearch = $sync.SearchBar.Text.ToLower()
         $checkBoxName = $CheckBox.Key
         $textBlockName = $checkBoxName + "Link"
 
@@ -411,23 +392,23 @@ $sync["SearchBar"].Add_TextChanged({
         if ($CheckBox.Value.Content.ToLower().Contains($textToSearch)) {
             $CheckBox.Value.Visibility = "Visible"
             $activeApplications += $sync.configs.applications.$checkboxName
-            # Set the corresponding text block visibility
-            if ($textBlock -ne $null -and $textBlock -is [System.Windows.Controls.TextBlock]) {
+             # Set the corresponding text block visibility
+            if ($textBlock -ne $null) {
                 $textBlock.Visibility = "Visible"
             }
         } else {
-            $CheckBox.Value.Visibility = "Collapsed"
+             $CheckBox.Value.Visibility = "Collapsed"
             # Set the corresponding text block visibility
-            if ($textBlock -ne $null -and $textBlock -is [System.Windows.Controls.TextBlock]) {
+            if ($textBlock -ne $null) {
                 $textBlock.Visibility = "Collapsed"
             }
         }
     }
-
     $activeCategories = $activeApplications | Select-Object -ExpandProperty category -Unique
 
     foreach ($category in $activeCategories) {
-        $sync[$category].Visibility = "Visible"
+        $label = $labels[$(Get-WPFObjectName -type "Label" -name $category)]
+        $label.Visibility = "Visible"
     }
     if ($activeCategories) {
         $inactiveCategories = Compare-Object -ReferenceObject $allCategories -DifferenceObject $activeCategories -PassThru
@@ -435,8 +416,8 @@ $sync["SearchBar"].Add_TextChanged({
         $inactiveCategories = $allCategories
     }
     foreach ($category in $inactiveCategories) {
-        $sync[$category].Visibility = "Collapsed"
-    }
+        $label = $labels[$(Get-WPFObjectName -type "Label" -name $category)]
+        $label.Visibility = "Collapsed"}
 })
 
 # Initialize the hashtable

scripts/start.ps1

@@ -27,11 +27,11 @@ if ($Run) {
     $PARAM_RUN = $true
 }
 
-$dateTime = Get-Date -Format "yyyy-MM-dd_HH-mm-ss"
+if (!(Test-Path -Path $ENV:TEMP)) {
+    New-Item -ItemType Directory -Force -Path $ENV:TEMP
+}
 
-$logdir = "$env:localappdata\winutil\logs"
-[System.IO.Directory]::CreateDirectory("$logdir")
-Start-Transcript -Path "$logdir\winutil_$dateTime.log" -Append
+Start-Transcript $ENV:TEMP\Winutil.log -Append
 
 # Load DLLs
 Add-Type -AssemblyName PresentationFramework
@@ -44,15 +44,12 @@ $sync.version = "#{replaceme}"
 $sync.configs = @{}
 $sync.ProcessRunning = $false
 
-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."
-
-    $script = if ($MyInvocation.MyCommand.Path) { "& '" + $MyInvocation.MyCommand.Path + "'" } else { "irm 'https://github.com/ChrisTitusTech/winutil/releases/latest/download/winutil.ps1' | iex"}
-    $powershellcmd = if (Get-Command pwsh -ErrorAction SilentlyContinue) { "pwsh" } else { "powershell" }
-    $processCmd = if (Get-Command wt.exe -ErrorAction SilentlyContinue) { "wt.exe" } else { $powershellcmd }
-
-    Start-Process $processCmd -ArgumentList "$powershellcmd -ExecutionPolicy Bypass -NoProfile -Command $script" -Verb RunAs
-
+# 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
     break
 }
 

utilmatepowerplan-fix.ps1

@@ -0,0 +1,42 @@
+# ID of the plan to duplicate
+$sourceGUID = "e9a42b02-d5df-448d-aa00-03f14749eb61"
+
+# Duplicate the power plan
+$duplicateOutput = powercfg /duplicatescheme $sourceGUID
+
+$guid = $null
+$nameFromFile = "ChrisTitus - Ultimate Power Plan"
+$description = "Ultimate Power Plan, added via WinUtils"
+
+# Extract the GUID directly from the duplicateOutput
+foreach ($line in $duplicateOutput) {
+    if ($line -match "GUID du mode de gestion de l'alimentation\s*:\s*([a-fA-F0-9\-]+)") {
+        $guid = $matches[1]
+        Write-Output "GUID: $guid has been extracted and stored in the variable."
+        break
+    }
+}
+
+if (-not $guid) {
+    Write-Output "No GUID found in the duplicateOutput. Check the output format."
+    exit 1
+}
+
+# Execute commands to change the plan name and set the plan as active
+try {
+    if ($guid) {
+        # Change the name of the power plan and set its description
+        $changeNameOutput = powercfg /changename $guid "$nameFromFile" "$description"
+        Write-Output "The power plan name and description have been changed. Output:"
+        Write-Output $changeNameOutput
+
+        # Set the power plan as active
+        $setActiveOutput = powercfg /setactive $guid
+        Write-Output "The power plan has been set as active. Output:"
+        Write-Output $setActiveOutput
+    } else {
+        Write-Output "GUID is missing. Ensure that the GUID was properly extracted."
+    }
+} catch {
+    Write-Error "Error executing powercfg commands: $_"
+}

windev.ps1

@@ -12,18 +12,6 @@
     Run in Admin Powershell >  ./windev.ps1
 #>
 
-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."
-
-    $script = if ($MyInvocation.MyCommand.Path) { "& '" + $MyInvocation.MyCommand.Path + "'" } else { "irm 'https://github.com/ChrisTitusTech/winutil/raw/main/windev.ps1' | iex"}
-    $powershellcmd = if (Get-Command pwsh -ErrorAction SilentlyContinue) { "pwsh" } else { "powershell" }
-    $processCmd = if (Get-Command wt.exe -ErrorAction SilentlyContinue) { "wt.exe" } else { $powershellcmd }
-
-    Start-Process $processCmd -ArgumentList "$powershellcmd -ExecutionPolicy Bypass -NoProfile -Command $script" -Verb RunAs
-
-    break
-}
-
 # Function to fetch the latest release tag from the GitHub API
 function Get-LatestRelease {
     try {

xaml/inputXML.xaml

@@ -284,12 +284,12 @@
             <Setter Property="Padding" Value="0"/>
             <Setter Property="BorderBrush" Value="Transparent"/>
             <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="Cursor" Value="Hand"/>
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
                     <Setter Property="Foreground" Value="Red"/>
                     <Setter Property="Background" Value="Transparent"/>
                     <Setter Property="BorderThickness" Value="10"/>
-                    <Setter Property="Cursor" Value="Hand"/>
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -305,17 +305,17 @@
                         <Grid Background="{TemplateBinding Background}" Margin="{CheckBoxMargin}">
                             <BulletDecorator Background="Transparent">
                                 <BulletDecorator.Bullet>
-                                    <Grid Width="{CheckBoxBulletDecoratorSize}" Height="{CheckBoxBulletDecoratorSize}">
+                                    <Grid Width="{CheckBoxBulletDecoratorFontSize}" Height="{CheckBoxBulletDecoratorFontSize}">
                                         <Border x:Name="Border"
                                                 BorderBrush="{TemplateBinding BorderBrush}"
                                                 Background="{ButtonBackgroundColor}"
                                                 BorderThickness="1"
-                                                Width="{Binding Path={CheckBoxBulletDecoratorSize}-2}"
-                                                Height="{Binding Path={CheckBoxBulletDecoratorSize}-2}"
+                                                Width="{Binding Path={CheckBoxBulletDecoratorFontSize}-2}"
+                                                Height="{Binding Path={CheckBoxBulletDecoratorFontSize}-2}"
                                                 Margin="2"
                                                 SnapsToDevicePixels="True"/>
                                         <Path x:Name="CheckMark"
-                                              Stroke="{ToggleButtonOnColor}"
+                                              Stroke="{TemplateBinding Foreground}"
                                               StrokeThickness="2"
                                               Data="M 0 5 L 5 10 L 12 0"
                                               Visibility="Collapsed"/>
@@ -427,11 +427,7 @@
                                 Width="34" Height="17">
                             <Ellipse x:Name="Ellipse" Fill="{MainForegroundColor}" Stretch="Uniform"
                                     Margin="2,2,2,1"
-                                    HorizontalAlignment="Left" Width="10.8"
-                                    RenderTransformOrigin="0.5, 0.5">
-                                <Ellipse.RenderTransform>
-                                    <ScaleTransform ScaleX="1" ScaleY="1" />
-                                </Ellipse.RenderTransform>
+                                    HorizontalAlignment="Left" Width="12">
                             </Ellipse>
                         </Border>
                         </Grid>
@@ -442,35 +438,12 @@
                                 <Setter TargetName="Border" Property="Background" Value="{LinkHoverForegroundColor}"/>
                                 <Setter Property="Cursor" Value="Hand" />
                                 <Setter Property="Panel.ZIndex" Value="1000"/>
-                                <Trigger.EnterActions>
-                                    <BeginStoryboard>
-                                        <Storyboard>
-                                            <DoubleAnimation Storyboard.TargetName="Ellipse"
-                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)"
-                                                            To="1.1" Duration="0:0:0.1" />
-                                            <DoubleAnimation Storyboard.TargetName="Ellipse"
-                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)"
-                                                            To="1.1" Duration="0:0:0.1" />
-                                        </Storyboard>
-                                    </BeginStoryboard>
-                                </Trigger.EnterActions>
-                                <Trigger.ExitActions>
-                                    <BeginStoryboard>
-                                        <Storyboard>
-                                            <DoubleAnimation Storyboard.TargetName="Ellipse"
-                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)"
-                                                            To="1.0" Duration="0:0:0.1" />
-                                            <DoubleAnimation Storyboard.TargetName="Ellipse"
-                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)"
-                                                            To="1.0" Duration="0:0:0.1" />
-                                        </Storyboard>
-                                    </BeginStoryboard>
-                                </Trigger.ExitActions>
                             </Trigger>
                             <Trigger Property="ToggleButton.IsChecked" Value="False">
                                 <Setter TargetName="Border" Property="Background" Value="{MainBackgroundColor}" />
-                                <Setter TargetName="Border" Property="BorderBrush" Value="#707070" />
-                                <Setter TargetName="Ellipse" Property="Fill" Value="#707070" />
+                                <Setter TargetName="Border" Property="BorderBrush" Value="{MainForegroundColor}" />
+                                <Setter TargetName="Ellipse" Property="Fill" Value="{MainForegroundColor}" />
+
                             </Trigger>
 
                             <Trigger Property="ToggleButton.IsChecked" Value="True">
@@ -529,7 +502,7 @@
             </Style.Triggers>
         </Style>
 
-        <Style x:Key="BorderStyle" TargetType="Border">
+        <Style TargetType="Border">
             <Setter Property="Background" Value="{MainBackgroundColor}"/>
             <Setter Property="BorderBrush" Value="{BorderColor}"/>
             <Setter Property="BorderThickness" Value="1"/>
@@ -593,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>
@@ -713,8 +656,6 @@
                     BorderThickness="1"
                     Name="SearchBar"
                     Foreground="{MainForegroundColor}" Background="{MainBackgroundColor}"
-                    Padding="3,3,30,0"
-                    Margin="5,0,0,0"
                     ToolTip="Press Ctrl-F and type app name to filter application list below. Press Esc to reset the filter">
                 </TextBox>
                 <TextBlock
@@ -722,7 +663,7 @@
                     VerticalAlignment="Center" HorizontalAlignment="Left"
                     FontFamily="Segoe MDL2 Assets"
                     FontSize="{IconFontSize}"
-                    Margin="180,0,0,0">&#xE721;</TextBlock>
+                    Margin="16,0,0,0">&#xE721;</TextBlock>
                 <!--
                   TODO:
                     Make this ClearButton Positioning react to
@@ -734,7 +675,7 @@
                     VerticalAlignment="Center" HorizontalAlignment="Left"
                     Name="SearchBarClearButton"
                     Style="{StaticResource SearchBarClearButtonStyle}"
-                    Margin="210,0,0,0" Visibility="Collapsed"/>
+                    Margin="193,0,0,0" Visibility="Collapsed"/>
 
                 <ProgressBar
                     Grid.Column="1"
@@ -800,7 +741,7 @@
                 HorizontalAlignment="Right" VerticalAlignment="Top"
                 Margin="0,5,5,0"
                 FontFamily="Arial"
-                Foreground="{MainForegroundColor}" FontSize="{CloseIconFontSize}" Name="WPFCloseButton" />
+                Foreground="{MainForegroundColor}" FontSize="{IconFontSize}" Name="WPFCloseButton" />
             </Grid>
 
         </DockPanel>
@@ -813,105 +754,81 @@
                         <RowDefinition Height="45px"/>
                         <RowDefinition Height="0.95*"/>
                     </Grid.RowDefinitions>
-                    <StackPanel Background="{MainBackgroundColor}" Orientation="Horizontal" Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.Column="0" Grid.ColumnSpan="3" Margin="{TabContentMargin}">
-                        <Button Name="WPFInstall" Content=" Install/Upgrade Selected" Margin="2" />
+                    <StackPanel Background="{MainBackgroundColor}" Orientation="Horizontal" Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.Column="0" Grid.ColumnSpan="3" Margin="5">
+                        <Button Name="WPFinstall" Content=" Install/Upgrade Selected" Margin="2" />
                         <Button Name="WPFInstallUpgrade" Content=" Upgrade All" Margin="2"/>
-                        <Button Name="WPFUninstall" Content=" Uninstall Selected" Margin="2"/>
+                        <Button Name="WPFuninstall" Content=" Uninstall Selected" Margin="2"/>
                         <Button Name="WPFGetInstalled" Content=" Get Installed" Margin="2"/>
-                        <Button Name="WPFClearInstallSelection" Content=" Clear Selection" Margin="2"/>
+                        <Button Name="WPFclearWinget" Content=" Clear Selection" Margin="2"/>
                     </StackPanel>
 
-                    <ScrollViewer x:Name="scrollViewer" Grid.Row="1" Grid.Column="0" Margin="{TabContentMargin}" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"
+                    <ScrollViewer x:Name="scrollViewer" Grid.Row="1" Grid.Column="0" Padding="-1" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"
                                 BorderBrush="Transparent" BorderThickness="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                        <Grid Name="appspanel" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                        <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                            {{InstallPanel_applications}}
                         </Grid>
                     </ScrollViewer>
 
-                    <Rectangle Grid.Row="1" Grid.Column="0" Width="22" Height="22" Fill="{MainBackgroundColor}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Style="{StaticResource ScrollVisibilityRectangle}"/>
+                    <Rectangle Grid.Row="1" Grid.Column="0" Width="18" Height="18" Fill="{MainBackgroundColor}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Style="{StaticResource ScrollVisibilityRectangle}"/>
 
                 </Grid>
             </TabItem>
             <TabItem Header="Tweaks" Visibility="Collapsed" Name="WPFTab2">
-                <Grid>
-                    <!-- Main content area with a ScrollViewer -->
+                <ScrollViewer VerticalScrollBarVisibility="Auto">
+                <Grid Background="Transparent">
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="*" />
-                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="45px"/>
+                        <RowDefinition Height=".70*"/>
+                        <RowDefinition Height=".10*"/>
                     </Grid.RowDefinitions>
-
-                    <ScrollViewer VerticalScrollBarVisibility="Auto" Grid.Row="0" Margin="{TabContentMargin}">
-                        <Grid Background="Transparent">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="45px"/>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="Auto"/>
-                            </Grid.RowDefinitions>
-
-                            <StackPanel Background="{MainBackgroundColor}" Orientation="Horizontal" HorizontalAlignment="Left" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="5">
-                                <Label Content="Recommended Selections:" FontSize="{FontSize}" VerticalAlignment="Center" Margin="2"/>
-                                <Button Name="WPFstandard" Content=" Standard " Margin="2"/>
-                                <Button Name="WPFminimal" Content=" Minimal " Margin="2"/>
-                                <Button Name="WPFclear" Content=" Clear " Margin="2"/>
-                                <Button Name="WPFGetInstalledTweaks" Content=" Get Installed " Margin="2"/>
-                            </StackPanel>
-
-                            <Grid Name="tweakspanel" Grid.Row="1">
-                                <!-- Your tweakspanel content goes here -->
-                            </Grid>
-
-                            <Border Grid.ColumnSpan="2" Grid.Row="2" Grid.Column="0" Style="{StaticResource BorderStyle}">
-                                <StackPanel Background="{MainBackgroundColor}" Orientation="Horizontal" HorizontalAlignment="Left">
-                                    <TextBlock Padding="10">
-                                        Note: Hover over items to get a better description. Please be careful as many of these tweaks will heavily modify your system.
-                                        <LineBreak/>Recommended selections are for normal users and if you are unsure do NOT check anything else!
-                                    </TextBlock>
-                                </StackPanel>
-                            </Border>
-                        </Grid>
-                    </ScrollViewer>
-                    <Border Grid.Row="1" Background="{MainBackgroundColor}" BorderBrush="{BorderColor}" BorderThickness="1" CornerRadius="5" HorizontalAlignment="Stretch" Padding="10">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="1*" />
-                                <ColumnDefinition Width="1*" />
-                            </Grid.ColumnDefinitions>
-
-                            <!-- Buttons on the left half -->
-                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Grid.Column="0">
-                                <Button Name="WPFTweaksbutton" Content="Run Tweaks" Margin="5"/>
-                                <Button Name="WPFUndoall" Content="Undo Selected Tweaks" Margin="5"/>
-                            </StackPanel>
-                        </Grid>
+                    {{InstallPanel_tweaks}}
+                    <StackPanel Background="{MainBackgroundColor}" Orientation="Horizontal" HorizontalAlignment="Left" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="5">
+                        <Label Content="Recommended Selections:" FontSize="{FontSize}" VerticalAlignment="Center" Margin="2"/>
+                        <Button Name="WPFstandard" Content=" Standard " Margin="2"/>
+                        <Button Name="WPFminimal" Content=" Minimal " Margin="2"/>
+                        <Button Name="WPFclear" Content=" Clear " Margin="2"/>
+                        <Button Name="WPFGetInstalledTweaks" Content=" Get Installed " Margin="2"/>
+                    </StackPanel>
+                    <Border Grid.ColumnSpan="2" Grid.Row="2" Grid.Column="0">
+                        <StackPanel Background="{MainBackgroundColor}" Orientation="Horizontal" HorizontalAlignment="Left">
+                            <TextBlock Padding="10">
+                                Note: Hover over items to get a better description. Please be careful as many of these tweaks will heavily modify your system.
+                                <LineBreak/>Recommended selections are for normal users and if you are unsure do NOT check anything else!
+                            </TextBlock>
+                        </StackPanel>
                     </Border>
-                </Grid>
+
+                    </Grid>
+                </ScrollViewer>
             </TabItem>
             <TabItem Header="Config" Visibility="Collapsed" Name="WPFTab3">
-                <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="{TabContentMargin}">
-                    <Grid Name="featurespanel" Grid.Row="1" Background="Transparent">
+                <ScrollViewer VerticalScrollBarVisibility="Auto">
+                <Grid Background="Transparent">
+                    {{InstallPanel_features}}
                     </Grid>
                 </ScrollViewer>
             </TabItem>
             <TabItem Header="Updates" Visibility="Collapsed" Name="WPFTab4">
-                <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="{TabContentMargin}">
+                <ScrollViewer VerticalScrollBarVisibility="Auto">
                 <Grid Background="Transparent">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
                         <ColumnDefinition Width="*"/>
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
-                    <Border Grid.Row="0" Grid.Column="0" Style="{StaticResource BorderStyle}">
+                    <Border Grid.Row="0" Grid.Column="0">
                         <StackPanel Background="{MainBackgroundColor}" SnapsToDevicePixels="True">
                             <Button Name="WPFUpdatesdefault" FontSize="{ConfigTabButtonFontSize}" Height="Auto" Width="Auto" Content="Default (Out of Box) Settings" Margin="20,4,20,10" Padding="10"/>
                             <TextBlock Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300">This is the default settings that come with Windows. <LineBreak/><LineBreak/> No modifications are made and will remove any custom windows update settings.<LineBreak/><LineBreak/>Note: If you still encounter update errors, reset all updates in the config tab. That will restore ALL Microsoft Update Services from their servers and reinstall them to default settings.</TextBlock>
                         </StackPanel>
                     </Border>
-                    <Border Grid.Row="0" Grid.Column="1" Style="{StaticResource BorderStyle}">
+                    <Border Grid.Row="0" Grid.Column="1">
                         <StackPanel Background="{MainBackgroundColor}" SnapsToDevicePixels="True">
                             <Button Name="WPFUpdatessecurity" FontSize="{ConfigTabButtonFontSize}" Height="Auto" Width="Auto" Content="Security (Recommended) Settings" Margin="20,4,20,10" Padding="10"/>
                             <TextBlock Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300">This is my recommended setting I use on all computers.<LineBreak/><LineBreak/> It will delay feature updates by 2 years and will install security updates 4 days after release.<LineBreak/><LineBreak/>Feature Updates: Adds features and often bugs to systems when they are released. You want to delay these as long as possible.<LineBreak/><LineBreak/>Security Updates: Typically these are pressing security flaws that need to be patched quickly. You only want to delay these a couple of days just to see if they are safe and don't break other systems. You don't want to go without these for ANY extended periods of time.</TextBlock>
                         </StackPanel>
                     </Border>
-                    <Border Grid.Row="0" Grid.Column="2" Style="{StaticResource BorderStyle}">
+                    <Border Grid.Row="0" Grid.Column="2">
                         <StackPanel Background="{MainBackgroundColor}" SnapsToDevicePixels="True">
                             <Button Name="WPFUpdatesdisable" FontSize="{ConfigTabButtonFontSize}" Height="Auto" Width="Auto" Content="Disable ALL Updates (NOT RECOMMENDED!)" Margin="20,4,20,10" Padding="10,10,10,10"/>
                             <TextBlock Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300">This completely disables ALL Windows Updates and is NOT RECOMMENDED.<LineBreak/><LineBreak/> However, it can be suitable if you use your system for a select purpose and do not actively browse the internet. <LineBreak/><LineBreak/>Note: Your system will be easier to hack and infect without security updates.</TextBlock>
@@ -922,7 +839,7 @@
                 </ScrollViewer>
             </TabItem>
             <TabItem Header="MicroWin" Visibility="Collapsed" Name="WPFTab5">
-                <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="{TabContentMargin}">
+                <ScrollViewer VerticalScrollBarVisibility="Auto">
                 <Grid Width="Auto" Height="Auto">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
@@ -932,17 +849,16 @@
                         <RowDefinition Height="*" />
                     </Grid.RowDefinitions>
                     <Border Grid.Row="0" Grid.Column="0"
-                        Style="{StaticResource BorderStyle}"
                         VerticalAlignment="Stretch"
                         HorizontalAlignment="Stretch">
                     <StackPanel Name="MicrowinMain" Background="{MainBackgroundColor}" SnapsToDevicePixels="True" Grid.Column="0" Grid.Row="0">
                         <StackPanel Background="Transparent" SnapsToDevicePixels="True" Margin="1">
-                            <CheckBox x:Name="WPFMicrowinDownloadFromGitHub" Content="Download oscdimg.exe from CTT Github repo" IsChecked="False" Margin="{CheckBoxMargin}" />
+                            <CheckBox x:Name="WPFMicrowinDownloadFromGitHub" Content="Download oscdimg.exe from CTT Github repo" IsChecked="False" Margin="-10,1,1,1" />
                             <TextBlock Margin="5" Padding="1" TextWrapping="Wrap" Foreground="{ComboBoxForegroundColor}">
                                 Choose a Windows ISO file that you've downloaded <LineBreak/>
                                 Check the status in the console
                             </TextBlock>
-                            <CheckBox x:Name="WPFMicrowinISOScratchDir" Content="Use ISO directory for ScratchDir " IsChecked="False" Margin="{CheckBoxMargin}"
+                            <CheckBox x:Name="WPFMicrowinISOScratchDir" Content="Use ISO directory for ScratchDir " IsChecked="False" Margin="-10,1,1,1"
                                 ToolTip="Use ISO directory for ScratchDir " />
                             <Grid>
                             <Grid.ColumnDefinitions>
@@ -988,6 +904,11 @@
                         <StackPanel Name="MicrowinOptionsPanel" HorizontalAlignment="Left" SnapsToDevicePixels="True" Margin="1" Visibility="Hidden">
                             <TextBlock Margin="6" Padding="1" TextWrapping="Wrap">Choose Windows SKU</TextBlock>
                             <ComboBox x:Name = "MicrowinWindowsFlavors" Margin="1" />
+                            <TextBlock Margin="6" Padding="1" TextWrapping="Wrap">Choose Windows features you want to remove from the ISO</TextBlock>
+                            <CheckBox Name="WPFMicrowinKeepProvisionedPackages" Content="Keep Provisioned Packages" Margin="-10,5,0,0" ToolTip="Do not remove Microsoft Provisioned packages from the ISO."/>
+                            <CheckBox Name="WPFMicrowinKeepAppxPackages" Content="Keep Appx Packages" Margin="-10,5,0,0" ToolTip="Do not remove Microsoft Appx packages from the ISO."/>
+                            <CheckBox Name="WPFMicrowinKeepDefender" Content="Keep Defender" Margin="-10,5,0,0" IsChecked="True" ToolTip="Do not remove Microsoft Antivirus from the ISO."/>
+                            <CheckBox Name="WPFMicrowinKeepEdge" Content="Keep Edge" Margin="-10,5,0,0" IsChecked="True" ToolTip="Do not remove Microsoft Edge from the ISO."/>
                             <Rectangle Fill="{MainForegroundColor}" Height="2" HorizontalAlignment="Stretch" Margin="0,10,0,10"/>
                             <CheckBox Name="MicrowinInjectDrivers" Content="Inject drivers (I KNOW WHAT I'M DOING)" Margin="-10,5,0,0" IsChecked="False" ToolTip="Path to unpacked drivers all sys and inf files for devices that need drivers"/>
                             <TextBox Name="MicrowinDriverLocation" Background="Transparent" BorderThickness="1" BorderBrush="{MainForegroundColor}"
@@ -998,26 +919,9 @@
                                 Foreground="{LabelboxForegroundColor}"
                                 ToolTip="Path to unpacked drivers all sys and inf files for devices that need drivers"
                             />
-                            <CheckBox Name="MicrowinImportDrivers" Content="Import drivers from current system" Margin="{CheckBoxMargin}" IsChecked="False" ToolTip="Export all third-party drivers from your system and inject them to the MicroWin image"/>
+                            <CheckBox Name="MicrowinImportDrivers" Content="Import drivers from current system" Margin="-10,5,0,0" IsChecked="False" ToolTip="Export all third-party drivers from your system and inject them to the MicroWin image"/>
                             <Rectangle Fill="{MainForegroundColor}" Height="2" HorizontalAlignment="Stretch" Margin="0,10,0,10"/>
-                            <CheckBox Name="WPFMicrowinCopyToUsb" Content="Copy to Ventoy" Margin="{CheckBoxMargin}" 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}"
-                            />
+                            <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"/>
                             <Button Name="WPFMicrowin" Content="Start the process" Margin="2" Padding="15"/>
                         </StackPanel>
@@ -1030,7 +934,6 @@
                     </StackPanel>
                     </Border>
                     <Border
-                        Style="{StaticResource BorderStyle}"
                         VerticalAlignment="Stretch"
                         HorizontalAlignment="Stretch"
                         Grid.Row="0" Grid.Column="1">
@@ -1067,20 +970,25 @@
                                 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/>
-                                - No internet requirement for install <LineBreak/>
+                                - Add ability to use local accounts <LineBreak/>
+                                - Remove Wifi requirement to finish install <LineBreak/>
+                                - Ability to remove Edge <LineBreak/>
+                                - Ability to remove Defender <LineBreak/>
+                                - Remove Teams <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/>
                                 - Click on the "Select Windows ISO" button and wait for WinUtil to process the image <LineBreak/>
                                 It will be processed and unpacked which may take some time <LineBreak/>
                                 - Once complete, choose which Windows flavor you want to base your image on <LineBreak/>
+                                - Choose which features you want to keep <LineBreak/>
                                 - Click the "Start Process" button <LineBreak/>
                                 The process of creating the Windows image may take some time, please check the console and wait for it to say "Done" <LineBreak/>
                                 - Once complete, the target ISO file will be in the directory you have specified <LineBreak/>