Deploying to main from @ ChrisTitusTech/winutil@e784604a1a 🚀

Bumps [actions/cache](https://github.com/actions/cache) from 2 to 4.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v2...v4)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.gitattributes

@@ -1,3 +1,12 @@
+* text=auto
+
+*.ps1 text eol=crlf
+*.json text eol=crlf
+*.cfg text eol=crlf
+
+*.png binary
+*.jpg binary
+
 config/* diff
 config/applications.json diff
-*.json diff
+*.json diff

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,24 +4,23 @@ about: Create a report to help us improve
 title: ''
 labels: ''
 assignees: ''
-
 ---
 
-**Describe the bug**
+## Describe the bug
 A clear and concise description of what the bug is.
 
-**To Reproduce**
+## To Reproduce
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
-**Expected behavior**
+## Expected behavior
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
+## Screenshots
 If applicable, add screenshots to help explain your problem.
 
-**Additional context**
+## Additional context
 Add any other context about the problem here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,36 @@
+# Pull Request
+
+## Title
+[Provide a succinct and descriptive title for the pull request.]
+
+## Type of Change
+- [ ] New feature
+- [ ] Bug fix
+- [ ] Documentation update
+- [ ] Refactoring
+- [ ] Hotfix
+- [ ] Security patch
+- [ ] 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.]
+
+## Testing
+[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.]
+
+## Issue related to PR
+[What issue/discussion is related to this PR (if any)]
+- Resolves #
+
+## Additional Information
+[Any additional information that reviewers should be aware of.]
+
+## Checklist
+- [ ] My code adheres to the coding and style guidelines of the project.
+- [ ] I have performed a self-review of my own code.
+- [ ] I have commented my code, particularly in hard-to-understand areas.
+- [ ] I have made corresponding changes to the documentation.
+- [ ] My changes generate no errors/warnings/merge conflicts.

.github/dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    ignore:
+      - dependency-name: "actions/stale"
+        versions: '>= 9'

.github/workflows/close-discussion.yml

@@ -0,0 +1,30 @@
+name: Close Discussion on PR Merge
+
+on:
+  pull_request:
+    types: [closed]
+
+jobs:
+  closeDiscussion:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check if PR was merged
+        if: github.event.pull_request.merged == true
+        run: echo "PR was merged"
+
+      - name: Extract Discussion Number
+        if: github.event.pull_request.merged == true
+        id: extract-discussion
+        run: |
+          echo "discussion=$(echo '${{ github.event.pull_request.body }}' | grep -oP '(?<=Resolves #)\d+')" >> $GITHUB_OUTPUT
+        shell: bash
+
+      - name: Close the discussion
+        if: github.event.pull_request.merged == true && steps.extract-discussion.outputs.discussion
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          DISCUSSION_ID: ${{ steps.extract-discussion.outputs.discussion }}
+        run: |
+          curl -X PATCH -H "Authorization: token $GITHUB_TOKEN" \
+               -d '{"state": "closed"}' \
+               "https://api.github.com/repos/${{ github.repository }}/discussions/${DISCUSSION_ID}"

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

@@ -4,62 +4,36 @@ on:
   schedule:
     - cron: '0 0 * * *'  # Run daily
   workflow_dispatch:  # This line enables manual triggering
+
 jobs:
   close-issues:
     runs-on: ubuntu-latest
     permissions:
       issues: write  # Ensure necessary permissions for issues
-
+      pull-requests: none
+      contents: none
     steps:
     - name: Close inactive issues
-      uses: actions/github-script@v7
+      uses: actions/stale@v8
       with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
+        # A list of labels to reference when looking through issues,
-        script: |
+        # and only when one (or even more) of these labels are found..
-          const octokit = github;
+        # then skip this issue, and never try to stale and/or close it.
-
+        exempt-issue-labels: "Keep Issue Open"
-          // Get the repository owner and name
+        # Split it into two weeks, after one week the issue will be marked as stale,
-          const { owner, repo } = context.repo;
+        # after another week have pasted without any update.. the issue will then be closed.
-
+        days-before-issue-stale: 7
-          // Define the inactivity period (14 days)
+        days-before-issue-close: 7
-          const inactivityPeriod = new Date();
+        # NEVER mark PRs as Stale or Close + this workflow should never have write permissions on PRs, EVER!
-          inactivityPeriod.setDate(inactivityPeriod.getDate() - 14);
+        days-before-pr-stale: -1
-
+        days-before-pr-close: -1
-          try {
+        # Sends a message for both the Stale and Close events of an issue.
-            // Get all open issues with pagination
+        stale-issue-message: "This issue was marked as stale because it has been inactive for 7 days"
-            for await (const response of octokit.paginate.iterator(octokit.rest.issues.listForRepo, {
+        close-issue-message: "This issue was closed because it has been inactive for 7 days since it was marked as stale"
-              owner,
+        # Increase this value if the project receives a lot of
-              repo,
+        # PRs (yes.. apparently they're processed no matter what) & Issues.
-              state: 'open',
+        # Default value for it (according to the docs) is 30
-            })) {
+        operations-per-run: 200
-              const issues = response.data;
+        # Make this field equal true if you want to test your configuration if it works correctly or not
-
+        debug-only: false
-              // Close issues inactive for more than the inactivity period
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
-              for (const issue of issues) {
-                const lastCommentDate = issue.updated_at;
-                if (new Date(lastCommentDate) < inactivityPeriod) {
-                  try {
-                    // Close the issue
-                    await octokit.rest.issues.update({
-                      owner,
-                      repo,
-                      issue_number: issue.number,
-                      state: 'closed',
-                    });
-
-                    // Add a comment
-                    await octokit.rest.issues.createComment({
-                      owner,
-                      repo,
-                      issue_number: issue.number,
-                      body: 'Closed due to inactivity',
-                    });
-                  } catch (error) {
-                    console.error(`Error updating or commenting on issue #${issue.number}: ${error}`);
-                  }
-                }
-              }
-            }
-          } catch (error) {
-            console.error(`Error fetching issues: ${error}`);
-          }

.github/workflows/compile.yaml

@@ -0,0 +1,25 @@
+name: Compile
+
+on:
+  push:
+    branches:
+      - main
+      - test*
+  workflow_dispatch: # Manual trigger added
+
+jobs:
+  build-runspace:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        ref: ${{ github.head_ref }}
+    - name: Compile project
+      shell: pwsh
+      run: |
+        Set-ExecutionPolicy Bypass -Scope Process -Force; ./Compile.ps1
+      continue-on-error: false # Directly fail the job on error, removing the need for a separate check
+    - uses: stefanzweifel/git-auto-commit-action@v5
+      with:
+        commit_message: Compile Winutil
+      if: success()

.github/workflows/createchangelog.yml

@@ -0,0 +1,42 @@
+name: Update update.mb on Release
+
+on:
+  release:
+    types: [published, prereleased]
+  workflow_dispatch:  # Add this line to enable manual triggering
+
+jobs:
+  update-file:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v4
+
+    - name: Get all releases and update update.mb file
+      run: |
+        # Fetch all releases including pre-releases using GitHub CLI
+        gh release list --limit 5 > releases.txt
+        
+        # Extract numeric versions and create update.mb content
+        echo "" > docs/update.mb
+        while read -r line; do
+          tag=$(echo "$line" | awk '{print $1}')
+          name=$(echo "$line" | awk -F'\t' '{print $2}')
+          version_numeric=$(echo "$tag" | grep -o -E '[0-9.]+')
+          body=$(gh release view "$tag" --json body --jq .body)
+          echo "## $version_numeric" >> docs/update.mb
+          echo "Release name: $name" >> docs/update.mb
+          echo "Release body: $body" >> docs/update.mb
+          echo "" >> docs/update.mb
+        done < releases.txt
+
+    - name: Commit and Push Changes
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        git config --global user.name 'github-actions[bot]'
+        git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+        git add docs/update.mb
+        git commit -m "Update update.mb with all releases"
+        git push

.github/workflows/github-pages.yml

@@ -0,0 +1,22 @@
+name: GitHub Pages Deploy
+on:
+  release:
+    types: [published, prereleased]
+  workflow_dispatch: 
+permissions:
+  contents: write
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v4
+        with:
+          python-version: 3.x
+      - uses: actions/cache@v4
+        with:
+          key: ${{ github.ref }}
+          path: .cache
+      - run: pip install mkdocs-material
+      - run: pip install pillow cairosvg
+      - run: mkdocs gh-deploy --force

.github/workflows/issue-slash-commands.yaml

@@ -0,0 +1,43 @@
+name: Close issue on /close
+
+on:
+  issue_comment:
+    types: [created, edited]
+
+jobs:
+  closeIssueOnClose:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: none
+      contents: read
+
+    steps:
+      - name: Check for /close comment
+        id: check_comment
+        run: |
+          if [[ "${{ contains(github.event.comment.body, '/close') }}" == "true" ]]; then
+            echo "comment=true" >> $GITHUB_ENV
+          else
+            echo "comment=false" >> $GITHUB_ENV
+          fi
+
+      - name: Check if the user is allowed
+        id: check_user
+        if: env.comment == 'true'
+        run: |
+          ALLOWED_USERS=("ChrisTitusTech" "og-mrk" "Marterich" "MyDrift-user" "Real-MullaC")
+          if [[ " ${ALLOWED_USERS[@]} " =~ " ${{ github.event.comment.user.login }} " ]]; then
+            echo "user=true" >> $GITHUB_ENV
+          else
+            echo "user=false" >> $GITHUB_ENV
+          fi
+
+      - name: Close issue if conditions are met
+        if: env.comment == 'true' && env.user == 'true'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ISSUE_NUMBER: ${{ github.event.issue.number }}
+        run: |
+          echo Closing the issue...
+          gh issue close $ISSUE_NUMBER --repo ${{ github.repository }}

.github/workflows/pre-release.yaml

@@ -0,0 +1,48 @@
+name: Pre-Release WinUtil
+
+permissions:
+  contents: write
+  actions: read
+
+on:
+  workflow_dispatch: # Manual trigger added
+
+jobs:
+  build-runspace:
+    runs-on: windows-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Extract Version from winutil.ps1
+        id: extract_version
+        run: |
+          $version = (Get-Date -Format "yy.MM.dd")
+          echo "version=$version" >> $env:GITHUB_ENV
+        shell: pwsh
+
+      - name: Create Tag
+        id: create_tag
+        run: |
+          $tagExists = git tag -l $env:VERSION
+          if ($tagExists -eq "") {
+            git tag $env:VERSION
+            git push origin $env:VERSION
+          } else {
+            Write-Host "Tag $env:VERSION already exists, skipping tag creation"
+          }
+        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: "![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 }}

.github/workflows/release.yaml

@@ -1,21 +1,44 @@
-name: Update Branch
+name: Release WinUtil
 
 on:
-  push: 
+  workflow_dispatch: # Manual trigger added
-    branches: 
-      - main
-      - test*
 
 jobs:
   build-runspace:
     runs-on: windows-latest
+    outputs:
+      version: ${{ steps.extract_version.outputs.version }}
     steps:
-    - uses: actions/checkout@v3
+      - name: Checkout Repository
-      with:
+        uses: actions/checkout@v4
-        ref: ${{ github.head_ref }}
+
-    - name: Create local changes
+      - name: Extract Version from winutil.ps1
-      run: |
+        id: extract_version
-        powershell.exe -f Compile.ps1
+        run: |
-    - uses: stefanzweifel/git-auto-commit-action@v4.16.0
+          $version = ''
-      with:
+          Get-Content ./winutil.ps1 -TotalCount 30 | ForEach-Object {
-        commit_message: Compile Winutil
+            if ($_ -match 'Version\s*:\s*(\d{2}\.\d{2}\.\d{2})') {
+              $version = $matches[1]
+              echo "version=$version" >> $GITHUB_OUTPUT
+              break
+            }
+          }
+          if (-not $version) {
+            Write-Error "Version not found in winutil.ps1"
+            exit 1
+          }
+        shell: pwsh
+
+      - name: Create and Upload Release
+        id: create_release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ steps.extract_version.outputs.version }}
+          name: Release ${{ steps.extract_version.outputs.version }}
+          body: "![GitHub Downloads (specific asset, specific tag)](https://img.shields.io/github/downloads/ChrisTitusTech/winutil/${{ steps.extract_version.outputs.version }}/winutil.ps1)"
+          append_body: true
+          files: ./winutil.ps1
+          prerelease: false
+          make_latest: "true"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sponsors.yml

@@ -0,0 +1,25 @@
+name: Generate Sponsors README
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: 30 15 * * 0-6
+permissions:
+  contents: write
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v4
+
+      - name: Generate Sponsors 💖
+        uses: JamesIves/github-sponsors-readme-action@v1
+        with:
+          token: ${{ secrets.PAT }}
+          file: 'README.md'
+
+      - name: Deploy to GitHub Pages 🚀
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          branch: main
+          folder: '.'

.github/workflows/unittests.yaml

@@ -1,14 +1,14 @@
 name: Unit Tests
 
 on:
-  push: 
+  push:
 
 jobs:
   lint:
     name: PS Script Analyzer
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: lint
       uses: devblackops/github-action-psscriptanalyzer@master
       with:
@@ -22,19 +22,19 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Install Pester
       run: |
         Set-ExecutionPolicy -ExecutionPolicy Bypass -Scope Process
-        Install-Module -Name Pester -Force -AllowClobber
+        Install-Module -Name Pester -Force -SkipPublisherCheck -AllowClobber
       shell: pwsh
 
     - name: Run Pester tests
       run: |
         Set-ExecutionPolicy -ExecutionPolicy Bypass -Scope Process
-        Invoke-Pester -Path 'pester/*.Tests.ps1' -EnableExit
+        Invoke-Pester -Path 'pester/*.Tests.ps1' -Output Detailed
-        
+
       shell: pwsh
       env:
         TEMP: ${{ runner.temp }}

.gitignore

@@ -15,6 +15,11 @@ winutil.pdb
 # Folder config file
 [Dd]esktop.ini
 
+# Ignore Generated XAML Files
+xaml/inputApp.xaml
+xaml/inputFeatures.xaml
+xaml/inputTweaks.xaml
+
 # Executables and Configs
 winget.msixbundle
 pester.ps1
@@ -39,3 +44,4 @@ Microsoft.PowerShell.ConsoleHost.dll
 microwin.log
 True
 test.ps1
+winutil.ps1

Compile.ps1

@@ -1,47 +1,143 @@
+param (
+    [switch]$Debug,
+    [switch]$Run
+)
 $OFS = "`r`n"
 $scriptname = "winutil.ps1"
+
 # Variable to sync between runspaces
 $sync = [Hashtable]::Synchronized(@{})
 $sync.PSScriptRoot = $PSScriptRoot
 $sync.configs = @{}
 
-if (Test-Path -Path "$($scriptname)")
+function Update-Progress {
-{
+    param (
-    Remove-Item -Force "$($scriptname)"
+        [Parameter(Mandatory, position=0)]
+        [string]$StatusMessage,
+
+	[Parameter(Mandatory, position=1)]
+	[ValidateRange(0,100)]
+        [int]$Percent,
+
+	[Parameter(position=2)]
+	[string]$Activity = "Compiling"
+    )
+
+    Write-Progress -Activity $Activity -Status $StatusMessage -PercentComplete $Percent
 }
 
-Write-output '
+$header = @"
 ################################################################################################################
 ###                                                                                                          ###
 ### WARNING: This file is automatically generated DO NOT modify this file directly as it will be overwritten ###
 ###                                                                                                          ###
 ################################################################################################################
-' | Out-File ./$scriptname -Append -Encoding ascii
+"@
 
-(Get-Content .\scripts\start.ps1).replace('#{replaceme}',"$(Get-Date -Format yy.MM.dd)") | Out-File ./$scriptname -Append -Encoding ascii
 
+# Create the script in memory.
+Update-Progress "Pre-req: Allocating Memory" 0
+$script_content = [System.Collections.Generic.List[string]]::new()
+
+Update-Progress "Adding: Header" 5
+$script_content.Add($header)
+
+Update-Progress "Adding: Version" 10
+$script_content.Add($(Get-Content .\scripts\start.ps1).replace('#{replaceme}',"$(Get-Date -Format yy.MM.dd)"))
+
+Update-Progress "Adding: Functions" 20
 Get-ChildItem .\functions -Recurse -File | ForEach-Object {
-    Get-Content $psitem.FullName | Out-File ./$scriptname -Append -Encoding ascii
+    $script_content.Add($(Get-Content $psitem.FullName))
+    }
+Update-Progress "Adding: Config *.json" 40
+Get-ChildItem .\config | Where-Object {$psitem.extension -eq ".json"} | ForEach-Object {
+
+    $json = (Get-Content $psitem.FullName).replace("'","''")
+
+    # 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") {
+        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
+        }
+    }
+
+    # The replace at the end is required, as without it the output of 'converto-json' will be somewhat weird for Multiline Strings
+    # Most Notably is the scripts in some json files, making it harder for users who want to review these scripts, which're found in the compiled script
+    $json = ($jsonAsObject | convertto-json -Depth 3).replace('\r\n',"`r`n")
+
+    $sync.configs.$($psitem.BaseName) = $json | convertfrom-json
+    $script_content.Add($(Write-output "`$sync.configs.$($psitem.BaseName) = '$json' `| convertfrom-json" ))
 }
 
 $xaml = (Get-Content .\xaml\inputXML.xaml).replace("'","''")
-Write-output "`$inputXML =  '$xaml'" | Out-File ./$scriptname -Append -Encoding ascii
-
-Get-ChildItem .\config | Where-Object {$psitem.extension -eq ".json"} | ForEach-Object {
-    $json = (Get-Content $psitem.FullName).replace("'","''")
-    $sync.configs.$($psitem.BaseName) = $json | convertfrom-json
-    Write-output "`$sync.configs.$($psitem.BaseName) = '$json' `| convertfrom-json" | Out-File ./$scriptname -Append -Encoding ascii
-}
 
 # Dot-source the Get-TabXaml function
 . .\functions\private\Get-TabXaml.ps1
 
-## Xaml Manipulation
+Update-Progress "Building: Xaml " 75
-$tabColumns = Get-TabXaml "applications" 5
+$appXamlContent = Get-TabXaml "applications" 5
-$tabColumns | Out-File -FilePath ".\xaml\inputApp.xaml" -Encoding ascii
+$tweaksXamlContent = Get-TabXaml "tweaks"
-$tabColumns = Get-TabXaml "tweaks"
+$featuresXamlContent = Get-TabXaml "feature"
-$tabColumns | Out-File -FilePath ".\xaml\inputTweaks.xaml" -Encoding ascii
-$tabColumns = Get-TabXaml "feature"
-$tabColumns | Out-File -FilePath ".\xaml\inputFeatures.xaml" -Encoding ascii
 
-Get-Content .\scripts\main.ps1 | Out-File ./$scriptname -Append -Encoding ascii
+
+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'"))
+
+$script_content.Add($(Get-Content .\scripts\main.ps1))
+
+if ($Debug){
+    Update-Progress "Writing debug files" 95
+    $appXamlContent | Out-File -FilePath ".\xaml\inputApp.xaml" -Encoding ascii
+    $tweaksXamlContent | Out-File -FilePath ".\xaml\inputTweaks.xaml" -Encoding ascii
+    $featuresXamlContent | Out-File -FilePath ".\xaml\inputFeatures.xaml" -Encoding ascii
+}
+else {
+    Update-Progress "Removing temporary files" 99
+    Remove-Item ".\xaml\inputApp.xaml" -ErrorAction SilentlyContinue
+    Remove-Item ".\xaml\inputTweaks.xaml" -ErrorAction SilentlyContinue
+    Remove-Item ".\xaml\inputFeatures.xaml" -ErrorAction SilentlyContinue
+}
+
+Set-Content -Path $scriptname -Value ($script_content -join "`r`n") -Encoding ascii
+Write-Progress -Activity "Compiling" -Completed
+
+if ($run){
+    try {
+        Start-Process -FilePath "pwsh" -ArgumentList ".\$scriptname"
+    }
+    catch {
+        Start-Process -FilePath "powershell" -ArgumentList ".\$scriptname"
+    }
+
+}

KnownIssues.md

@@ -1,33 +0,0 @@
-## Known Issues and Fixes
-- Windows taking longer to shut down:
-  - [#69](https://github.com/ChrisTitusTech/winutil/issues/69) Turn on fast startup: Press Windows key + R, then type:
-  ```
-  control /name Microsoft.PowerOptions /page pageGlobalSettings
-  ```
-  - If that doesn't work, Disable Hibernation: Press Windows Key+X and select 'PowerShell (Admin)' (Windows 10) or 'Windows Terminal (Admin)' (Windows 11) and enter:
-  ```
-  powercfg /H off
-  ```
-- [#69](https://github.com/ChrisTitusTech/winutil/issues/69) [95](https://github.com/ChrisTitusTech/winutil/issues/95) [#232](https://github.com/ChrisTitusTech/winutil/issues/232) Windows Search does not work: Enable Background Apps
-- [#198](https://github.com/ChrisTitusTech/winutil/issues/198) Xbox Game Bar Activation Broken: Set the Xbox Accessory Management Service to Automatic
-```
-Get-Service -Name "XboxGipSvc" | Set-Service -StartupType Automatic
-```
-- Windows Insider Builds not installing: Telemetry needs to be enabled
-```
-Set-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection" -Name "AllowTelemetry" -Type DWord -Value 0
-Set-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\DataCollection" -Name "AllowTelemetry" -Type DWord -Value 0
- ```
-- Winget requires interaction on first run: Manually type 'y' and 'enter' into the PowerShell console to continue
-- (Windows 11) Quick Settings no longer works: Launch the Script and click 'Enable Action Center'
-- Explorer no longer launches: Go to Control Panel, File Explorer Options, Change the 'Open File Explorer to' option to 'This PC'.
-- Script doesn't run/PowerShell crashes:
-  1. Press Windows Key+X and select 'PowerShell (Admin)' (Windows 10) or 'Windows Terminal (Admin)' (Windows 11)
-  2. Run:
-  ```
-  Set-ExecutionPolicy Unrestricted -Scope Process -Force
-  ```
-  3. Run:
-  ```
-  irm christitus.com/win | iex
-  ```

README.md

@@ -1,16 +1,20 @@
 # Chris Titus Tech's Windows Utility
 
-This utility is a compilation of Windows tasks I perform on each Windows system I use. It is meant to streamline *installs*, debloat with *tweaks*, troubleshoot with *config*, and fix Windows *updates*. I am extremely picky about any contributions to keep this project clean and efficient. 
+[![Version](https://img.shields.io/github/v/release/ChrisTitusTech/winutil?color=%230567ff&label=Latest%20Release&style=for-the-badge)](https://github.com/ChrisTitusTech/winutil/releases/latest)
+![GitHub Downloads (specific asset, all releases)](https://img.shields.io/github/downloads/ChrisTitusTech/winutil/winutil.ps1?label=Total%20Downloads&style=for-the-badge)
+[![](https://dcbadge.limes.pink/api/server/https://discord.gg/RUbZUZyByQ?theme=default-inverted&style=for-the-badge)](https://discord.gg/RUbZUZyByQ)
 
-![screen-install](screen-install.png)
+This utility is a compilation of Windows tasks I perform on each Windows system I use. It is meant to streamline *installs*, debloat with *tweaks*, troubleshoot with *config*, and fix Windows *updates*. I am extremely picky about any contributions to keep this project clean and efficient.
 
-## Usage
+![screen-install](./docs/assets/screen-install.png)
+
+## 💡 Usage
 
 Winutil must be run in Admin mode because it performs system-wide tweaks. To achieve this, open PowerShell or Windows Terminal as an administrator. Here are a few ways to do it:
 
 1. **Right-Click Method:**
    - Right-click on the start menu.
-   - Choose "PowerShell As Admin" (for Windows 10) or "Windows Terminal As Admin" (for Windows 11).
+   - Choose "Windows PowerShell (Admin)" (for Windows 10) or "Terminal (Admin)" (for Windows 11).
 
 2. **Search and Launch Method:**
    - Press the Windows key.
@@ -20,124 +24,43 @@ Winutil must be run in Admin mode because it performs system-wide tweaks. To ach
 
 ### Launch Command
 
-#### Simple way
+#### Stable Branch
 
+```ps1
+irm "https://christitus.com/win" | iex
 ```
-iwr -useb https://christitus.com/win | iex
+#### Dev Branch
-```
-or by executing: 
-```
-irm https://christitus.com/win | iex
-```
-Courtesy of the issue raised at: [#144](/../../issues/144)
 
-if for some reason this site is not reachable from your country please try running it directly from github
+```ps1
-
+irm "https://christitus.com/windev" | iex
-```
-irm https://raw.githubusercontent.com/ChrisTitusTech/winutil/main/winutil.ps1 | iex
 ```
 
-#### Automation
+If you have Issues, refer to [Known Issues](https://christitustech.github.io/winutil/KnownIssues/)
 
-Some features are avaliable through automation. This allows you to save your config file pass it to Winutil walk away and come back to a finished system. Here is how you can set it up currently with Winutil >24.01.15
+## 🎓 Documentation
 
-1. On the Install Tab, click "Get Installed", this will get all installed apps **supported by Winutil** on the system
+### [WinUtil Official Documentation](https://christitustech.github.io/winutil/)
-  ![GetInstalled](/wiki/Get-Installed.png)
+
-2. Click on the Settings cog in the upper right corner and chose Export, chose file file and location, this will export the setting file.
+### [YouTube Tutorial](https://www.youtube.com/watch?v=6UQZ5oQg8XA)
-  ![SettingsExport](/wiki/Settings-Export.png)
+
-3. Copy this file to a USB or somewhere you can use after Windows installation.
+### [ChrisTitus.com Article](https://christitus.com/windows-tool/)
-4. Use Microwin tab to create a custom Windows image.
-5. Install the Windows image.
-6. In the new Windows, Open PowerShell in the admin mode and run command to automatically apply tweaks and install apps from the config file.
-```
-irm https://christitus.com/win -Config [path-to-your-config] -Run | iex
-```
-7. Have a cup of coffee! Come back when it's done.
 
 
-## Issues:
+## 💖 Support
-
-- If you are unable to resolve christitus.com/win and are getting  errors launching the tool, it might be due to India blocking GitHub's content domain and preventing downloads. You may use a VPN or change your DNS provider to Google/Cloudflare/etc.
-
-Source: <https://timesofindia.indiatimes.com/gadgets-news/github-content-domain-blocked-for-these-indian-users-reports/articleshow/96687992.cms>
-
-- Windows Security (formerly Defender) and other anti-virus software are known to block the script. The script gets flagged due to the fact that it requires administrator privileges & makes drastic system changes.
-
-- If you are having TLS 1.2 issues, or are having trouble resolving `christitus.com/win` then run with the following command:
-
-```
-[Net.ServicePointManager]::SecurityProtocol=[Net.SecurityProtocolType]::Tls12;iex(New-Object Net.WebClient).DownloadString('https://raw.githubusercontent.com/ChrisTitusTech/winutil/main/winutil.ps1')
-```
-
-If you are still having issues try changing your DNS provider to 1.1.1.1 || 1.0.0.1 or 8.8.8.8 || 8.8.4.4
-
-## Support
 - To morally and mentally support the project, make sure to leave a ⭐️!
 - EXE Wrapper for $10 @ https://www.cttstore.com/windows-toolbox
 
-## Tutorial
+## 💖 Sponsors
 
-[![Watch the video](https://img.youtube.com/vi/6UQZ5oQg8XA/hqdefault.jpg)](https://www.youtube.com/watch?v=6UQZ5oQg8XA)
+These are the sponsors that help keep this project alive with monthly contributions.
 
-## Overview
+<!-- 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/TDWillingham"><img src="https://github.com/TDWillingham.png" width="60px" alt="MetalliDan28" /></a><a href="https://github.com/frankolivares"><img src="https://github.com/frankolivares.png" width="60px" alt="" /></a><a href="https://github.com/Cube707"><img src="https://github.com/Cube707.png" width="60px" alt="Jan Wille" /></a><a href="https://github.com/Owen-3456"><img src="https://github.com/Owen-3456.png" width="60px" alt="Owen" /></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="" /></a><a href="https://github.com/djones369"><img src="https://github.com/djones369.png" width="60px" alt="Dave Jones" /></a><!-- sponsors -->
 
-- Install
+## 🏅 Thanks to all Contributors
-  - Install Selection: Organize programs by category and facilitate installation by enabling users to select programs and initiate the installation process with a single click.
-  
-  - Upgrade All: Upgrade all existing programs to their latest versions, ensuring users have the most up-to-date and feature-rich software. 
-  
-  - Uninstall Selection: Effortlessly uninstall selected programs, providing users with a streamlined way to remove unwanted software from their system.
-  
-  - Get Installed: Retrieve a comprehensive list of installed programs on the system, offering users visibility into the software currently installed on their computer.
-  
-  - Import / Export: Enable users to import or export the selection list of programs, allowing them to save their preferred program configurations or share them with others. This feature promotes convenience and flexibility in managing program selections across different systems.
- 
-- Tweaks
-  - Recommended Selection: Provides pre-defined templates tailored for desktop, laptop, and minimal configurations, allowing users to select recommended settings and optimizations specific to their system type.
-
-  - Essential Tweaks: Offers a collection of essential tweaks aimed at improving system performance, privacy, and resource utilization. These tweaks include creating a system restore point, disabling telemetry, Wi-Fi Sense, setting services to manual, disabling location tracking, and HomeGroup, among others.
-
-  - Misc. Tweaks: Encompasses a range of various tweaks to further optimize the system. These tweaks include enabling/disabling power throttling, enabling num lock on startup, removing Cortana and Edge, disabling User Account Control (UAC), notification panel, and configuring TPM during updates, among others.
-
-  - Additional Tweaks: Introduces various other tweaks such as enabling dark mode, changing DNS settings, adding an Ultimate Performance mode, and creating shortcuts for WinUtil tools. These tweaks provide users with additional customization options to tailor their system to their preferences.
-
-- Config
-  - Features: Allows users to easily install various essential components and features to enhance their Windows experience. These features include installing .NET Frameworks, enabling Hyper-V virtualization, enabling legacy media support for Windows Media Player and DirectPlay, enabling NFS (Network File System) for network file sharing, and enabling Windows Subsystem for Linux (WSL) for running Linux applications on Windows.
-
-  - Fixes: Provides a range of helpful fixes to address common issues and improve system stability. This includes setting up autologon for seamless login experiences, resetting Windows updates to resolve update-related problems, performing a system corruption scan to detect and repair corrupted files, and resetting network settings to troubleshoot network connectivity issues.
-
-  - Legacy Windows Panels: Includes access to legacy Windows panels from Windows 7, allowing users to access familiar and powerful tools. These panels include Control Panel for managing system settings, Network Connections for configuring network adapters and connections, Power Panel for adjusting power and sleep settings, Sound Settings for managing audio devices and settings, System Properties for viewing and modifying system information, and User Accounts for managing user profiles and account settings.
-
-
-- Updates:
-  - Default (Out of Box) Settings: Provides the default settings that come with Windows for updates.
-  
-  - Security (Recommended) Settings: Offers recommended settings, including a slight delay of feature updates by 2 years and installation of security updates 4 days after release.
-
-  - Disable All Updates (Not Recommended!): Allows users to disable all Windows updates, but it's not recommended due to potential security risks.
-
-
-Video and Written Article walkthrough @ <https://christitus.com/windows-tool/>
-
-## Issues
-
-If you encounter any challenges or problems with the script, I kindly request that you submit them via the "Issues" tab on the GitHub repository. By filling out the provided template, you can provide specific details about the issue, allowing me to promptly address any bugs or consider feature requests.
-
-## Contribute Code
-
-To contribute new code, please ensure that it is submitted to the **TEST BRANCH**. Please note that merges will not be performed directly on the MAIN branch.
-
-When creating pull requests, it is essential to thoroughly document all changes made. This includes documenting any additions made to the tweaks section and ensuring that corresponding undo measures are in place to remove the newly added tweaks if necessary. Failure to adhere to this format may result in denial of the pull request. Additionally, comprehensive documentation is required for all code changes. Any code lacking sufficient documentation may also be denied.
-
-By following these guidelines, we can maintain a high standard of quality and ensure that the codebase remains organized and well-documented.
-
-NOTE: When creating a function please include "WPF" or "WinUtil" in the name so that it can be loaded into the runspace.
-
-## Thanks to all Contributors
 Thanks a lot for spending your time helping Winutil grow. Thanks a lot! Keep rocking 🍻.
 
 [![Contributors](https://contrib.rocks/image?repo=ChrisTitusTech/winutil)](https://github.com/ChrisTitusTech/winutil/graphs/contributors)
 
-## GitHub Stats
+## 📊 GitHub Stats
 
 ![Alt](https://repobeats.axiom.co/api/embed/aad37eec9114c507f109d34ff8d38a59adc9503f.svg "Repobeats analytics image")

config/dns.json

@@ -1,30 +1,50 @@
 {
     "Google":{
         "Primary": "8.8.8.8",
-        "Secondary": "8.8.4.4"
+        "Secondary": "8.8.4.4",
+        "Primary6": "2001:4860:4860::8888",
+        "Secondary6": "2001:4860:4860::8844"
     },
     "Cloudflare":{
         "Primary": "1.1.1.1",
-        "Secondary": "1.0.0.1"
+        "Secondary": "1.0.0.1",
+        "Primary6": "2606:4700:4700::1111",
+        "Secondary6": "2606:4700:4700::1001"
     },
     "Cloudflare_Malware":{
         "Primary": "1.1.1.2",
-        "Secondary": "1.0.0.2"
+        "Secondary": "1.0.0.2",
+        "Primary6": "2606:4700:4700::1112",
+        "Secondary6": "2606:4700:4700::1002"
     },
     "Cloudflare_Malware_Adult":{
         "Primary": "1.1.1.3",
-        "Secondary": "1.0.0.3"
+        "Secondary": "1.0.0.3",
-    },
+        "Primary6": "2606:4700:4700::1113",
-    "Level3":{
+        "Secondary6": "2606:4700:4700::1003"
-        "Primary": "4.2.2.2",
-        "Secondary": "4.2.2.1"
     },
     "Open_DNS":{
         "Primary": "208.67.222.222",
-        "Secondary": "208.67.220.220"
+        "Secondary": "208.67.220.220",
+        "Primary6": "2620:119:35::35",
+        "Secondary6": "2620:119:53::53"
     },
     "Quad9":{
         "Primary": "9.9.9.9",
-        "Secondary": "149.112.112.112"
+        "Secondary": "149.112.112.112",
+        "Primary6": "2620:fe::fe",
+        "Secondary6": "2620:fe::9"
+    },
+    "AdGuard_Ads_Trackers":{
+        "Primary": "94.140.14.14",
+        "Secondary": "94.140.15.15",
+        "Primary6": "2a10:50c0::ad1:ff",
+        "Secondary6": "2a10:50c0::ad2:ff"
+    },
+    "AdGuard_Ads_Trackers_Malware_Adult":{
+        "Primary": "94.140.14.15",
+        "Secondary": "94.140.15.16",
+        "Primary6": "2a10:50c0::bad1:ff",
+        "Secondary6": "2a10:50c0::bad2:ff"
     }
 }

config/feature.json

@@ -184,90 +184,104 @@
     "category": "Features",
     "panel": "1",
     "Order": "a060_",
-    "Type": "150"
+    "Type": "Button",
+    "ButtonWidth": "300"
   },
   "WPFPanelAutologin": {
     "Content": "Set Up Autologin",
     "category": "Fixes",
     "Order": "a040_",
     "panel": "1",
-    "Type": "300"
+    "Type": "Button",
+    "ButtonWidth": "300"
   },
   "WPFFixesUpdate": {
     "Content": "Reset Windows Update",
     "category": "Fixes",
     "panel": "1",
     "Order": "a041_",
-    "Type": "300"
+    "Type": "Button",
+    "ButtonWidth": "300"
   },
   "WPFFixesNetwork": {
     "Content": "Reset Network",
     "category": "Fixes",
     "Order": "a042_",
     "panel": "1",
-    "Type": "300"
+    "Type": "Button",
+    "ButtonWidth": "300"
   },
   "WPFPanelDISM": {
     "Content": "System Corruption Scan",
     "category": "Fixes",
     "panel": "1",
     "Order": "a043_",
-    "Type": "300"
+    "Type": "Button",
+    "ButtonWidth": "300"
   },
   "WPFFixesWinget": {
     "Content": "WinGet Reinstall",
     "category": "Fixes",
     "panel": "1",
     "Order": "a044_",
-    "Type": "300"
+    "Type": "Button",
+    "ButtonWidth": "300"
   },
   "WPFRunAdobeCCCleanerTool": {
     "Content": "Remove Adobe Creative Cloud",
     "category": "Fixes",
     "panel": "1",
     "Order": "a045_",
-    "Type": "300"
+    "Type": "Button",
+    "ButtonWidth": "300"
   },
   "WPFPanelnetwork": {
     "Content": "Network Connections",
     "category": "Legacy Windows Panels",
     "panel": "2",
-    "Type": "200"
+    "Type": "Button",
+    "ButtonWidth": "300"
   },
   "WPFPanelcontrol": {
     "Content": "Control Panel",
     "category": "Legacy Windows Panels",
     "panel": "2",
-    "Type": "200"
+    "Type": "Button",
+    "ButtonWidth": "300"
   },
   "WPFPanelpower": {
     "Content": "Power Panel",
     "category": "Legacy Windows Panels",
     "panel": "2",
-    "Type": "200"
+    "Type": "Button",
+    "ButtonWidth": "300"
   },
   "WPFPanelregion": {
     "Content": "Region",
     "category": "Legacy Windows Panels",
     "panel": "2",
-    "Type": "200"
+    "Type": "Button",
+    "ButtonWidth": "300"
   },
   "WPFPanelsound": {
     "Content": "Sound Settings",
     "category": "Legacy Windows Panels",
     "panel": "2",
-    "Type": "200"
+    "Type": "Button",
+    "ButtonWidth": "300"
   },
   "WPFPanelsystem": {
     "Content": "System Properties",
     "category": "Legacy Windows Panels",
     "panel": "2",
-    "Type": "200"
+    "Type": "Button",
+    "ButtonWidth": "300"
   },
   "WPFPaneluser": {
     "Content": "User Accounts",
     "category": "Legacy Windows Panels",
     "panel": "2",
-    "Type": "200"
+    "Type": "Button",
+    "ButtonWidth": "300"
   }
 }

config/helperscript.ps1

@@ -1,399 +0,0 @@
-# This file is meant to assist in building out the json files inside this folder.
-
-#===========================================================================
-# applications.json
-#===========================================================================
-
-<#
-    Applications.json
-    -----------------
-    This file holds all the install commands to install the applications.
-    This file has the ability to expect multiple frameworks per checkbox.
-    You can also add multiple install commands by separating them with ;
-
-    The structure of the json is as follows
-
-{
-    "Name of Button": {
-        "winget": "Winget command"
-        "choco": "Chocolatey command"
-    },
-}
-
-Example:
-
-{
-    "WPFInstalladobe": {
-        "winget": "Adobe.Acrobat.Reader.64-bit"
-        "choco": "adobereader"
-    },
-    "WPFInstalladvancedip": {
-        "winget": "Famatech.AdvancedIPScanner"
-        "choco": "advanced-ip-scanner"
-    }
-}
-
-#>
-
-# Modify the variables and run his code. It will import the current file and add your addition. From there you can create a pull request.
-#------Do not delete WPF------
-
-$NameofButton = "WPF" + ""
-$WingetCommand = ""
-$ChocoCommand = ""
-
-$ButtonToAdd = New-Object psobject
-$jsonfile = Get-Content ./config/applications.json | ConvertFrom-Json
-
-# Remove if already exists
-if($jsonfile.$NameofButton){
-    $jsonfile.psobject.Properties.remove($NameofButton)
-}
-
-Add-Member -InputObject $ButtonToAdd -MemberType NoteProperty -Name "Winget" -Value $WingetCommand
-Add-Member -InputObject $ButtonToAdd -MemberType NoteProperty -Name "choco" -Value $ChocoCommand
-Add-Member -InputObject $jsonfile.install -MemberType NoteProperty -Name $NameofButton -Value $ButtonToAdd
-
-$jsonfile | ConvertTo-Json | Out-File ./config/applications.json
-
-#===========================================================================
-# feature.json
-#===========================================================================
-
-<#
-    feature.json
-    -----------------
-    This file holds all the windows commands to install specific features (IE Hyper-v)
-
-    The structure of the json is as follows
-
-{
-    "Name of Button": [
-        "Array of",
-        "commands"
-    ]
-}
-
-Example:
-{
-    "Featurewsl": [
-        "VirtualMachinePlatform",
-        "Microsoft-Windows-Subsystem-Linux"
-    ],
-    "Featurenfs": [
-        "ServicesForNFS-ClientOnly",
-        "ClientForNFS-Infrastructure",
-        "NFS-Administration"
-    ]
-}
-#>
-
-# Modify the variables and run his code. It will import the current file and add your addition. From there you can create a pull request.
-
-$NameofButton = ""
-$commands = @(
-
-)
-
-$jsonfile = Get-Content ./config/feature.json | ConvertFrom-Json
-
-# Remove if already exists
-if($jsonfile.$NameofButton){
-    $jsonfile.psobject.Properties.remove($NameofButton)
-}
-
-Add-Member -InputObject $jsonfile -MemberType NoteProperty -Name $NameofButton -Value $commands
-
-$jsonfile | ConvertTo-Json | Out-File ./config/feature.json
-
-#===========================================================================
-# preset.json
-#===========================================================================
-
-<#
-    preset.json
-    -----------------
-    This file holds all check boxes you wish to check when clicking a preset button in the tweaks section.
-
-    The structure of the json is as follows
-
-{
-    "Name of Button": [
-        "Array of",
-        "checkboxes to check"
-    ]
-}
-
-Example:
-{
-    "laptop": [
-        "EssTweaksAH",
-        "EssTweaksDVR",
-        "EssTweaksHome",
-        "EssTweaksLoc",
-        "EssTweaksOO",
-        "EssTweaksRP",
-        "EssTweaksServices",
-        "EssTweaksStorage",
-        "EssTweaksTele",
-        "EssTweaksWifi",
-        "MiscTweaksLapPower",
-        "MiscTweaksLapNum"
-    ],
-    "minimal": [
-        "EssTweaksHome",
-        "EssTweaksOO",
-        "EssTweaksRP",
-        "EssTweaksServices",
-        "EssTweaksTele"
-    ]
-}
-#>
-
-# Modify the variables and run his code. It will import the current file and add your addition. From there you can create a pull request.
-
-$NameofButton = "WPF" + ""
-$commands = @(
-
-)
-
-$jsonfile = Get-Content ./config/preset.json | ConvertFrom-Json
-
-# Remove if already exists
-if($jsonfile.$NameofButton){
-    $jsonfile.psobject.Properties.remove($NameofButton)
-}
-
-Add-Member -InputObject $jsonfile -MemberType NoteProperty -Name $NameofButton -Value $commands
-
-$jsonfile | ConvertTo-Json | Out-File ./config/preset.json
-
-#===========================================================================
-# tweaks.json
-#===========================================================================
-
-<#
-    tweaks.json
-    -----------------
-    This file holds all the tweaks needed to make modifications to windows. This file is the most complicated so modify with care.
-
-    The structure of the json is as follows
-
-{
-    "Name of button": {
-        "registry" : [
-            {
-                "Path":  "Path in registry",
-                "Name":  "Name of Registry key",
-                "Type": "Item type",
-                "Value":  "Value to modify",
-                "OriginalValue": "value to reset"
-            }
-        ],
-        "service" : [
-            {
-                "Name":  "Name of service",
-                "StartupType":  "Startup type to set",
-                "OriginalType": "Startup type to reset"
-            }
-        ],
-        "ScheduledTask" : [
-            {
-                "Name":  "Path to scheduled task",
-                "State":  "State to set",
-                "OriginalState": "State to reset"
-            }
-        ],
-        "appx": [
-            List of appx,
-            files to uninstall
-        ],
-        "InvokeScript": [
-            "Script to make modifications not possible with the above types
-            Special care needs to be taken here as converting from json to a scriptblock
-            can cause weird issues. Please look at the example below to get an idea of how things should work"
-        ],
-        "UndoScript": [
-            "Same as above however is meant to undo what you did above"
-        ]
-    }
-}
-
-Example:
-
-{
-    EssTweaksAH": {
-        "registry" : [
-            {
-                "Path":  "HKLM:\\SOFTWARE\\Policies\\Microsoft\\Windows\\System",
-                "Name":  "EnableActivityFeed",
-                "Type": "DWord",
-                "Value":  "0",
-                "OriginalValue": "1"
-            },
-            {
-                "Path":  "HKLM:\\SOFTWARE\\Policies\\Microsoft\\Windows\\System",
-                "Name":  "PublishUserActivities",
-                "Type": "DWord",
-                "Value":  "0",
-                "OriginalValue": "1"
-            }
-        ]
-    },
-    "EssTweaksHome": {
-        "service" : [
-            {
-                "Name":  "HomeGroupListener",
-                "StartupType":  "Manual",
-                "OriginalType": "Automatic"
-            },
-            {
-                "Name":  "HomeGroupProvider",
-                "StartupType":  "Manual",
-                "OriginalType": "Automatic"
-            }
-        ]
-    },
-    "EssTweaksTele": {
-        "ScheduledTask" : [
-            {
-                "Name":  "Microsoft\\Windows\\Application Experience\\Microsoft Compatibility Appraiser",
-                "State":  "Disabled",
-                "OriginalState": "Enabled"
-            },
-            {
-                "Name":  "Microsoft\\Windows\\Application Experience\\ProgramDataUpdater",
-                "State":  "Disabled",
-                "OriginalState": "Enabled"
-            }
-        ]
-    },
-    "EssTweaksDeBloat": {
-        "appx": [
-            "Microsoft.Microsoft3DViewer",
-            "Microsoft.AppConnector"
-        ]
-    },
-    "EssTweaksOO": {
-        "InvokeScript": [
-            "Import-Module BitsTransfer
-            Start-BitsTransfer -Source \"https://raw.githubusercontent.com/ChrisTitusTech/win10script/master/ooshutup10.cfg\" -Destination C:\\Windows\\Temp\\ooshutup10.cfg
-            Start-BitsTransfer -Source \"https://dl5.oo-software.com/files/ooshutup10/OOSU10.exe\" -Destination C:\\Windows\\Temp\\OOSU10.exe
-            C:\\Windows\\Temp\\OOSU10.exe C:\\Windows\\Temp\\ooshutup10.cfg /quiet"
-        ]
-    }
-}
-
-#>
-
-# Modify the variables and run his code. It will import the current file and add your addition. From there you can create a pull request.
-# Make sure to uncomment the sections you which to add.
-
-#$Registry = @(
-#    # To add more repeat this separated by a comma
-#    @{
-#        Path = ""
-#        Name = ""
-#        Type = ""
-#        Value = ""
-#        OriginalValue = ""
-#    }
-#)
-
-#$Service = @(
-#    # To add more repeat this separated by a comma
-#    @{
-#        Name = ""
-#        StartupType = ""
-#        OriginalType = ""
-#    }
-#)
-
-#$ScheduledTask = @(
-#    # To add more repeat this separated by a comma
-#    @{
-#        Name = ""
-#        State = ""
-#        OriginalState = ""
-#    }
-#)
-
-#$Appx = @(
-#    ""
-#)
-
-#$InvokeScript = @(
-#    ""
-#)
-
-#$UndoScript = @(
-#    ""
-#)
-
-$NameofButton = "WPF" + ""
-
-$ButtonToAdd = New-Object psobject
-$jsonfile = Get-Content ./config/tweaks.json | ConvertFrom-Json
-
-# Remove if already exists
-if($jsonfile.$NameofButton){
-    $jsonfile.psobject.Properties.remove($NameofButton)
-}
-
-if($Registry){Add-Member -InputObject $ButtonToAdd -MemberType NoteProperty -Name "registry" -Value $Registry}
-if($Service){Add-Member -InputObject $ButtonToAdd -MemberType NoteProperty -Name "service" -Value $Service}
-if($ScheduledTask){Add-Member -InputObject $ButtonToAdd -MemberType NoteProperty -Name "ScheduledTask" -Value $ScheduledTask}
-if($Appx){Add-Member -InputObject $ButtonToAdd -MemberType NoteProperty -Name "Appx" -Value $Appx}
-if($InvokeScript){Add-Member -InputObject $ButtonToAdd -MemberType NoteProperty -Name "InvokeScript" -Value $InvokeScript}
-if($UndoScript){Add-Member -InputObject $ButtonToAdd -MemberType NoteProperty -Name "UndoScript" -Value $UndoScript}
-
-Add-Member -InputObject $jsonfile -MemberType NoteProperty -Name $NameofButton -Value $ButtonToAdd
-
-($jsonfile | ConvertTo-Json -Depth 5).replace('\r\n',"`r`n") | Out-File ./config/tweaks.json
-
-#===========================================================================
-# dns.json
-#===========================================================================
-
-<#
-    dns.json
-    -----------------
-    This file holds all the DNS entries.
-
-    The structure of the json is as follows
-
-{
-    "DNS Provider": [
-        "Primary": "IP address",
-        "Secondary": "IP address"
-    ]
-}
-
-Example:
-{
-    "Cloudflare":{
-        "Primary": "1.1.1.1",
-        "Secondary": "1.0.0.1"
-    }
-}
-#>
-
-# Modify the variables and run his code. It will import the current file and add your addition. From there you can create a pull request.
-
-$NameofProvider = "" -replace " ","_"
-$IPAddress = @{
-    "Primary" = "0.0.0.0"
-    "Secondary" = "0.0.0.0"
-}
-
-$ButtonToAdd = New-Object psobject
-$jsonfile = Get-Content ./config/dns.json | ConvertFrom-Json
-
-# Remove if already exists
-if($jsonfile.$NameofProvider){
-    $jsonfile.psobject.Properties.remove($NameofProvider)
-}
-
-Add-Member -InputObject $jsonfile -MemberType NoteProperty -Name $NameofProvider -Value $IPAddress
-
-($jsonfile | ConvertTo-Json -Depth 5).replace('\r\n',"`r`n") | Out-File ./config/dns.json

config/preset.json

@@ -1,32 +1,25 @@
 {
-  "desktop": [
+  "Standard": [
     "WPFTweaksAH",
+    "WPFTweaksConsumerFeatures",
     "WPFTweaksDVR",
     "WPFTweaksHiber",
     "WPFTweaksHome",
     "WPFTweaksLoc",
-    "WPFTweaksOO",
     "WPFTweaksServices",
     "WPFTweaksStorage",
     "WPFTweaksTele",
     "WPFTweaksWifi",
-    "WPFMiscTweaksPower"
+    "WPFTweaksDiskCleanup",
+    "WPFTweaksDeleteTempFiles",
+    "WPFTweaksEndTaskOnTaskbar",
+    "WPFTweaksRestorePoint",
+    "WPFTweaksTeredo",
+    "WPFTweaksPowershell7Tele"
   ],
-  "laptop": [
+  "Minimal": [
-    "WPFTweaksAH",
+    "WPFTweaksConsumerFeatures",
-    "WPFTweaksDVR",
     "WPFTweaksHome",
-    "WPFTweaksLoc",
-    "WPFTweaksOO",
-    "WPFTweaksServices",
-    "WPFTweaksStorage",
-    "WPFTweaksTele",
-    "WPFTweaksWifi",
-    "WPFMiscTweaksLapPower"
-  ],
-  "minimal": [
-    "WPFTweaksHome",
-    "WPFTweaksOO",
     "WPFTweaksServices",
     "WPFTweaksTele"
   ]

config/themes.json

@@ -1,14 +1,51 @@
 {
-        "Classic":  {
+    "Classic":  {
+                    "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",
+
                     "ComboBoxBackgroundColor":  "#FFFFFF",
                     "LabelboxForegroundColor":  "#000000",
                     "MainForegroundColor":  "#000000",
                     "MainBackgroundColor":  "#FFFFFF",
                     "LabelBackgroundColor":  "#FAFAFA",
                     "LinkForegroundColor":  "#000000",
-                    "LinkHoverForegroundColor":  "#000000",                    
+                    "LinkHoverForegroundColor":  "#000000",
                     "GroupBorderBackgroundColor":  "#000000",
                     "ComboBoxForegroundColor":  "#000000",
+
+                    "ButtonFontSize":   "12",
+                    "ButtonFontFamily": "Arial",
+                    "ButtonWidth":      "200",
+                    "ButtonHeight":     "25",
+                    "ConfigTabButtonFontSize":      "16",
+
+                    "SearchBarWidth":               "200",
+                    "SearchBarHeight":              "25",
+                    "SearchBarTextBoxFontSize":     "16",
+                    "SearchBarClearButtonFontSize": "14",
+
                     "ButtonInstallBackgroundColor":  "#FFFFFF",
                     "ButtonTweaksBackgroundColor":  "#FFFFFF",
                     "ButtonConfigBackgroundColor":  "#FFFFFF",
@@ -23,42 +60,149 @@
                     "ButtonBackgroundMouseoverColor":  "#C2C2C2",
                     "ButtonBackgroundSelectedColor":  "#F0F0F0",
                     "ButtonForegroundColor":  "#000000",
+                    "ToggleButtonOnColor":  "#2e77ff",
+
                     "ButtonBorderThickness":  "1",
                     "ButtonMargin":  "1",
                     "ButtonCornerRadius": "2",
-                    "ToggleButtonHeight": "25",
                     "BorderColor": "#000000",
                     "BorderOpacity": "0.2",
                     "ShadowPulse": "Forever"
-                },                
+                },
     "Matrix":  {
-                   "ComboBoxBackgroundColor":  "#000000",
+                    "CustomDialogFontSize":       "12",
-                   "LabelboxForegroundColor":  "#FFEE58",
+                    "CustomDialogFontSizeHeader": "14",
-                   "MainForegroundColor":  "#9CCC65",
+                    "CustomDialogIconSize":       "25",
-                   "MainBackgroundColor":  "#000000",
+                    "CustomDialogWidth":          "400",
-                   "LabelBackgroundColor":  "#000000",
+                    "CustomDialogHeight":         "200",
-                   "LinkForegroundColor":  "#add8e6",
+
-                   "LinkHoverForegroundColor":  "#FFFFFF",
+                    "FontSize":         "12",
-                   "ComboBoxForegroundColor":  "#FFEE58",
+                    "FontFamily":       "Arial",
-                   "ButtonInstallBackgroundColor":  "#222222",
+                    "FontSizeHeading":  "14",
-                   "ButtonTweaksBackgroundColor":  "#333333",
+                    "HeaderFontFamily": "Consolas, Monaco",
-                   "ButtonConfigBackgroundColor":  "#444444",
+
-                   "ButtonUpdatesBackgroundColor":  "#555555",
+                    "CheckBoxBulletDecoratorFontSize": "14",
-                   "ButtonInstallForegroundColor":  "#FFFFFF",
+                    "CheckBoxMargin": "15,0,0,2",
-                   "ButtonTweaksForegroundColor":  "#FFFFFF",
+
-                   "ButtonConfigForegroundColor":  "#FFFFFF",
+                    "TabButtonFontSize":      "14",
-                   "ButtonUpdatesForegroundColor":  "#FFFFFF",
+                    "TabButtonWidth":         "100",
-                   "ButtonBackgroundColor":  "#000019",
+                    "TabButtonHeight":        "25",
-                   "ButtonBackgroundPressedColor":  "#FFFFFF",
+                    "TabRowHeightInPixels":   "50",
-                   "ButtonBackgroundMouseoverColor":  "#A55A64",
+                    "IconFontSize":     "14",
-                   "ButtonBackgroundSelectedColor":  "#FF5733",
+                    "IconButtonSize":   "35",
-                   "ButtonForegroundColor":  "#9CCC65",
+                    "WinUtilIconSize":        "Auto",
-                   "ButtonBorderThickness":  "1",
+                    "SettingsIconFontSize":   "18",
-                   "ButtonMargin":  "1",
+
-                   "ButtonCornerRadius": "2",
+                    "MicroWinLogoSize": "10",
-                   "ToggleButtonHeight": "25",
+
-                   "BorderColor": "#FFAC1C",
+                    "ComboBoxBackgroundColor":  "#000000",
-                   "BorderOpacity": "0.8",
+                    "LabelboxForegroundColor":  "#FFEE58",
-                   "ShadowPulse": "0:0:3"
+                    "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":  "#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",
+
+                    "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"
                }
 }

docs/KnownIssues.md

@@ -0,0 +1,177 @@
+## Known Issues and Fixes
+
+### Launch Issues:
+
+- Windows Security (formerly Defender) and other anti-virus software are known to block the script. The script gets flagged due to the fact that it requires administrator privileges & makes drastic system changes.
+  - If possible: Allow script in Anti-Virus software settings.
+
+- If you are having TLS 1.2 issues, or are having trouble resolving `christitus.com/win` then run with the following command:
+
+```ps1
+[Net.ServicePointManager]::SecurityProtocol=[Net.SecurityProtocolType]::Tls12;iex(New-Object Net.WebClient).DownloadString('https://github.com/ChrisTitusTech/winutil/releases/latest/download/winutil.ps1')
+```
+
+- If you are unable to resolve `christitus.com/win` and are getting  errors launching the tool, it might be due to India blocking GitHub's content domain and preventing downloads.
+  - Source: <https://timesofindia.indiatimes.com/gadgets-news/github-content-domain-blocked-for-these-indian-users-reports/articleshow/96687992.cms>
+
+If you are still having issues try using a **VPN**, or changing your **DNS provider** to:
+
+| `1.1.1.1` | `1.0.0.1` | or  | `8.8.8.8` | `8.8.4.4` |
+|---------|---------|-----|---------|---------|
+
+- Script doesn't run/PowerShell crashes:
+  1. Press Windows Key+X and select 'PowerShell (Admin)' (Windows 10) or 'Windows Terminal (Admin)' (Windows 11)
+  2. Run:
+  ```ps1
+  Set-ExecutionPolicy Unrestricted -Scope Process -Force
+  ```
+  3. Run:
+  ```ps1
+  irm christitus.com/win | iex
+  ```
+
+### Other Issues:
+
+- Windows taking longer to shut down:
+  - [#69](https://github.com/ChrisTitusTech/winutil/issues/69) Turn on fast startup: Press Windows key + R, then type:
+  ```
+  control /name Microsoft.PowerOptions /page pageGlobalSettings
+  ```
+  - If that doesn't work, Disable Hibernation: Press Windows Key+X and select 'PowerShell (Admin)' (Windows 10) or 'Windows Terminal (Admin)' (Windows 11) and enter:
+  ```ps1
+  powercfg /H off
+  ```
+- [#69](https://github.com/ChrisTitusTech/winutil/issues/69) [95](https://github.com/ChrisTitusTech/winutil/issues/95) [#232](https://github.com/ChrisTitusTech/winutil/issues/232) Windows Search does not work: Enable Background Apps
+- [#198](https://github.com/ChrisTitusTech/winutil/issues/198) Xbox Game Bar Activation Broken: Set the Xbox Accessory Management Service to Automatic
+```ps1
+Get-Service -Name "XboxGipSvc" | Set-Service -StartupType Automatic
+```
+
+- Winget requires interaction on first run: Manually type 'y' and 'enter' into the PowerShell console to continue
+- (Windows 11) Quick Settings no longer works: Launch the Script and click 'Enable Action Center'
+
+- Explorer no longer launches: Go to Control Panel, File Explorer Options, Change the 'Open File Explorer to' option to 'This PC'.
+
+### Battery drains too fast.
+When your battery on the laptop drains too fast, please perform these steps and report the results back to the Winutil community.
+
+1. **Check Battery Health:**
+   - Open a Command Prompt as an administrator.
+   - Run the following command to generate a battery report:
+     ```powershell
+     powercfg /batteryreport /output "C:\battery_report.html"
+     ```
+   - Open the generated HTML report to review information about battery health and usage.
+
+2. **Review Power Settings:**
+   - Go to "Settings" > "System" > "Power & sleep."
+   - Adjust power plan settings based on your preferences and usage patterns.
+   - Click on "Additional power settings" to access advanced power settings.
+
+3. **Identify Power-Hungry Apps:**
+   - Right-click on the taskbar and select "Task Manager."
+   - Navigate to the "Processes" tab to identify applications with high CPU or memory usage.
+   - Consider closing unnecessary background applications.
+
+4. **Update Drivers:**
+   - Visit your laptop manufacturer's website or use Windows Update to check for driver updates.
+   - Ensure graphics, chipset, and other essential drivers are up to date.
+
+5. **Check for Windows Updates:**
+   - Go to "Settings" > "Update & Security" > "Windows Update."
+   - Check for and install any available updates for your operating system.
+
+6. **Reduce Screen Brightness:**
+   - Adjust screen brightness based on your preferences and lighting conditions.
+   - Go to "Settings" > "System" > "Display" to adjust brightness.
+
+7. **Battery Saver Mode:**
+   - Go to "Settings" > "System" > "Battery."
+   - Turn on "Battery saver" to limit background activity and conserve power.
+
+8. **Check Power Usage in Settings:**
+   - Go to "Settings" > "System" > "Battery" > "Battery usage by app."
+   - Review the list of apps and their power usage.
+
+9. **Check Background Apps:**
+   - Go to "Settings" > "Privacy" > "Background apps."
+   - Disable unnecessary apps running in the background.
+
+10. **Use Powercfg for Analysis:**
+    - Open a Command Prompt as an administrator.
+    - Run the following command to analyze energy usage and generate a report:
+      ```powershell
+      powercfg /energy /output "C:\energy_report.html"
+      ```
+    - Open the generated HTML report to identify energy consumption patterns.
+
+11. **Review Event Viewer:**
+    - Open Event Viewer by searching for it in the Start menu.
+    - Navigate to "Windows Logs" > "System."
+    - Look for events with the source "Power-Troubleshooter" to identify power-related events.
+
+12. **Check Wake-up Sources:**
+    - Open a Command Prompt as an administrator.
+    - Use the command `powercfg /requests` to identify processes preventing sleep.
+    - Check Task Scheduler for tasks waking up the computer.
+    - Use the command `powercfg /waketimers` to view active wake timers.
+
+13. **Resource Monitor:**
+    - Open Resource Monitor from the Start menu.
+    - Navigate to the "CPU" tab and identify processes with high CPU usage.
+
+14. **Windows Settings - Activity History:**
+    - In "Settings," go to "Privacy" > "Activity history."
+    - Turn off "Let Windows collect my activities from this PC."
+
+15. **Network Adapters:**
+    - Open Device Manager by searching for it in the Start menu.
+    - Locate your network adapter, right-click, and go to "Properties."
+    - Under the "Power Management" tab, uncheck the option that allows the device to wake the computer.
+
+16. **Review Installed Applications:**
+    - Manually review installed applications by searching for "Add or remove programs" in the Start menu.
+    - Check settings/preferences of individual applications for power-related options.
+    - Uninstall unnecessary or problematic software.
+
+By following these detailed instructions, you should be able to thoroughly diagnose and address battery drain issues on your Windows laptop. Adjust settings as needed to optimize power management and improve battery life.
+
+### Troubleshoot errors during Microwin usage
+
+#### Error `0x80041031`
+
+This error code typically indicates an issue related to Windows Management Instrumentation (WMI). Here are a few steps you can try to resolve the issue:
+
+1. **Reboot Your Computer:**
+   Sometimes, a simple reboot can resolve temporary issues. Restart your computer and try mounting the ISO again.
+
+2. **Check for System Corruption:**
+   Run the System File Checker (SFC) utility to scan and repair system files that may be corrupted.
+   ```powershell
+   sfc /scannow
+   ```
+
+3. **Update Your System:**
+   Make sure your operating system is up-to-date. Check for Windows updates and install any pending updates.
+
+4. **Check WMI Service:**
+   Ensure that the Windows Management Instrumentation (WMI) service is running. You can do this through the Services application:
+   - Press `Win + R` to open the Run dialog.
+   - Type `services.msc` and press Enter.
+   - Locate "Windows Management Instrumentation" in the list.
+   - Make sure to set its status to "Running" and the startup type to "Automatic."
+
+5. **Check for Security Software Interference:**
+   Security software can sometimes interfere with WMI operations. Temporarily disable your antivirus or security software and check if the issue persists.
+
+6. **Event Viewer:**
+   Check the Event Viewer for more detailed error information. Look for entries related to the `80041031` error and check if there are any additional details that can help identify the cause.
+
+   - Press `Win + X` and select "Event Viewer."
+   - Navigate to "Windows Logs" -> "Application" or "System."
+   - Look for entries with the source related to WMI or the application use to mount the ISO.
+
+7. **ISO File Integrity:**
+   Ensure that the ISO file you are trying to mount is uncorrupted. Try mounting a different ISO file to see if the issue persists.
+
+If the problem persists after trying these steps, additional troubleshooting is required. Consider seeking assistance from Microsoft support or community forums for more specific guidance based on your system configuration and the software you use to mount the ISO.

docs/contribute.md

@@ -0,0 +1,57 @@
+# How to Contribute?
+
+## Issues
+
+* If you encounter any challenges or problems with the script, I kindly request that you submit them via the "Issues" tab on the GitHub repository. By filling out the provided template, you can provide specific details about the issue, allowing me (and others in the community) to promptly address any bugs, or consider feature requests.
+
+## Contribute Code
+
+* Pull Requests are now handled directly on the **MAIN branch**. This was done since we can now select specific releases to launch via releases in GitHub.
+
+* If you're doing code changes, then you can submit a PR to `main` branch, but I am very selective about these.
+
+> [!WARNING]
+> Do not use a code formatter, massive amounts of line changes, and make multiple feature changes.
+> EACH FEATURE CHANGE SHOULD BE IT'S OWN Pull Request!
+
+* When creating pull requests, it is essential to thoroughly document all changes made. This includes, but not limited to, documenting any additions made to the `tweaks` section and corresponding `undo tweak`, so users are able to remove the newly added tweaks if necessary, and comprehensive documentation is required for all code changes, document your changes and briefly explain why you made your changes in your Pull Request Description. Failure to adhere to this format may result in denial of the pull request. Additionally, Any code lacking sufficient documentation may also be denied.
+
+* By following these guidelines, we can maintain a high standard of quality and ensure that the codebase remains organized and well-documented.
+
+> [!NOTE]
+> When creating a function, please include "WPF" or "WinUtil" in the file name so it can be loaded into the runspace.
+
+## Walk through
+
+### Fork the Repo
+* Fork the WinUtil Repository [here](https://github.com/ChrisTitusTech/winutil) to create a copy that will be available in your Repository-list.
+![Fork](assets/ForkButton.png)
+
+### Clone the Fork
+* While you can make your changes directly through the Web, we recommend cloning the repo to your device to test your fork easily.
+* Using the application GitHub Desktop (available in WinUtil) you can easily manage your repos locally. You can do it using other tools like git-cli (available in WinUtil), we recommend GitHub Desktop for ease of use.
+* Install GitHub Desktop if not already installed
+* Log in using the same GitHub account u used to fork WinUtil
+* Choose the fork under "Your Repositories" and press "clone {repo name}"
+* Create a new Branch and name it something relatable to your changes,
+
+* Now you can modify WinUtil to your liking using your prefered text editor.
+
+
+### Testing your changes
+* To test to see if your changes work as intended run following commands in a powershell teminal:
+
+* Change the directory where you are running the commands to the forked project.
+* `cd {path to the folder with the compile.ps1}`
+* Run following command to compile and run Winutil
+* `.\Compile.ps1 -run`
+* After seeing that your changes work properly feel free to commit the changes to the repository and make a PR, for help on that follow the documentation below.
+
+### Commiting the changes
+* Commit your changes once you are fine with the result
+* Push the changes to "upload" them to your fork on github.com.
+
+### Making a PR
+* To make a PR on your repo under a new branch linking to the main branch a button will show and say Preview and Create pull request. Click that button and fill in all information that is provided on the template. Once all the information is filled in correctly check your PR to make sure there is not a WinUtil.ps1 file attached to the PR. Once everything is good make the PR and wait for Chris (The Maintainer) to accept or deny your PR. Once it is accepted in by Chris you will be able to see your changes in the /windev build.
+* If you do not see your feature in the main /win build that is fine. As all new changes go into the /windev build to make sure everything is working ok before going fully public.
+* Congrats you just submitted your first PR. Thank you so much for contributing to WinUtil.

docs/faq.md

@@ -0,0 +1,4 @@
+# FAQ's
+
+## How do I uninstall WinUtil?
+* You do not have to uninstall WinUtil. As it is a script you run from Powershell it only loads into your RAM. This means as soon as you close WinUtil it will be deleted off your system.

docs/index.md

@@ -0,0 +1,12 @@
+# Welcome to Chris Titus WinUtil Official Documentation!
+
+[![](https://dcbadge.limes.pink/api/server/https://discord.gg/RUbZUZyByQ)](https://discord.gg/RUbZUZyByQ)
+
+## Running
+
+There are 4 ways to run WinUtil. The 4 ways goes as follows:
+
+* `irm christitus.com/win | iex` - Runs WinUtil from ChrisTitus's website using the latest Full Releases.
+* `irm https://github.com/ChrisTitusTech/winutil/releases/latest/download/winutil.ps1 | iex` - Runs WinUtil from github using the latest Full Release.
+* `irm christitus.com/windev | iex` - Runs WinUtil from ChrisTitus website using the latest Pre-Release.
+* `irm https://github.com/ChrisTitusTech/winutil/releases/latest/download/windev.ps1 | iex` - Runs WinUtil from github using the latest Pre-Release.

docs/updates.md

@@ -0,0 +1,3 @@
+# Update Log
+
+#

docs/userguide.md

@@ -0,0 +1,159 @@
+# User Guide
+
+## Overview
+* short one
+
+
+## Walkthrough
+
+### Program
+
+#### Installation & Updates
+* To install programs select the programs you wish to install or update like the picture below.
+![Program Install](assets/ProgramInstall.png)
+* Once you have selected the programs you wish to install click the select Install/Upgrade Selected button as seen below.
+![Program Install Button](assets/ProgramInstallButton.png)
+
+#### Upgrade All
+* Press the button to upgrade all installed programs that are supported by WinGet, there is no selection needed.
+
+#### Uninstall
+* To uninstall programs select the programs you wish to uninstall like the picture below.
+![Program Uninstall](assets/ProgramInstall.png)
+* Once you have selected the programs you wish to uninstall click the select Uninstall Selected button as seen below.
+![Program Uninstall Button](assets/ProgramUninstall.png)
+
+#### Get Installed
+* Checks for installed programs that are supported by WinGet and selects them in the Utility.
+
+#### Clear Selection
+* Clears ur current selection so no program is checked.
+
+### Tweaks
+
+#### Tweaks Addition
+* To enable tweaks on your system select Tweaks at the top next to Install.
+* Then you can select what tweaks you want adding to your system. We do have some presets you can select from at the top you can see this in the picture below.
+![Tweaks Screen](assets/TweaksScreen.PNG)
+* After you have chosen your tweaks click the Run Tweaks button at the bottom of the screen.
+
+#### Tweaks Removal
+* To disable tweaks on your system select Tweaks at the top next to Install.
+* Then you can select what tweaks you want removing from your system.
+* After you have chosen your tweaks you want to remove click the Undo Selected Tweaks button at the bottom of the screen.
+
+#### Essential Tweaks
+* The Tweaks under the Essential
+
+#### Advanced Tweaks - CAUTION
+
+#### O&O Shutup
+
+#### DNS
+
+#### Customize Preferences
+
+#### Performance Plans
+
+#### Shortcuts
+
+
+![Tweaks Screen](assets/TweaksScreen.PNG)
+
+### Config
+
+#### Features
+* Install the most used Windows Features by checking the checkbox and clicking "Install Features" to install them
+
+#### Fixes
+* Quick Fixes for your system if you are having Issues.
+
+* Set Up Autologin
+* Reset Windows Update
+* Reset Network
+* System Corruption Scan
+* WinGet Reinstall
+* Remove Adobe Creative Cloud
+
+#### Legacy Windows Panels
+
+### Updates | Not working rn
+
+### MicroWin
+
+**MicroWin** lets you customize your Windows 10 and 11 installation images by debloating them however you want.
+
+![MicroWin](assets/MicroWinScreen.png)
+
+#### Basic usage
+
+1. Specify the source Windows ISO to customize
+
+	* If you don't have a Windows ISO file prepared, you can download it using the Media Creation Tool for the respective Windows version. [Here](https://go.microsoft.com/fwlink/?linkid=2156295) is the Windows 11 version, and [here](https://go.microsoft.com/fwlink/?LinkId=2265055) is the Windows 10 version
+
+2. Configure the debloat process
+3. Specify the target location for the new ISO file
+4. Let the magic happen!
+
+**NOTE:** this feature is still in development and you may encounter some issues with the generated images. If that happens, don't hesitate to report an issue!
+
+#### Options
+
+* **Download oscdimg.exe from CTT GitHub repo** will grab a OSCDIMG executable from the GitHub repository instead of a Chocolatey package
+
+	OSCDIMG is the tool that lets the program create ISO images. Typically, you would find this in the [Windows Assessment and Deployment Kit](https://learn.microsoft.com/en-us/windows-hardware/get-started/adk-install)
+
+* Selecting a scratch directory will copy the contents of the ISO file to the directory you specify instead of an automatically generated folder on 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
+
+
+##### 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 were permanent ones or had 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 case 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. On that regard, don't install AVs with bad reputation 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
+
+* **Inject drivers** will add the drivers in the folder that you specify to the target Windows image
+* **Import drivers from 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 of 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
+
+* **Copy to Ventoy** will copy the target ISO file to any USB drive with [Ventoy](https://ventoy.net/en/index.html) installed
+
+	Ventoy is a solution that lets you boot to any ISO file stored in a drive. Think of it as having multiple bootable USBs in one. Do note though that your drive needs to have enough free space for the target ISO file
+
+
+## Automation
+
+* Some features are available through automation. This allows you to save your config file pass it to Winutil walk away and come back to a finished system. Here is how you can set it up currently with Winutil >24.01.15
+
+* On the Install Tab, click "Get Installed", this will get all installed apps **supported by Winutil** on the system
+![GetInstalled](assets/Get-Installed.png)
+* Click on the Settings cog in the upper right corner and chose Export, chose file file and location, this will export the setting file.
+![SettingsExport](assets/Settings-Export.png)
+* Copy this file to a USB or somewhere you can use after Windows installation.
+* Use Microwin tab to create a custom Windows image.
+* Install the Windows image.
+* In the new Windows, Open PowerShell in the admin mode and run command to automatically apply tweaks and install apps from the config file.
+* ``` iex "& { $(irm christitus.com/win) } -Config [path-to-your-config] -Run" ```
+* Have a cup of coffee! Come back when it's done.

edgeremoval.bat

@@ -37,7 +37,7 @@ function global:prepare_edge {
   ri 'Registry::HKEY_Users\S-1-5-21*\Software\Classes\microsoft-edge' -recurse -force -ea 0
   ri 'Registry::HKEY_Users\S-1-5-21*\Software\Classes\MSEdgeHTM' -recurse -force -ea 0
   ni "HKLM:\SOFTWARE\Classes\microsoft-edge\shell\open\command" -force -ea 0 >''
-  sp "HKLM:\SOFTWARE\Classes\microsoft-edge\shell\open\command" '(Default)' "`"$MS`" --single-argument %%1" -force -ea 0 
+  sp "HKLM:\SOFTWARE\Classes\microsoft-edge\shell\open\command" '(Default)' "`"$MS`" --single-argument %%1" -force -ea 0
   ni "HKLM:\SOFTWARE\Classes\MSEdgeHTM\shell\open\command" -force -ea 0 >''
   sp "HKLM:\SOFTWARE\Classes\MSEdgeHTM\shell\open\command" '(Default)' "`"$MS`" --single-argument %%1" -force -ea 0
   foreach ($p in 'HKLM:\SOFTWARE\Policies','HKLM:\SOFTWARE','HKLM:\SOFTWARE\WOW6432Node') {
@@ -54,7 +54,7 @@ function global:prepare_edge {
 }
 ## helper for webview reinstall - restore webexperience (widgets) if available
 function global:prepare_webview {
-  $cfg = @{Register=$true; ForceApplicationShutdown=$true; ForceUpdateFromAnyVersion=$true; DisableDevelopmentMode=$true} 
+  $cfg = @{Register=$true; ForceApplicationShutdown=$true; ForceUpdateFromAnyVersion=$true; DisableDevelopmentMode=$true}
   dir "$env:ProgramFiles\WindowsApps\MicrosoftWindows.Client.WebExperience*\AppxManifest.xml" -rec -ea 0 | Add-AppxPackage @cfg
   dir "$env:SystemRoot\SystemApps\Microsoft.Win32WebViewHost*\AppxManifest.xml" -rec -ea 0 | Add-AppxPackage @cfg
   kill -name explorer -ea 0; if ((get-process -name 'explorer' -ea 0) -eq $null) {start explorer}
@@ -66,7 +66,7 @@ $D1=[uri].module.gettype('System.Diagnostics.Process')."GetM`ethods"(42) |where
 
 ## 3 shut edge & webview clone stuff down and gather install paths
 $shut = 'explorer','Widgets','widgetservice','msedgewebview2','MicrosoftEdge*','chredge','msedge','edge'
-$shut+= 'msteams','msfamily','WebViewHost','Clipchamp' 
+$shut+= 'msteams','msfamily','WebViewHost','Clipchamp'
 cd $env:systemdrive; taskkill /im explorer.exe /f 2>&1 >''; foreach ($p in $shut) {kill -name $p -force -ea 0}
 prepare_edge
 ## clear win32 uninstall block
@@ -93,15 +93,15 @@ $users = @('S-1-5-18'); if (test-path $store) {$users += $((dir $store -ea 0 |wh
 foreach ($choice in $remove_appx) { if ('' -eq $choice.Trim()) {continue}
   foreach ($appx in $($provisioned |where {$_.PackageName -like "*$choice*"})) {
     $next = !1; foreach ($no in $skip) {if ($appx.PackageName -like "*$no*") {$next = !0}} ; if ($next) {continue}
-    $PackageName = $appx.PackageName; $PackageFamilyName = ($appxpackage |where {$_.Name -eq $appx.DisplayName}).PackageFamilyName 
+    $PackageName = $appx.PackageName; $PackageFamilyName = ($appxpackage |where {$_.Name -eq $appx.DisplayName}).PackageFamilyName
-    ni "$store\Deprovisioned\$PackageFamilyName" -force >''; $PackageFamilyName  
+    ni "$store\Deprovisioned\$PackageFamilyName" -force >''; $PackageFamilyName
     foreach ($sid in $users) {ni "$store\EndOfLife\$sid\$PackageName" -force >''} ; $eol += $PackageName
     dism /online /set-nonremovableapppolicy /packagefamily:$PackageFamilyName /nonremovable:0 >''
     remove-appxprovisionedpackage -packagename $PackageName -online -allusers >''
   }
   foreach ($appx in $($appxpackage |where {$_.PackageFullName -like "*$choice*"})) {
     $next = !1; foreach ($no in $skip) {if ($appx.PackageFullName -like "*$no*") {$next = !0}} ; if ($next) {continue}
-    $PackageFullName = $appx.PackageFullName; 
+    $PackageFullName = $appx.PackageFullName;
     ni "$store\Deprovisioned\$appx.PackageFamilyName" -force >''; $PackageFullName
     foreach ($sid in $users) {ni "$store\EndOfLife\$sid\$PackageFullName" -force >''} ; $eol += $PackageFullName
     dism /online /set-nonremovableapppolicy /packagefamily:$PackageFamilyName /nonremovable:0 >''
@@ -125,16 +125,16 @@ foreach ($PF in $env:ProgramFiles,${env:ProgramFiles(x86)}) { if (test-path "$PF
   if ($also_remove_webview -eq 1) { foreach ($hk in 'HKCU:','HKLM:') { foreach ($wow in '','\Wow6432Node') {
     ri "$hk\SOFTWARE${wow}\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge Update" -rec -force -ea 0 }}
     ri "$PF\Microsoft\EdgeUpdate" -rec -force -ea 0; Unregister-ScheduledTask -TaskName MicrosoftEdgeUpdate* -Confirm:$false -ea 0
-  }  
+  }
 }}
 $appdata = $([Environment]::GetFolderPath('ApplicationData'))
 ri "$appdata\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar\Tombstones\Microsoft Edge.lnk" -force
 ri "$appdata\Microsoft\Internet Explorer\Quick Launch\Microsoft Edge.lnk" -force
 
-## undo eol unblock trick to prevent latest cumulative update (LCU) failing 
+## undo eol unblock trick to prevent latest cumulative update (LCU) failing
 foreach ($sid in $users) { foreach ($PackageName in $eol) {ri "$store\EndOfLife\$sid\$PackageName" -force >''} }
 
-## set (almost) useless policies to prevent unsolicited reinstalls 
+## set (almost) useless policies to prevent unsolicited reinstalls
 foreach ($p in 'HKLM:\SOFTWARE\Policies','HKLM:\SOFTWARE','HKLM:\SOFTWARE\WOW6432Node') {
   ni "$p\Microsoft\EdgeUpdate" -force >''
   sp "$p\Microsoft\EdgeUpdate" 'InstallDefault' 0 -type Dword -force

edgeremoval.ps1

@@ -15,11 +15,6 @@ if ($also_remove_webview -eq 1) {
 }
 
 # Administrative Privileges Check
-
-# Get the 'SetPrivilege' method from System.Diagnostics.Process type
-$setPrivilegeMethod = [System.Diagnostics.Process].GetMethod('SetPrivilege', [System.Reflection.BindingFlags]::NonPublic -bor [System.Reflection.BindingFlags]::Static)
-
-# List of privileges to set
 $privileges = @(
     'SeSecurityPrivilege',
     'SeTakeOwnershipPrivilege',
@@ -27,44 +22,34 @@ $privileges = @(
     'SeRestorePrivilege'
 )
 
-# Invoke the method for each privilege
 foreach ($privilege in $privileges) {
-    $setPrivilegeMethod.Invoke($null, @($privilege, 2))
+    [System.Diagnostics.Process]::SetPrivilege($privilege, 2)
 }
 
 # Edge Removal Procedures
-
-# Define processes to shut down
 $processesToShutdown = @(
     'explorer', 'Widgets', 'widgetservice', 'msedgewebview2', 'MicrosoftEdge*', 'chredge',
     'msedge', 'edge', 'msteams', 'msfamily', 'WebViewHost', 'Clipchamp'
 )
 
-# Kill explorer process
 Stop-Process -Name "explorer" -Force -ErrorAction SilentlyContinue
-
-# Kill the processes from the list
 $processesToShutdown | ForEach-Object {
     Stop-Process -Name $_ -Force -ErrorAction SilentlyContinue
 }
 
-# Set path for Edge executable
 $MS = ($env:ProgramFiles, ${env:ProgramFiles(x86)})[[Environment]::Is64BitOperatingSystem] + '\Microsoft\Edge\Application\msedge.exe'
 
-# Clean up certain registry entries
 Remove-Item -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\msedge.exe" -Recurse -ErrorAction SilentlyContinue
 Remove-Item -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\ie_to_edge_stub.exe" -Recurse -ErrorAction SilentlyContinue
 Remove-Item -Path 'Registry::HKEY_Users\S-1-5-21*\Software\Classes\microsoft-edge' -Recurse -ErrorAction SilentlyContinue
 Remove-Item -Path 'Registry::HKEY_Users\S-1-5-21*\Software\Classes\MSEdgeHTM' -Recurse -ErrorAction SilentlyContinue
 
-# Create new registry entries
 New-Item -Path "HKLM:\SOFTWARE\Classes\microsoft-edge\shell\open\command" -Force -ErrorAction SilentlyContinue
 Set-ItemProperty -Path "HKLM:\SOFTWARE\Classes\microsoft-edge\shell\open\command" -Name '(Default)' -Value "`"$MS`" --single-argument %%1" -Force -ErrorAction SilentlyContinue
 
 New-Item -Path "HKLM:\SOFTWARE\Classes\MSEdgeHTM\shell\open\command" -Force -ErrorAction SilentlyContinue
 Set-ItemProperty -Path "HKLM:\SOFTWARE\Classes\MSEdgeHTM\shell\open\command" -Name '(Default)' -Value "`"$MS`" --single-argument %%1" -Force -ErrorAction SilentlyContinue
 
-# Remove certain registry properties
 $registryPaths = @('HKLM:\SOFTWARE\Policies', 'HKLM:\SOFTWARE', 'HKLM:\SOFTWARE\WOW6432Node')
 $edgeProperties = @('InstallDefault', 'Install{56EB18F8-B008-4CBD-B6D2-8C97FE7E9062}', 'Install{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}')
 foreach ($path in $registryPaths) {
@@ -84,7 +69,6 @@ foreach ($base in $registryBases) {
     }
 }
 
-# Clear specific registry keys
 $registryPaths = @('HKCU:', 'HKLM:')
 $nodes = @('', '\Wow6432Node')
 foreach ($regPath in $registryPaths) {
@@ -97,7 +81,6 @@ foreach ($regPath in $registryPaths) {
     }
 }
 
-# Locate setup.exe and ie_to_edge_stub.exe
 $foldersToSearch = @('LocalApplicationData', 'ProgramFilesX86', 'ProgramFiles') | ForEach-Object {
     [Environment]::GetFolderPath($_)
 }
@@ -112,7 +95,6 @@ foreach ($folder in $foldersToSearch) {
               Where-Object { $_.FullName -notlike '*EdgeWebView*' }
 }
 
-# Create directory and copy ie_to_edge_stub.exe to it
 $destinationDir = "$env:SystemDrive\Scripts"
 New-Item -Path $destinationDir -ItemType Directory -ErrorAction SilentlyContinue | Out-Null
 
@@ -125,342 +107,147 @@ foreach ($bhoFile in $bhoFiles) {
 }
 
 ## Work on Appx Removals
-
-# Retrieve AppX provisioned packages and all AppX packages
 $provisioned = Get-AppxProvisionedPackage -Online
 $appxpackage = Get-AppxPackage -AllUsers
-
-# Initialize empty array for EndOfLife packages
 $eol = @()
 
-# Define user SIDs and retrieve them from the registry
+$store = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Store'
-$store = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore'
+$storeP = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Store\InstalledApplications'
-$users = @('S-1-5-18')
+foreach ($app in $appxpackage) {
-if (Test-Path $store) {
+    $name = $app.Name
-    $users += (Get-ChildItem $store -ErrorAction SilentlyContinue | Where-Object { $_.PSChildName -like '*S-1-5-21*' }).PSChildName
+    if ($app.Name -eq "Microsoft.Edge") {
-}
+        $eol += $name
-
+    } elseif ($app.Name -eq "Microsoft.EdgeBeta" -or $app.Name -eq "Microsoft.EdgeDev" -or $app.Name -eq "Microsoft.EdgeCanary" -or $app.Name -eq "Microsoft.MicrosoftEdge") {
-# Process AppX packages for removal
+        $eol += $name
-foreach ($choice in $remove_appx) {
-    if ([string]::IsNullOrWhiteSpace($choice)) { continue }
-
-    # Process provisioned packages
-    $provisioned | Where-Object { $_.PackageName -like "*$choice*" } | ForEach-Object {
-        if ($skip -Contains $_.PackageName) { return }
-
-        $PackageName = $_.PackageName
-        $PackageFamilyName = ($appxpackage | Where-Object { $_.Name -eq $_.DisplayName }).PackageFamilyName 
-
-        # Add registry entries
-        New-Item -Path "$store\Deprovisioned\$PackageFamilyName" -Force -ErrorAction SilentlyContinue | Out-Null
-        $users | ForEach-Object {
-            New-Item -Path "$store\EndOfLife\$_\$PackageName" -Force -ErrorAction SilentlyContinue | Out-Null
-        }
-        $eol += $PackageName
-
-        # Modify non-removable app policy and remove package
-        dism /online /set-nonremovableapppolicy /packagefamily:$PackageFamilyName /nonremovable:0 | Out-Null
-        Remove-AppxProvisionedPackage -PackageName $PackageName -Online -AllUsers | Out-Null
-    }
-
-    # Process all AppX packages
-    $appxpackage | Where-Object { $_.PackageFullName -like "*$choice*" } | ForEach-Object {
-        if ($skip -Contains $_.PackageFullName) { return }
-
-        $PackageFullName = $_.PackageFullName
-
-        # Add registry entries
-        New-Item -Path "$store\Deprovisioned\$_.PackageFamilyName" -Force -ErrorAction SilentlyContinue | Out-Null
-        $users | ForEach-Object {
-            New-Item -Path "$store\EndOfLife\$_\$PackageFullName" -Force -ErrorAction SilentlyContinue | Out-Null
-        }
-        $eol += $PackageFullName
-
-        # Modify non-removable app policy and remove package
-        dism /online /set-nonremovableapppolicy /packagefamily:$PackageFamilyName /nonremovable:0 | Out-Null
-        Remove-AppxPackage -Package $PackageFullName -AllUsers | Out-Null
     }
 }
 
-## Run Edge setup uninstaller
+$eolApps = $provisioned | Where-Object { $eol -contains $_.DisplayName }
 
-foreach ($setup in $edges) {
+foreach ($edge in $eolApps) {
-    if (Test-Path $setup) {
+    $edgeName = $edge.DisplayName
-        $target = if ($setup -like '*EdgeWebView*') { "--msedgewebview" } else { "--msedge" }
+    if (-not ($skip -contains $edgeName)) {
-        
-        $removalArgs = "--uninstall $target --system-level --verbose-logging --force-uninstall"
-        
-        Write-Host "$setup $removalArgs"
-        
         try {
-            Start-Process -FilePath $setup -ArgumentList $removalArgs -Wait
+            Remove-AppxProvisionedPackage -Online -PackageName $edgeName -ErrorAction SilentlyContinue
-        } catch {
+        } catch { }
-            # You may want to add logging or other error handling here.
+    }
-        }
+}
-        
+
-        while ((Get-Process -Name 'setup', 'MicrosoftEdge*' -ErrorAction SilentlyContinue).Path -like '*\Microsoft\Edge*') {
+foreach ($edge in $appxpackage) {
-            Start-Sleep -Seconds 3
+    $edgeName = $edge.Name
+    if ($eol -contains $edgeName) {
+        if (-not ($skip -contains $edgeName)) {
+            try {
+                Remove-AppxPackage -Package $edgeName -AllUsers -ErrorAction SilentlyContinue
+            } catch { }
         }
     }
 }
 
-## Cleanup
+## Redirect shortcuts
+$shortcut_path = "$env:Public\Desktop"
+$shortcut_file = 'Microsoft Edge.lnk'
+$full_path = Join-Path -Path $shortcut_path -ChildPath $shortcut_file
 
-# Define necessary paths and variables
+if (Test-Path $full_path) {
-$edgePaths = $env:ProgramFiles, ${env:ProgramFiles(x86)}
+    Remove-Item -Path $full_path -Force -ErrorAction SilentlyContinue
-$appDataPath = [Environment]::GetFolderPath('ApplicationData')
+}
 
-# Uninstall Microsoft Edge Update
+$shortcut_path = "$env:ProgramData\Microsoft\Windows\Start Menu\Programs"
-foreach ($path in $edgePaths) {
+$shortcut_file = 'Microsoft Edge.lnk'
-    $edgeUpdateExe = "$path\Microsoft\EdgeUpdate\MicrosoftEdgeUpdate.exe"
+$full_path = Join-Path -Path $shortcut_path -ChildPath $shortcut_file
-    if (Test-Path $edgeUpdateExe) {
+
-        Write-Host $edgeUpdateExe /uninstall
+if (Test-Path $full_path) {
-        Start-Process -FilePath $edgeUpdateExe -ArgumentList '/uninstall' -Wait
+    Remove-Item -Path $full_path -Force -ErrorAction SilentlyContinue
-        while ((Get-Process -Name 'setup','MicrosoftEdge*' -ErrorAction SilentlyContinue).Path -like '*\Microsoft\Edge*') {
+}
-            Start-Sleep -Seconds 3
+
-        }
+$edgePolicy = 'HKLM:\SOFTWARE\Policies\Microsoft\Edge'
-        if ($also_remove_webview -eq 1) {
+if (-not (Test-Path $edgePolicy)) {
-            foreach ($regPath in 'HKCU:', 'HKLM:') {
+    New-Item -Path $edgePolicy -Force | Out-Null
-                foreach ($node in '', '\Wow6432Node') {
+}
-                    Remove-Item -Path "$regPath\SOFTWARE$node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge Update" -Recurse -Force -ErrorAction SilentlyContinue
+
-                }
+$edgePrefs = @{
-            }
+    'Dword' = @{
-            Remove-Item -Path "$path\Microsoft\EdgeUpdate" -Recurse -Force -ErrorAction SilentlyContinue
+        'BrowserReplacementEnabled' = 1
-            Unregister-ScheduledTask -TaskName 'MicrosoftEdgeUpdate*' -Confirm:$false -ErrorAction SilentlyContinue
+        'HideFirstRunExperience' = 1
+        'HideImportEdgeFavoritesPrompt' = 1
+        'HideSyncSetupExperience' = 1
+        'FavoritesBarVisibility' = 1
+    }
+    'String' = @{
+        'AutoplayAllowed' = 'AllowOnce'
+    }
+}
+
+foreach ($entryType in $edgePrefs.Keys) {
+    foreach ($prefName in $edgePrefs[$entryType].Keys) {
+        Set-ItemProperty -Path $edgePolicy -Name $prefName -Value $edgePrefs[$entryType][$prefName] -Type $entryType -Force
+    }
+}
+
+# Output Results
+Write-Host "Edge Removal Complete" -ForegroundColor Green
+
+# Define constants and initial configuration
+$ScriptVersion = "2023.05.10"
+$EdgeProcessesToShutdown = @('explorer', 'Widgets', 'widgetservice', 'msedgewebview2', 'MicrosoftEdge*', 'chredge', 'msedge', 'edge', 'msteams', 'msfamily', 'WebViewHost', 'Clipchamp')
+$EdgeRemovalOptions = @{
+    RemoveWin32 = @("Microsoft Edge", "Microsoft Edge Update")
+    RemoveAppx = @("MicrosoftEdge")
+    Skip = @() # Optional: @("DevTools")
+    AlsoRemoveWebView = $false
+}
+
+# Define main function to remove Microsoft Edge components
+function Remove-MicrosoftEdge {
+    [CmdletBinding()]
+    param()
+
+    # Function to shutdown processes related to Microsoft Edge
+    function Stop-EdgeProcesses {
+        $EdgeProcessesToShutdown | ForEach-Object {
+            Stop-Process -Name $_ -Force -ErrorAction SilentlyContinue
         }
     }
-}
 
-# Remove Edge shortcuts
+    # Function to remove registry entries related to Microsoft Edge
-Remove-Item -Path "$appDataPath\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar\Tombstones\Microsoft Edge.lnk" -Force -ErrorAction SilentlyContinue
+    function Remove-EdgeRegistryEntries {
-Remove-Item -Path "$appDataPath\Microsoft\Internet Explorer\Quick Launch\Microsoft Edge.lnk" -Force -ErrorAction SilentlyContinue
+        # Clean up certain registry entries
+        Remove-Item -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\msedge.exe" -Recurse -ErrorAction SilentlyContinue
+        Remove-Item -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\ie_to_edge_stub.exe" -Recurse -ErrorAction SilentlyContinue
+        Remove-Item -Path 'Registry::HKEY_Users\S-1-5-21*\Software\Classes\microsoft-edge' -Recurse -ErrorAction SilentlyContinue
+        Remove-Item -Path 'Registry::HKEY_Users\S-1-5-21*\Software\Classes\MSEdgeHTM' -Recurse -ErrorAction SilentlyContinue
 
-# Revert settings related to Microsoft Edge
+        # Create new registry entries
-foreach ($sid in $users) {
+        $EdgeExecutablePath = ($env:ProgramFiles, ${env:ProgramFiles(x86)})[[Environment]::Is64BitOperatingSystem] + '\Microsoft\Edge\Application\msedge.exe'
-    foreach ($packageName in $eol) {
+        New-Item -Path "HKLM:\SOFTWARE\Classes\microsoft-edge\shell\open\command" -Force -ErrorAction SilentlyContinue
-        Remove-Item -Path "$store\EndOfLife\$sid\$packageName" -Force -ErrorAction SilentlyContinue
+        Set-ItemProperty -Path "HKLM:\SOFTWARE\Classes\microsoft-edge\shell\open\command" -Name '(Default)' -Value "`"$EdgeExecutablePath`" --single-argument %%1" -Force -ErrorAction SilentlyContinue
+
+        New-Item -Path "HKLM:\SOFTWARE\Classes\MSEdgeHTM\shell\open\command" -Force -ErrorAction SilentlyContinue
+        Set-ItemProperty -Path "HKLM:\SOFTWARE\Classes\MSEdgeHTM\shell\open\command" -Name '(Default)' -Value "`"$EdgeExecutablePath`" --single-argument %%1" -Force -ErrorAction SilentlyContinue
     }
-}
 
-# Set policies to prevent unsolicited reinstalls of Microsoft Edge
+    # Function to remove Microsoft Edge AppX packages
-$registryPaths = @('HKLM:\SOFTWARE\Policies', 'HKLM:\SOFTWARE', 'HKLM:\SOFTWARE\WOW6432Node')
+    function Remove-EdgeAppxPackages {
-$edgeUpdatePolicies = @{
+        $EdgeRemovalOptions.RemoveAppx | ForEach-Object {
-    'InstallDefault'                     = 0;
+            # Remove provisioned packages
-    'Install{56EB18F8-B008-4CBD-B6D2-8C97FE7E9062}' = 0;
+            Get-AppxProvisionedPackage -Online | Where-Object { $_.PackageName -like "*$_*" -and $EdgeRemovalOptions.Skip -notcontains $_.PackageName } | Remove-AppxProvisionedPackage -Online -AllUsers -ErrorAction SilentlyContinue
-    'Install{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}' = 1;
-    'DoNotUpdateToEdgeWithChromium'      = 1;
-}
 
-foreach ($path in $registryPaths) {
+            # Remove installed packages
-    New-Item -Path "$path\Microsoft\EdgeUpdate" -Force -ErrorAction SilentlyContinue | Out-Null
+            Get-AppxPackage -AllUsers | Where-Object { $_.PackageFullName -like "*$_*" -and $EdgeRemovalOptions.Skip -notcontains $_.PackageFullName } | Remove-AppxPackage -AllUsers -ErrorAction SilentlyContinue
-    foreach ($policy in $edgeUpdatePolicies.GetEnumerator()) {
-        Set-ItemProperty -Path "$path\Microsoft\EdgeUpdate" -Name $policy.Key -Value $policy.Value -Type Dword -Force
-    }
-}
-
-$edgeUpdateActions = @('on-os-upgrade', 'on-logon', 'on-logon-autolaunch', 'on-logon-startup-boost')
-$edgeUpdateClients = @(
-    'Microsoft\EdgeUpdate\Clients\{56EB18F8-B008-4CBD-B6D2-8C97FE7E9062}',
-    'Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}'
-)
-foreach ($client in $edgeUpdateClients) {
-    foreach ($action in $edgeUpdateActions) {
-        foreach ($regBase in 'HKLM:\SOFTWARE', 'HKLM:\SOFTWARE\Wow6432Node') {
-            $regPath = "$regBase\$client\Commands\$action"
-            New-Item -Path $regPath -Force -ErrorAction SilentlyContinue | Out-Null
-            Set-ItemProperty -Path $regPath -Name 'CommandLine' -Value 'systray.exe' -Force
         }
     }
+
+    # Function to remove Microsoft Edge processes, registry entries, and AppX packages
+    try {
+        Stop-EdgeProcesses
+        Remove-EdgeRegistryEntries
+        Remove-EdgeAppxPackages
+        Write-Output "Microsoft Edge components have been successfully removed."
+    } catch {
+        Write-Error "Failed to remove Microsoft Edge components: $_"
+    }
 }
 
-## Redirect Edge Shortcuts
+# Execute the main function
-
+Remove-MicrosoftEdge
-# Define Microsoft Edge Paths
-$MSEP = ($env:ProgramFiles, ${env:ProgramFiles(x86)})[[Environment]::Is64BitOperatingSystem] + '\Microsoft\Edge\Application'
-$IFEO = 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options'
-$MIN = ('--headless', '--width 1 --height 1')[([environment]::OSVersion.Version.Build) -gt 25179]
-$CMD = "$env:systemroot\system32\conhost.exe $MIN"
-$DIR = "$env:SystemDrive\Scripts"
-
-# Setup Microsoft Edge Registry Entries
-New-Item -Path "HKLM:\SOFTWARE\Classes\microsoft-edge\shell\open\command" -Force | Out-Null
-Set-ItemProperty -Path "HKLM:\SOFTWARE\Classes\microsoft-edge" -Name '(Default)' -Value 'URL:microsoft-edge' -Force
-Set-ItemProperty -Path "HKLM:\SOFTWARE\Classes\microsoft-edge" -Name 'URL Protocol' -Value '' -Force
-Set-ItemProperty -Path "HKLM:\SOFTWARE\Classes\microsoft-edge" -Name 'NoOpenWith' -Value '' -Force
-Set-ItemProperty -Path "HKLM:\SOFTWARE\Classes\microsoft-edge\shell\open\command" -Name '(Default)' -Value "`"$DIR\ie_to_edge_stub.exe`" %1" -Force
-
-# Setup MSEdgeHTM Registry Entries
-New-Item -Path "HKLM:\SOFTWARE\Classes\MSEdgeHTM\shell\open\command" -Force | Out-Null
-Set-ItemProperty -Path "HKLM:\SOFTWARE\Classes\MSEdgeHTM" -Name 'NoOpenWith' -Value '' -Force
-Set-ItemProperty -Path "HKLM:\SOFTWARE\Classes\MSEdgeHTM\shell\open\command" -Name '(Default)' -Value "`"$DIR\ie_to_edge_stub.exe`" %1" -Force
-
-# Setup Image File Execution Options for Edge and Edge WebView
-$exeSettings = @(
-    @{ ExeName = 'ie_to_edge_stub.exe'; Debugger = "$CMD $DIR\OpenWebSearch.cmd"; FilterPath = "$DIR\ie_to_edge_stub.exe" },
-    @{ ExeName = 'msedge.exe'; Debugger = "$CMD $DIR\OpenWebSearch.cmd"; FilterPath = "$MSEP\msedge.exe" }
-)
-
-foreach ($setting in $exeSettings) {
-    New-Item -Path "$IFEO\$($setting.ExeName)\0" -Force | Out-Null
-    Set-ItemProperty -Path "$IFEO\$($setting.ExeName)" -Name 'UseFilter' -Value 1 -Type Dword -Force
-    Set-ItemProperty -Path "$IFEO\$($setting.ExeName)\0" -Name 'FilterFullPath' -Value $setting.FilterPath -Force
-    Set-ItemProperty -Path "$IFEO\$($setting.ExeName)\0" -Name 'Debugger' -Value $setting.Debugger -Force
-}
-
-# Write OpenWebSearch Batch Script
-$OpenWebSearch = @'
-@echo off
-@title OpenWebSearch Redux
-
-:: Minimize prompt
-for /f %%E in ('"prompt $E$S & for %%e in (1) do rem"') do echo;%%E[2t >nul 2>&1
-
-:: Get default browser from registry
-call :get_registry_value "HKCU\SOFTWARE\Microsoft\Windows\Shell\Associations\UrlAssociations\https\UserChoice" ProgID DefaultBrowser
-if not defined DefaultBrowser (
-    echo Error: Failed to get default browser from registry.
-    pause
-    exit /b
-)
-if /i "%DefaultBrowser%" equ "MSEdgeHTM" (
-    echo Error: Default browser is set to Edge! Change it or remove OpenWebSearch script.
-    pause
-    exit /b
-)
-
-:: Get browser command line
-call :get_registry_value "HKCR\%DefaultBrowser%\shell\open\command" "" BrowserCommand
-if not defined BrowserCommand (
-    echo Error: Failed to get browser command from registry.
-    pause
-    exit /b
-)
-set Browser=& for %%i in (%BrowserCommand%) do if not defined Browser set "Browser=%%~i"
-
-:: Set fallback for Edge
-call :get_registry_value "HKCR\MSEdgeMHT\shell\open\command" "" FallBack
-set EdgeCommand=& for %%i in (%FallBack%) do if not defined EdgeCommand set "EdgeCommand=%%~i"
-
-:: Parse command line arguments and check for redirect or noop conditions
-set "URI=" & set "URL=" & set "NOOP=" & set "PassThrough=%EdgeCommand:msedge=edge%"
-set "CommandLineArgs=%CMDCMDLINE:"=``% "
-call :parse_arguments
-
-if defined NOOP (
-    if not exist "%PassThrough%" (
-        echo Error: PassThrough path doesn't exist.
-        pause
-        exit /b
-    )
-    start "" "%PassThrough%" %ParsedArgs%
-    exit /b
-)
-
-:: Decode URL
-call :decode_url
-if not defined URL (
-    echo Error: Failed to decode URL.
-    pause
-    exit /b
-)
-
-:: Open URL in default browser
-start "" "%Browser%" "%URL%"
-exit
-
-:: Functions
-
-:get_registry_value
-setlocal
-    set regQuery=reg query "%~1" /v %2 /z /se "," /f /e
-    if "%~2" equ "" set regQuery=reg query "%~1" /ve /z /se "," /f /e
-    for /f "skip=2 tokens=* delims=" %%V in ('%regQuery% 2^>nul') do set "result=%%V"
-    if defined result (set "result=%result:*)    =%") else (set "%~3=")
-    endlocal & set "%~3=%result%"
-exit /b
-
-:decode_url
-    :: Brute URL percent decoding
-    setlocal enabledelayedexpansion
-    set "decoded=%URL:!=}%"
-    call :brute_decode
-    endlocal & set "URL=%decoded%"
-exit /b
-
-:parse_arguments
-    :: Remove specific substrings from arguments
-    set "CommandLineArgs=%CommandLineArgs:*ie_to_edge_stub.exe`` =%"
-    set "CommandLineArgs=%CommandLineArgs:*ie_to_edge_stub.exe =%"
-    set "CommandLineArgs=%CommandLineArgs:*msedge.exe`` =%"
-    set "CommandLineArgs=%CommandLineArgs:*msedge.exe =%"
-
-    :: Remove any trailing spaces
-    if "%CommandLineArgs:~-1%"==" " set "CommandLineArgs=%CommandLineArgs:~0,-1%"
-
-    :: Check if arguments are a redirect or URL
-    set "RedirectArg=%CommandLineArgs:microsoft-edge=%"
-    set "UrlArg=%CommandLineArgs:http=%"
-    set "ParsedArgs=%CommandLineArgs:``="%"
-
-    :: Set NOOP flag if no changes to arguments
-    if "%CommandLineArgs%" equ "%RedirectArg%" (set NOOP=1) else if "%CommandLineArgs%" equ "%UrlArg%" (set NOOP=1)
-
-    :: Extract URL if present
-    if not defined NOOP (
-        set "URL=%CommandLineArgs:*microsoft-edge=%"
-        set "URL=http%URL:*http=%"
-        if "%URL:~-2%"=="``" set "URL=%URL:~0,-2%"
-    )
-exit /b
-
-
-:brute_decode
-    :: Brute force URL percent decoding
-
-    set "decoded=%decoded:%%20= %"
-    set "decoded=%decoded:%%21=!!"
-    set "decoded=%decoded:%%22="%""
-    set "decoded=%decoded:%%23=#%"
-    set "decoded=%decoded:%%24=$%"
-    set "decoded=%decoded:%%25=%%%"
-    set "decoded=%decoded:%%26=&%"
-    set "decoded=%decoded:%%27='%"
-    set "decoded=%decoded:%%28=(%"
-    set "decoded=%decoded:%%29=)%" 
-    set "decoded=%decoded:%%2A=*%"
-    set "decoded=%decoded:%%2B=+%"
-    set "decoded=%decoded:%%2C=,%"
-    set "decoded=%decoded:%%2D=-%"
-    set "decoded=%decoded:%%2E=.%"
-    set "decoded=%decoded:%%2F=/%"
-    :: ... Continue for other encodings ...
-
-    :: Correct any double percentage signs
-    set "decoded=%decoded:%%%%=%"
-
-exit /b
-
-
-
-'@
-[io.file]::WriteAllText("$DIR\OpenWebSearch.cmd", $OpenWebSearch)
-
-
-# Final Steps 
-
-# Retrieve the Edge_Removal property from the specified registry paths
-$userRegPaths = Get-ChildItem -Path 'Registry::HKEY_Users\S-1-5-21*\Volatile*' -ErrorAction SilentlyContinue
-$edgeRemovalPath = $userRegPaths | Get-ItemProperty -Name 'Edge_Removal' -ErrorAction SilentlyContinue
-
-# If the Edge_Removal property exists, remove it
-if ($edgeRemovalPath) {
-    Remove-ItemProperty -Path $edgeRemovalPath.PSPath -Name 'Edge_Removal' -Force -ErrorAction SilentlyContinue
-}
-
-# Ensure the explorer process is running
-if (-not (Get-Process -Name 'explorer' -ErrorAction SilentlyContinue)) {
-    Start-Process 'explorer'
-}
-
-
-

functions/private/ConvertTo-Icon.ps1

@@ -1,27 +1,93 @@
-function ConvertTo-Icon { 
+function ConvertTo-Icon {
     <#
-    
+
         .DESCRIPTION
-        This function will convert PNG to ICO file
+        This function will convert BMP, GIF, EXIF, JPG, PNG and TIFF to ICO file
+
+        .PARAMETER bitmapPath
+        The file path to bitmap image to make '.ico' file out of.
+        Supported file types according to Microsoft Documentation is the following:
+        BMP, GIF, EXIF, JPG, PNG and TIFF.
+
+        .PARAMETER iconPath
+        The file path to write the new '.ico' resource.
+
+        .PARAMETER overrideIconFile
+        An optional boolean Parameter that makes the function overrides
+        the Icon File Path if the file exists. Defaults to $true.
 
         .EXAMPLE
-        ConvertTo-Icon -bitmapPath "$env:TEMP\cttlogo.png" -iconPath $iconPath
+        try {
+            ConvertTo-Icon -bitmapPath "$env:TEMP\cttlogo.png" -iconPath "$env:TEMP\cttlogo.ico"
+        } catch [System.IO.FileNotFoundException] {
+            # Handle the thrown exception here...
+        }
+
+        This Example makes a '.ico' file at "$env:TEMP\cttlogo.ico" File Path using the bitmap file
+        found in "$env:TEMP\cttlogo.png", the function overrides the '.ico' File if it's found.
+        this function will throw a FileNotFound Exception at the event of not finding the provided bitmap File Path.
+
+        .EXAMPLE
+        try {
+            ConvertTo-Icon "$env:TEMP\cttlogo.png" "$env:TEMP\cttlogo.ico"
+        } catch [System.IO.FileNotFoundException] {
+            # Handle the thrown exception here...
+        }
+
+        This Example is the same as Example 1, but uses Positional Parameters instead.
+
+        .EXAMPLE
+        if (Test-Path "$env:TEMP\cttlogo.png") {
+            ConvertTo-Icon -bitmapPath "$env:TEMP\cttlogo.png" -iconPath "$env:TEMP\cttlogo.ico"
+        }
+
+        This Example is same as Example 1, but checks if the bitmap File exists before calling 'ConvertTo-Icon' Function.
+        This's the recommended way of using this function, as it doesn't require any try-catch blocks.
+
+        .EXAMPLE
+        try {
+            ConvertTo-Icon -bitmapPath "$env:TEMP\cttlogo.png" -iconPath "$env:TEMP\cttlogo.ico" -overrideIconFile $false
+        } catch [System.IO.FileNotFoundException] {
+            # Handle the thrown exception here...
+        }
+
+        This Example make use of '-overrideIconFile' Optional Parameter, the default for this paramter is $true.
+        By doing '-overrideIconFile $false', the 'ConvertTo-Icon' function will raise an exception that needs to be catched throw a 'catch' Code Block,
+        otherwise it'll crash the running PowerShell instance/process.
+
     #>
-    param( [Parameter(Mandatory=$true)] 
+    param(
-        $bitmapPath, 
+        [Parameter(Mandatory=$true, position=0)]
-        $iconPath = "$env:temp\newicon.ico"
+        [string]$bitmapPath,
-    ) 
+        [Parameter(Mandatory=$true, position=1)]
-    
+        [string]$iconPath,
-    Add-Type -AssemblyName System.Drawing 
+        [Parameter(position=2)]
-    
+        [bool]$overrideIconFile = $true
-    if (Test-Path $bitmapPath) { 
+    )
-        $b = [System.Drawing.Bitmap]::FromFile($bitmapPath) 
+
-        $icon = [System.Drawing.Icon]::FromHandle($b.GetHicon()) 
+    Add-Type -AssemblyName System.Drawing
-        $file = New-Object System.IO.FileStream($iconPath, 'OpenOrCreate') 
+
-        $icon.Save($file) 
+    if (Test-Path $bitmapPath) {
-        $file.Close() 
+        if ((Test-Path $iconPath) -AND ($overrideIconFile -eq $false)) {
-        $icon.Dispose() 
+            Write-Host "[ConvertTo-Icon] Icon File is found at '$iconPath', and the 'overrideIconFile' Parameter is set to '$overrideIconFile'. Skipping the bitmap to icon convertion..." -ForegroundColor Yellow
-        #explorer "/SELECT,$iconpath" 
+            return
-    } 
+        }
-    else { Write-Warning "$BitmapPath does not exist" } 
+
-}
+        # Load bitmap file into memory, and make an Icon version out of it
+        $b = [System.Drawing.Bitmap]::FromFile($bitmapPath)
+        $icon = [System.Drawing.Icon]::FromHandle($b.GetHicon())
+
+        # Create the folder for the new icon file if it doesn't exists
+        $iconFolder = (New-Object System.IO.FileInfo($iconPath)).Directory.FullName
+        [System.IO.Directory]::CreateDirectory($iconFolder) | Out-Null
+
+        # Write the Icon File and do some cleaning-up
+        $file = New-Object System.IO.FileStream($iconPath, 'OpenOrCreate')
+        $icon.Save($file)
+        $file.Close()
+        $icon.Dispose()
+    }
+    else {
+        throw [System.IO.FileNotFoundException] "[ConvertTo-Icon] The provided bitmap File Path is not found at '$bitmapPath'."
+    }
+}

functions/private/Copy-Files.ps1

@@ -1,22 +1,22 @@
 function Copy-Files {
     <#
-    
+
         .DESCRIPTION
         This function will make all modifications to the registry
 
         .EXAMPLE
 
         Set-WinUtilRegistry -Name "PublishUserActivities" -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\System" -Type "DWord" -Value "0"
-    
+
-    #>    
+    #>
     param (
-        [string] $Path, 
+        [string] $Path,
-        [string] $Destination, 
+        [string] $Destination,
-        [switch] $Recurse = $false, 
+        [switch] $Recurse = $false,
         [switch] $Force = $false
     )
 
-    try {   
+    try {
 
  	$files = Get-ChildItem -Path $path -Recurse:$recurse
 	Write-Host "Copy $($files.Count)(s) from $path to $destination"
@@ -35,9 +35,9 @@ function Copy-Files {
             else
             {
                 Write-Debug "Copy from $($file.FullName) to $($destination+$restpath)"
-                Copy-Item $file.FullName ($destination+$restpath) -ErrorAction SilentlyContinue -Force:$force 
+                Copy-Item $file.FullName ($destination+$restpath) -ErrorAction SilentlyContinue -Force:$force
                 Set-ItemProperty -Path ($destination+$restpath) -Name IsReadOnly -Value $false
-            }        
+            }
         }
         Write-Progress -Activity "Copy Windows files" -Status "Ready" -Completed
     }

functions/private/Get-LocalizedYesNo.ps1

@@ -1,17 +1,17 @@
 function Get-LocalizedYesNo {
     <#
     .SYNOPSIS
-    This function runs choice.exe and captures its output to extract yes no in a localized Windows 
+    This function runs choice.exe and captures its output to extract yes no in a localized Windows
-    
+
     .DESCRIPTION
     The function retrieves the output of the command 'cmd /c "choice <nul 2>nul"' and converts the default output for Yes and No
     in the localized format, such as "Yes=<first character>, No=<second character>".
-    
+
     .EXAMPLE
     $yesNoArray = Get-LocalizedYesNo
     Write-Host "Yes=$($yesNoArray[0]), No=$($yesNoArray[1])"
     #>
-  
+
     # Run choice and capture its options as output
     # The output shows the options for Yes and No as "[Y,N]?" in the (partitially) localized format.
     # eg. English: [Y,N]?
@@ -21,7 +21,7 @@ function Get-LocalizedYesNo {
     # Spanish: [S,N]?
     # Italian: [S,N]?
     # Russian: [Y,N]?
-    
+
     $line = cmd /c "choice <nul 2>nul"
     $charactersArray = @()
     $regexPattern = '([a-zA-Z])'
@@ -30,58 +30,5 @@ function Get-LocalizedYesNo {
     Write-Debug "According to takeown.exe local Yes is $charactersArray[0]"
     # Return the array of characters
     return $charactersArray
-  }
-  
 
-function Get-LocalizedYesNoTakeown {
-    <#
-    .SYNOPSIS
-    This function runs takeown.exe and captures its output to extract yes no in a localized Windows 
-    
-    .DESCRIPTION
-    The function retrieves lines from the output of takeown.exe until there are at least 2 characters
-    captured in a specific format, such as "Yes=<first character>, No=<second character>".
-    
-    .EXAMPLE
-    $yesNoArray = Get-LocalizedYesNo
-    Write-Host "Yes=$($yesNoArray[0]), No=$($yesNoArray[1])"
-    #>
-  
-    # Run takeown.exe and capture its output
-    $takeownOutput = & takeown.exe /? | Out-String
-
-    # Parse the output and retrieve lines until there are at least 2 characters in the array
-    $found = $false
-    $charactersArray = @()
-    foreach ($line in $takeownOutput -split "`r`n") 
-    {
-        # skip everything before /D flag help
-        if ($found) 
-        {
-            # now that /D is found start looking for a single character in double quotes
-            # in help text there is another string in double quotes but it is not a single character
-            $regexPattern = '"([a-zA-Z])"'
-
-            $charactersArray = [regex]::Matches($line, $regexPattern) | ForEach-Object { $_.Groups[1].Value }
-            
-            # if ($charactersArray.Count -gt 0) {
-            #     Write-Output "Extracted symbols: $($matches -join ', ')"
-            # } else {
-            #     Write-Output "No matches found."
-            # }
-
-            if ($charactersArray.Count -ge 2) 
-            {
-                break
-            }    
-        }
-        elseif ($line -match "/D   ") 
-        {
-            $found = $true
-        }
-    }
-
-    Write-Debug "According to takeown.exe local Yes is $charactersArray[0]"
-    # Return the array of characters
-    return $charactersArray
   }

functions/private/Get-Oscdimg.ps1

@@ -1,13 +1,13 @@
-function Get-Oscdimg { 
+function Get-Oscdimg {
     <#
-    
+
         .DESCRIPTION
-        This function will get oscdimg file for from github Release foldersand put it into env:temp
+        This function will download oscdimg file from github Release folders and put it into env:temp folder
 
         .EXAMPLE
         Get-Oscdimg
     #>
-    param( [Parameter(Mandatory=$true)] 
+    param( [Parameter(Mandatory=$true)]
         [string]$oscdimgPath
     )
     $oscdimgPath = "$env:TEMP\oscdimg.exe"
@@ -24,4 +24,4 @@ function Get-Oscdimg {
     } else {
         Write-Host "Hashes do not match. File may be corrupted or tampered with."
     }
-} 
+}

functions/private/Get-TabXaml.ps1

@@ -6,19 +6,31 @@ function Get-TabXaml {
         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
+        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=$true)]
+    param(
-        $tabname,
+        [Parameter(Mandatory, position=0)]
-        $columncount = 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) {
@@ -39,6 +51,7 @@ function Get-TabXaml {
             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)) {
@@ -53,7 +66,22 @@ function Get-TabXaml {
         # Add Order property to keep the original order of tweaks and features
         $organizedData[$appObject.panel][$appInfo.Category]["$($appInfo.order)$appName"] = $appObject
     }
-    $panelcount=0
+
+    # 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
@@ -61,65 +89,129 @@ function Get-TabXaml {
         $paneltotal = $columncount
     }
     # add ColumnDefinitions to evenly draw colums
-    $blockXml="<Grid.ColumnDefinitions>`n"+("<ColumnDefinition Width=""*""/>`n"*($paneltotal))+"</Grid.ColumnDefinitions>`n"
+    $blockXml = "<Grid.ColumnDefinitions>"
-    # Iterate through organizedData by panel, category, and application
+    $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 += "<Border Grid.Row=""1"" Grid.Column=""$panelcount"">`n<StackPanel Background=""{MainBackgroundColor}"" SnapsToDevicePixels=""True"">`n"
+        $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 +="`n</StackPanel>`n</Border>`n"
+                    $blockXml += $precal_indent_p2 + "</StackPanel>" + "`r`n"
-                    $blockXml += "<Border Grid.Row=""1"" Grid.Column=""$panelcount"">`n<StackPanel Background=""{MainBackgroundColor}"" SnapsToDevicePixels=""True"">`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++
                 }
             }
-            $blockXml += "<Label Content=""$($category -replace '^.__', '')"" FontSize=""16""/>`n"
+
+            # Dot-source the Get-WPFObjectName function
+            . .\functions\private\Get-WPFObjectName
+
+            $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 +="`n</StackPanel>`n</Border>`n"
+                        $blockXml += $precal_indent_m1 +
-                        $blockXml += "<Border Grid.Row=""1"" Grid.Column=""$panelcount"">`n<StackPanel Background=""{MainBackgroundColor}"" SnapsToDevicePixels=""True"">`n"
+                                        "</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]
-                if ("Toggle" -eq $appInfo.Type) {
+                switch ($appInfo.Type) {
-                    $blockXml += "<StackPanel Orientation=`"Horizontal`" Margin=`"0,10,0,0`">`n<Label Content=`"$($appInfo.Content)`" Style=`"{StaticResource labelfortweaks}`" ToolTip=`"$($appInfo.Description)`" />`n"
+                    "Toggle" {
-                    $blockXml += "<CheckBox Name=`"$($appInfo.Name)`" Style=`"{StaticResource ColorfulToggleSwitchStyle}`" Margin=`"2.5,0`"/>`n</StackPanel>`n"
+                        $blockXml += $precal_indent_m1 +
-                } elseif ("Combobox" -eq $appInfo.Type) {
+                                        "<DockPanel LastChildFill=""True"">" + "`r`n"
-                    $blockXml += "<StackPanel Orientation=`"Horizontal`" Margin=`"0,5,0,0`">`n<Label Content=`"$($appInfo.Content)`" HorizontalAlignment=`"Left`" VerticalAlignment=`"Center`"/>`n"
+                        $blockXml += $precal_indent +
-                    $blockXml += "<ComboBox Name=`"$($appInfo.Name)`"  Height=`"32`" Width=`"186`" HorizontalAlignment=`"Left`" VerticalAlignment=`"Center`" Margin=`"5,5`">`n"
+                                        "<CheckBox Name=""$($appInfo.Name)"" Style=""{StaticResource ColorfulToggleSwitchStyle}"" Margin=""4,0""" + " " +
-                    $addfirst="IsSelected=`"True`""
+                                        "HorizontalAlignment=""Right"" FontSize=""{FontSize}""/>" + "`r`n"
-                    foreach ($comboitem in ($appInfo.ComboItems -split " ")) {
+                        $blockXml += $precal_indent +
-                        $blockXml += "<ComboBoxItem $addfirst Content=`"$comboitem`"/>`n"
+                                        "<Label Content=""$($appInfo.Content)"" ToolTip=""$($appInfo.Description)""" + " " +
-                        $addfirst=""
+                                        "HorizontalAlignment=""Left"" FontSize=""{FontSize}""/>" + "`r`n"
+                        $blockXml += $precal_indent_m1 +
+                                        "</DockPanel>" + "`r`n"
                     }
-                    $blockXml += "</ComboBox>`n</StackPanel>"
+
-                # If it is a digit, type is button and button length is digits
+                    "Combobox" {
-                } elseif ($appInfo.Type -match "^[\d\.]+$") {
+                        $blockXml += $precal_indent_m1 +
-                    $blockXml += "<Button Name=`"$($appInfo.Name)`" Content=`"$($appInfo.Content)`" HorizontalAlignment = `"Left`" Width=`"$($appInfo.Type)`" Margin=`"5`" Padding=`"20,5`" />`n"
+                                        "<StackPanel Orientation=""Horizontal"" Margin=""0,5,0,0"">" + "`r`n"
-                # else it is a checkbox
+                        $blockXml += $precal_indent + "<Label Content=""$($appInfo.Content)"" HorizontalAlignment=""Left""" + " " +
-                } else {
+                                        "VerticalAlignment=""Center"" FontSize=""{FontSize}""/>" + "`r`n"
-                    $checkedStatus = If ($null -eq $appInfo.Checked) {""} Else {"IsChecked=`"$($appInfo.Checked)`" "}
+                        $blockXml += $precal_indent +
-                    if ($null -eq $appInfo.Link)
+                                        "<ComboBox Name=""$($appInfo.Name)""  Height=""32"" Width=""186"" HorizontalAlignment=""Left""" + " " +
-                    {
+                                        "VerticalAlignment=""Center"" Margin=""5,5"" FontSize=""{FontSize}"">" + "`r`n"
-                        $blockXml += "<CheckBox Name=`"$($appInfo.Name)`" Content=`"$($appInfo.Content)`" $($checkedStatus)Margin=`"5,0`"  ToolTip=`"$($appInfo.Description)`"/>`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"
                     }
-                    else
+
-                    {
+                    "Button" {
-                        $blockXml += "<StackPanel Orientation=""Horizontal"">`n<CheckBox Name=""$($appInfo.Name)"" Content=""$($appInfo.Content)"" $($checkedStatus)ToolTip=""$($appInfo.Description)"" Margin=""0,0,2,0""/><TextBlock Name=""$($appInfo.Name)Link"" Style=""{StaticResource HoverTextBlockStyle}"" Text=""(?)"" ToolTip=""$($appInfo.Link)"" />`n</StackPanel>`n"
+                        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 +="`n</StackPanel>`n</Border>`n"
+
+        $blockXml += $precal_indent_p1 + "</StackPanel>" + "`r`n"
+        $blockXml += $precal_indent + "</Border>" + "`r`n"
     }
     return ($blockXml)
 }

functions/private/Get-WPFObjectName.ps1

@@ -0,0 +1,27 @@
+function Get-WPFObjectName {
+        <#
+    .SYNOPSIS
+        This is a helper function that generates an objectname with the prefix WPF that can be used as a Powershell Variable after compilation.
+        To achieve this, all characters that are not a-z, A-Z or 0-9 are simply removed from the name.
+    .PARAMETER type
+        The type of object for which the name should be generated. (e.g. Label, Button, CheckBox...)
+    .PARAMETER name
+        The name or description to be used for the object. (invalid characters are removed)
+    .OUTPUTS
+        A string that can be used as a object/variable name in powershell.
+        For example: WPFLabelMicrosoftTools
+
+    .EXAMPLE
+        Get-WPFObjectName -type Label -name "Microsoft Tools"
+    #>
+
+    param( [Parameter(Mandatory=$true)]
+    $type,
+    $name
+)
+
+$Output = $("WPF"+$type+$name) -replace '[^a-zA-Z0-9]', ''
+
+return $Output
+
+}

functions/private/Get-WinUtilCheckBoxes.ps1

@@ -5,9 +5,6 @@ Function Get-WinUtilCheckBoxes {
     .SYNOPSIS
         Finds all checkboxes that are checked on the specific tab and inputs them into a script.
 
-    .PARAMETER Group
-        The group of checkboxes to check
-
     .PARAMETER unCheck
         Whether to uncheck the checkboxes that are checked. Defaults to true
 
@@ -32,23 +29,33 @@ Function Get-WinUtilCheckBoxes {
 
     $CheckBoxes = $sync.GetEnumerator() | Where-Object { $_.Value -is [System.Windows.Controls.CheckBox] }
 
+    # First check and add WPFTweaksRestorePoint if checked
+    $RestorePoint = $CheckBoxes | Where-Object { $_.Key -eq 'WPFTweaksRestorePoint' -and $_.Value.IsChecked -eq $true }
+    if ($RestorePoint) {
+        $Output["WPFTweaks"] = @('WPFTweaksRestorePoint')
+        Write-Debug "Adding WPFTweaksRestorePoint as first in WPFTweaks"
+
+        if ($unCheck) {
+            $RestorePoint.Value.IsChecked = $false
+        }
+    }
+
     foreach ($CheckBox in $CheckBoxes) {
+        if ($CheckBox.Key -eq 'WPFTweaksRestorePoint') { continue }  # Skip since it's already handled
+
         $group = if ($CheckBox.Key.StartsWith("WPFInstall")) { "Install" }
                 elseif ($CheckBox.Key.StartsWith("WPFTweaks")) { "WPFTweaks" }
                 elseif ($CheckBox.Key.StartsWith("WPFFeature")) { "WPFFeature" }
-
         if ($group) {
             if ($CheckBox.Value.IsChecked -eq $true) {
                 $feature = switch ($group) {
                     "Install" {
                         # Get the winget value
-                        $wingetValue = $sync.configs.applications.$($CheckBox.Name).winget
+                        [PsCustomObject]@{
-
+                            winget="$($sync.configs.applications.$($CheckBox.Name).winget)";
-                        if (-not [string]::IsNullOrWhiteSpace($wingetValue) -and $wingetValue -ne "na") {
+                            choco="$($sync.configs.applications.$($CheckBox.Name).choco)";
-                            $wingetValue -split ";"
-                        } else {
-                            $sync.configs.applications.$($CheckBox.Name).choco
                         }
+
                     }
                     default {
                         $CheckBox.Name
@@ -66,12 +73,11 @@ Function Get-WinUtilCheckBoxes {
                 Write-Debug "Adding: $($feature) under: $($group)"
                 $Output[$group] += $feature
 
-                if ($uncheck -eq $true) {
+                if ($unCheck) {
                     $CheckBox.Value.IsChecked = $false
                 }
             }
         }
     }
-
     return  $Output
 }

functions/private/Get-WinUtilToggleStatus.ps1

@@ -49,7 +49,7 @@ Function Get-WinUtilToggleStatus {
         else{
             return $false
         }
-    }    
+    }
     if($ToggleSwitch -eq "WPFToggleShowExt"){
         $hideextvalue = (Get-ItemProperty -path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced').HideFileExt
         if($hideextvalue -eq 0){
@@ -58,7 +58,16 @@ Function Get-WinUtilToggleStatus {
         else{
             return $false
         }
-    }    
+    }
+    if($ToggleSwitch -eq "WPFToggleSnapWindow"){
+        $hidesnap = (Get-ItemProperty -path 'HKCU:\Control Panel\Desktop').WindowArrangementActive
+        if($hidesnap -eq 0){
+            return $false
+        }
+        else{
+            return $true
+        }
+    }
     if($ToggleSwitch -eq "WPFToggleSnapFlyout"){
         $hidesnap = (Get-ItemProperty -path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced').EnableSnapAssistFlyout
         if($hidesnap -eq 0){
@@ -67,7 +76,16 @@ Function Get-WinUtilToggleStatus {
         else{
             return $true
         }
-    }    
+    }
+    if($ToggleSwitch -eq "WPFToggleSnapSuggestion"){
+        $hidesnap = (Get-ItemProperty -path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced').SnapAssist
+        if($hidesnap -eq 0){
+            return $false
+        }
+        else{
+            return $true
+        }
+    }
     if($ToggleSwitch -eq "WPFToggleMouseAcceleration"){
         $MouseSpeed = (Get-ItemProperty -path 'HKCU:\Control Panel\Mouse').MouseSpeed
         $MouseThreshold1 = (Get-ItemProperty -path 'HKCU:\Control Panel\Mouse').MouseThreshold1
@@ -80,6 +98,15 @@ Function Get-WinUtilToggleStatus {
             return $false
         }
     }
+    if($ToggleSwitch -eq "WPFToggleTaskbarSearch"){
+        $SearchButton = (Get-ItemProperty -path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Search").SearchboxTaskbarMode
+        if($SearchButton -eq 0){
+            return $false
+        }
+        else{
+            return $true
+        }
+    }
     if ($ToggleSwitch -eq "WPFToggleStickyKeys") {
         $StickyKeys = (Get-ItemProperty -path 'HKCU:\Control Panel\Accessibility\StickyKeys').Flags
         if($StickyKeys -eq 58){
@@ -89,4 +116,42 @@ Function Get-WinUtilToggleStatus {
             return $true
         }
     }
-}
+    if ($ToggleSwitch -eq "WPFToggleTaskView") {
+        $TaskView = (Get-ItemProperty -path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced').ShowTaskViewButton
+        if($TaskView -eq 0){
+            return $false
+        }
+        else{
+            return $true
+        }
+    }
+
+    if ($ToggleSwitch -eq "WPFToggleHiddenFiles") {
+        $HiddenFiles = (Get-ItemProperty -path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced').Hidden
+        if($HiddenFiles -eq 0){
+            return $false
+        }
+        else{
+            return $true
+        }
+    }
+
+    if ($ToggleSwitch -eq "WPFToggleTaskbarWidgets") {
+        $TaskbarWidgets = (Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced").TaskBarDa
+        if($TaskbarWidgets -eq 0) {
+            return $false
+        }
+        else{
+            return $true
+        }
+    }
+    if ($ToggleSwitch -eq "WPFToggleTaskbarAlignment") {
+        $TaskbarAlignment = (Get-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced").TaskbarAl
+        if($TaskbarAlignment -eq 0) {
+            return $false
+        }
+        else{
+            return $true
+        }
+    }
+}

functions/private/Get-WinUtilVariables.ps1

@@ -11,9 +11,7 @@ function Get-WinUtilVariables {
         [Parameter()]
         [string[]]$Type
     )
-
+    $keys = ($sync.keys).where{ $_ -like "WPF*" }
-    $keys = $sync.keys | Where-Object { $_ -like "WPF*" }
-
     if ($Type) {
         $output = $keys | ForEach-Object {
             Try {

functions/private/Get-WinUtilWingetLatest.ps1

@@ -0,0 +1,27 @@
+function Get-WinUtilWingetLatest {
+    <#
+    .SYNOPSIS
+        Uses GitHub API to check for the latest release of Winget.
+    .DESCRIPTION
+        This function grabs the latest version of Winget and returns the download path to Install-WinUtilWinget for installation.
+    #>
+    # Invoke-WebRequest is notoriously slow when the byte progress is displayed. The following lines disable the progress bar and reset them at the end of the function
+    $PreviousProgressPreference = $ProgressPreference
+    $ProgressPreference = "silentlyContinue"
+    Try{
+        # Grabs the latest release of Winget from the Github API for the install process.
+        $response = Invoke-RestMethod -Uri "https://api.github.com/repos/microsoft/Winget-cli/releases/latest" -Method Get -ErrorAction Stop
+        $latestVersion = $response.tag_name #Stores version number of latest release.
+        $licenseWingetUrl = $response.assets.browser_download_url | Where-Object {$_ -like "*License1.xml"} #Index value for License file.
+        Write-Host "Latest Version:`t$($latestVersion)`n"
+        Write-Host "Downloading..."
+        $assetUrl = $response.assets.browser_download_url | Where-Object {$_ -like "*Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.msixbundle"}
+        Invoke-WebRequest -Uri $licenseWingetUrl -OutFile $ENV:TEMP\License1.xml
+        # The only pain is that the msixbundle for winget-cli is 246MB. In some situations this can take a bit, with slower connections.
+        Invoke-WebRequest -Uri $assetUrl -OutFile $ENV:TEMP\Microsoft.DesktopAppInstaller.msixbundle
+    }
+    Catch{
+        throw [WingetFailedInstall]::new('Failed to get latest Winget release and license')
+    }
+    $ProgressPreference = $PreviousProgressPreference
+}

functions/private/Get-WinUtilWingetPrerequisites.ps1

@@ -0,0 +1,29 @@
+function Get-WinUtilWingetPrerequisites {
+    <#
+    .SYNOPSIS
+        Downloads the Winget Prereqs.
+    .DESCRIPTION
+        Downloads Prereqs for Winget. Version numbers are coded as variables and can be updated as uncommonly as Microsoft updates the prereqs.
+    #>
+
+    # I don't know of a way to detect the prereqs automatically, so if someone has a better way of defining these, that would be great.
+    # Microsoft.VCLibs version rarely changes, but for future compatibility I made it a variable.
+    $versionVCLibs = "14.00"
+    $fileVCLibs = "https://aka.ms/Microsoft.VCLibs.x64.${versionVCLibs}.Desktop.appx"
+    # Write-Host "$fileVCLibs"
+    # Microsoft.UI.Xaml version changed recently, so I made the version numbers variables.
+    $versionUIXamlMinor = "2.8"
+    $versionUIXamlPatch = "2.8.6"
+    $fileUIXaml = "https://github.com/microsoft/microsoft-ui-xaml/releases/download/v${versionUIXamlPatch}/Microsoft.UI.Xaml.${versionUIXamlMinor}.x64.appx"
+    # Write-Host "$fileUIXaml"
+
+    Try{
+        Write-Host "Downloading Microsoft.VCLibs Dependency..."
+        Invoke-WebRequest -Uri $fileVCLibs -OutFile $ENV:TEMP\Microsoft.VCLibs.x64.Desktop.appx
+        Write-Host "Downloading Microsoft.UI.Xaml Dependency...`n"
+        Invoke-WebRequest -Uri $fileUIXaml -OutFile $ENV:TEMP\Microsoft.UI.Xaml.x64.appx
+    }
+    Catch{
+        throw [WingetFailedInstall]::new('Failed to install prerequsites')
+    }
+}

functions/private/Install-WinUtilChoco.ps1

@@ -10,20 +10,19 @@ function Install-WinUtilChoco {
     try {
         Write-Host "Checking if Chocolatey is Installed..."
 
-        if((Get-Command -Name choco -ErrorAction Ignore)) {
+        if((Test-WinUtilPackageManager -choco) -eq "installed") {
-            Write-Host "Chocolatey Already Installed"
             return
         }
 
-        Write-Host "Seems Chocolatey is not installed, installing now"
+        Write-Host "Seems Chocolatey is not installed, installing now."
         Set-ExecutionPolicy Bypass -Scope Process -Force; Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) -ErrorAction Stop
         powershell choco feature enable -n allowGlobalConfirmation
 
     }
     Catch {
-        Write-Host "==========================================="
+        Write-Host "===========================================" -Foregroundcolor Red
-        Write-Host "--     Chocolatey failed to install     ---"
+        Write-Host "--     Chocolatey failed to install     ---" -Foregroundcolor Red
-        Write-Host "==========================================="
+        Write-Host "===========================================" -Foregroundcolor Red
     }
 
 }

functions/private/Install-WinUtilProgramChoco.ps1

@@ -0,0 +1,91 @@
+function Install-WinUtilProgramChoco {
+    <#
+    .SYNOPSIS
+    Manages the provided programs using Chocolatey
+
+    .PARAMETER ProgramsToInstall
+    A list of programs to manage
+
+    .PARAMETER manage
+    The action to perform on the programs, can be either 'Installing' or 'Uninstalling'
+
+    .NOTES
+    The triple quotes are required any time you need a " in a normal script block.
+    #>
+
+    param(
+        [Parameter(Mandatory, Position=0)]
+        [PsCustomObject]$ProgramsToInstall,
+
+        [Parameter(Position=1)]
+        [String]$manage = "Installing"
+    )
+
+    $x = 0
+    $count = $ProgramsToInstall.Count
+
+    # This check isn't really necessary, as there's a couple of checks before this Private Function gets called, but just to make sure ;)
+    if($count -le 0) {
+        throw "Private Function 'Install-WinUtilProgramChoco' expected Parameter 'ProgramsToInstall' to be of size 1 or greater, instead got $count,`nPlease double check your code and re-compile WinUtil."
+    }
+
+    Write-Progress -Activity "$manage Applications" -Status "Starting" -PercentComplete 0
+    Write-Host "==========================================="
+    Write-Host "--   Configuring Chocolatey pacakages   ---"
+    Write-Host "==========================================="
+    Foreach ($Program in $ProgramsToInstall){
+        Write-Progress -Activity "$manage Applications" -Status "$manage $($Program.choco) $($x + 1) of $count" -PercentComplete $($x/$count*100)
+        if($manage -eq "Installing"){
+            write-host "Starting install of $($Program.choco) with Chocolatey."
+            try{
+                $tryUpgrade = $false
+		$installOutputFilePath = "$env:TEMP\Install-WinUtilProgramChoco.install-command.output.txt"
+        New-Item -ItemType File -Path $installOutputFilePath
+		$chocoInstallStatus = $(Start-Process -FilePath "choco" -ArgumentList "install $($Program.choco) -y" -Wait -PassThru -RedirectStandardOutput $installOutputFilePath).ExitCode
+            if(($chocoInstallStatus -eq 0) -AND (Test-Path -Path $installOutputFilePath)) {
+                $keywordsFound = Get-Content -Path $installOutputFilePath | Where-Object {$_ -match "reinstall" -OR $_ -match "already installed"}
+		        if ($keywordsFound) {
+		            $tryUpgrade = $true
+		        }
+            }
+		# TODO: Implement the Upgrade part using 'choco upgrade' command, this will make choco consistent with WinGet, as WinGet tries to Upgrade when you use the install command.
+		if ($tryUpgrade) {
+		    throw "Automatic Upgrade for Choco isn't implemented yet, a feature to make it consistent with WinGet, the install command using choco simply failed because $($Program.choco) is already installed."
+		}
+		if(($chocoInstallStatus -eq 0) -AND ($tryUpgrade -eq $false)){
+                    Write-Host "$($Program.choco) installed successfully using Chocolatey."
+                    continue
+                } else {
+                    Write-Host "Failed to install $($Program.choco) using Chocolatey, Chocolatey output:`n`n$(Get-Content -Path $installOutputFilePath)."
+                }
+            } catch {
+                Write-Host "Failed to install $($Program.choco) due to an error: $_"
+            }
+        }
+
+	if($manage -eq "Uninstalling"){
+            write-host "Starting uninstall of $($Program.choco) with Chocolatey."
+            try{
+		$uninstallOutputFilePath = "$env:TEMP\Install-WinUtilProgramChoco.uninstall-command.output.txt"
+        New-Item -ItemType File -Path $uninstallOutputFilePath
+		$chocoUninstallStatus = $(Start-Process -FilePath "choco" -ArgumentList "uninstall $($Program.choco) -y" -Wait -PassThru).ExitCode
+		if($chocoUninstallStatus -eq 0){
+                    Write-Host "$($Program.choco) uninstalled successfully using Chocolatey."
+                    continue
+                } else {
+                    Write-Host "Failed to uninstall $($Program.choco) using Chocolatey, Chocolatey output:`n`n$(Get-Content -Path $uninstallOutputFilePath)."
+                }
+            } catch {
+                Write-Host "Failed to uninstall $($Program.choco) due to an error: $_"
+            }
+	}
+        $x++
+    }
+    Write-Progress -Activity "$manage Applications" -Status "Finished" -Completed
+
+    # Cleanup leftovers files
+    if(Test-Path -Path $installOutputFilePath){ Remove-Item -Path $installOutputFilePath }
+    if(Test-Path -Path $uninstallOutputFilePath){ Remove-Item -Path $uninstallOutputFilePath }
+
+    return;
+}

functions/private/Install-WinUtilProgramWinget.ps1

@@ -1,44 +1,103 @@
 Function Install-WinUtilProgramWinget {
 
     <#
-
     .SYNOPSIS
-        Manages the provided programs using Winget
+    Manages the provided programs using Winget
 
     .PARAMETER ProgramsToInstall
-        A list of programs to manage
+    A list of programs to manage
 
     .PARAMETER manage
-        The action to perform on the programs, can be either 'Installing' or 'Uninstalling'
+    The action to perform on the programs, can be either 'Installing' or 'Uninstalling'
 
     .NOTES
-        The triple quotes are required any time you need a " in a normal script block.
+    The triple quotes are required any time you need a " in a normal script block.
-
+    The winget Return codes are documented here: https://github.com/microsoft/winget-cli/blob/master/doc/windows/package-manager/winget/returnCodes.md
     #>
 
     param(
-        $ProgramsToInstall,
+        [Parameter(Mandatory, Position=0)]
-        $manage = "Installing"
+        [PsCustomObject]$ProgramsToInstall,
-    )
 
+        [Parameter(Position=1)]
+        [String]$manage = "Installing"
+    )
     $x = 0
-    $count = $($ProgramsToInstall -split ",").Count
+    $count = $ProgramsToInstall.Count
 
     Write-Progress -Activity "$manage Applications" -Status "Starting" -PercentComplete 0
-
+    Write-Host "==========================================="
-    Foreach ($Program in $($ProgramsToInstall -split ",")){
+    Write-Host "--    Configuring winget packages       ---"
-
+    Write-Host "==========================================="
-        Write-Progress -Activity "$manage Applications" -Status "$manage $Program $($x + 1) of $count" -PercentComplete $($x/$count*100)
+    Foreach ($Program in $ProgramsToInstall){
+        $failedPackages = @()
+        Write-Progress -Activity "$manage Applications" -Status "$manage $($Program.winget) $($x + 1) of $count" -PercentComplete $($x/$count*100)
         if($manage -eq "Installing"){
-            Start-Process -FilePath winget -ArgumentList "install -e --accept-source-agreements --accept-package-agreements --scope=machine --silent $Program" -NoNewWindow -Wait
+            # Install package via ID, if it fails try again with different scope and then with an unelevated prompt.
+            # Since Install-WinGetPackage might not be directly available, we use winget install command as a workaround.
+            # Winget, not all installers honor any of the following: System-wide, User Installs, or Unelevated Prompt OR Silent Install Mode.
+            # This is up to the individual package maintainers to enable these options. Aka. not as clean as Linux Package Managers.
+            Write-Host "Starting install of $($Program.winget) with winget."
+            try {
+                $status = $(Start-Process -FilePath "winget" -ArgumentList "install --id $($Program.winget) --silent --accept-source-agreements --accept-package-agreements" -Wait -PassThru -NoNewWindow).ExitCode
+                if($status -eq 0){
+                    Write-Host "$($Program.winget) installed successfully."
+                    continue
+                }
+                if ($status -eq  -1978335189){
+                    Write-Host "$($Program.winget) No applicable update found"
+                    continue
+                }
+                Write-Host "Attempt with User scope"
+                $status = $(Start-Process -FilePath "winget" -ArgumentList "install --id $($Program.winget) --scope user --silent --accept-source-agreements --accept-package-agreements" -Wait -PassThru -NoNewWindow).ExitCode
+                if($status -eq 0){
+                    Write-Host "$($Program.winget) installed successfully with User scope."
+                    continue
+                }
+                if ($status -eq  -1978335189){
+                    Write-Host "$($Program.winget) No applicable update found"
+                    continue
+                }
+                Write-Host "Attempt with User prompt"
+                $userChoice = [System.Windows.MessageBox]::Show("Do you want to attempt $($Program.winget) installation with specific user credentials? Select 'Yes' to proceed or 'No' to skip.", "User Credential Prompt", [System.Windows.MessageBoxButton]::YesNo)
+                if ($userChoice -eq 'Yes') {
+                    $getcreds = Get-Credential
+                    $process = Start-Process -FilePath "winget" -ArgumentList "install --id $($Program.winget) --silent --accept-source-agreements --accept-package-agreements" -Credential $getcreds -PassThru -NoNewWindow
+                    Wait-Process -Id $process.Id
+                    $status = $process.ExitCode
+                } else {
+                    Write-Host "Skipping installation with specific user credentials."
+                }
+                if($status -eq 0){
+                    Write-Host "$($Program.winget) installed successfully with User prompt."
+                    continue
+                }
+                if ($status -eq  -1978335189){
+                    Write-Host "$($Program.winget) No applicable update found"
+                    continue
+                }
+            } catch {
+                Write-Host "Failed to install $($Program.winget). With winget"
+                $failedPackages += $Program
+            }
         }
         if($manage -eq "Uninstalling"){
-            Start-Process -FilePath winget -ArgumentList "uninstall -e --purge --force --silent $Program" -NoNewWindow -Wait
+            # Uninstall package via ID using winget directly.
+            try {
+                $status = $(Start-Process -FilePath "winget" -ArgumentList "uninstall --id $($Program.winget) --silent" -Wait -PassThru -NoNewWindow).ExitCode
+                if($status -ne 0){
+                    Write-Host "Failed to uninstall $($Program.winget)."
+                } else {
+                    Write-Host "$($Program.winget) uninstalled successfully."
+                    $failedPackages += $Program
+                }
+            } catch {
+                Write-Host "Failed to uninstall $($Program.winget) due to an error: $_"
+                $failedPackages += $Program
+            }
         }
-
         $X++
     }
-
     Write-Progress -Activity "$manage Applications" -Status "Finished" -Completed
-
+    return $failedPackages;
-}
+}

functions/private/Install-WinUtilWinget.ps1

@@ -1,50 +1,66 @@
-function Get-LatestHash {
-    $shaUrl = ((Invoke-WebRequest $apiLatestUrl -UseBasicParsing | ConvertFrom-Json).assets | Where-Object { $_.name -match '^Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.txt$' }).browser_download_url
-
-    $shaFile = Join-Path -Path $tempFolder -ChildPath 'Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.txt'
-    $WebClient.DownloadFile($shaUrl, $shaFile)
-
-    Get-Content $shaFile
-}
-
 function Install-WinUtilWinget {
-
     <#
 
     .SYNOPSIS
-        Installs Winget if it is not already installed
+        Installs Winget if it is not already installed.
 
     .DESCRIPTION
-        This function will download the latest version of winget and install it. If winget is already installed, it will do nothing.
+        This function will download the latest version of Winget and install it. If Winget is already installed, it will do nothing.
     #>
-    Try{
+    $isWingetInstalled = Test-WinUtilPackageManager -winget
-        Write-Host "Checking if Winget is Installed..."
+
-        if (Test-WinUtilPackageManager -winget) {
+    Try {
-            # Checks if winget executable exists and if the Windows Version is 1809 or higher
+        if ($isWingetInstalled -eq "installed") {
-            Write-Host "Winget Already Installed"
+            Write-Host "`nWinget is already installed.`r" -ForegroundColor Green
             return
+        } elseif ($isWingetInstalled -eq "outdated") {
+            Write-Host "`nWinget is Outdated. Continuing with install.`r" -ForegroundColor Yellow
+        } else {
+            Write-Host "`nWinget is not Installed. Continuing with install.`r" -ForegroundColor Red
         }
 
         # Gets the computer's information
         if ($null -eq $sync.ComputerInfo){
             $ComputerInfo = Get-ComputerInfo -ErrorAction Stop
-        }
+        } else {
-        Else {
             $ComputerInfo = $sync.ComputerInfo
         }
 
         if (($ComputerInfo.WindowsVersion) -lt "1809") {
-            # Checks if Windows Version is too old for winget
+            # Checks if Windows Version is too old for Winget
-            Write-Host "Winget is not supported on this version of Windows (Pre-1809)"
+            Write-Host "Winget is not supported on this version of Windows (Pre-1809)" -ForegroundColor Red
             return
         }
 
-        Write-Host "Running Alternative Installer and Direct Installing"
+        # Install Winget via GitHub method.
-        Start-Process -Verb runas -FilePath powershell.exe -ArgumentList "choco install winget"
+        # Used part of my own script with some modification: ruxunderscore/windows-initialization
-
+        Write-Host "Downloading Winget Prerequsites`n"
-        Write-Host "Winget Installed"
+        Get-WinUtilWingetPrerequisites
+        Write-Host "Downloading Winget and License File`r"
+        Get-WinUtilWingetLatest
+        Write-Host "Installing Winget w/ Prerequsites`r"
+        Add-AppxProvisionedPackage -Online -PackagePath $ENV:TEMP\Microsoft.DesktopAppInstaller.msixbundle -DependencyPackagePath $ENV:TEMP\Microsoft.VCLibs.x64.Desktop.appx, $ENV:TEMP\Microsoft.UI.Xaml.x64.appx -LicensePath $ENV:TEMP\License1.xml
+		Write-Host "Manually adding Winget Sources, from Winget CDN."
+		Add-AppxPackage -Path https://cdn.winget.microsoft.com/cache/source.msix #Seems some installs of Winget don't add the repo source, this should makes sure that it's installed every time.
+        Write-Host "Winget Installed" -ForegroundColor Green
+        Write-Host "Enabling NuGet and Module..."
+        Install-PackageProvider -Name NuGet -Force
+        Install-Module -Name Microsoft.WinGet.Client -Force
+        # Winget only needs a refresh of the environment variables to be used.
+        Write-Output "Refreshing Environment Variables...`n"
+        $ENV:PATH = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
+    } Catch {
+        Write-Host "Failure detected while installing via GitHub method. Continuing with Chocolatey method as fallback." -ForegroundColor Red
+        # In case install fails via GitHub method.
+        Try {
+        # Install Choco if not already present
+        Install-WinUtilChoco
+        Start-Process -Verb runas -FilePath powershell.exe -ArgumentList "choco install winget-cli"
+        Write-Host "Winget Installed" -ForegroundColor Green
+        Write-Output "Refreshing Environment Variables...`n"
+        $ENV:PATH = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
+        } Catch {
+            throw [WingetFailedInstall]::new('Failed to install!')
+        }
     }
-    Catch{
+}
-        throw [WingetFailedInstall]::new('Failed to install')
-    }
-}

functions/private/Invoke-MicroWin-Helper.ps1

@@ -1,45 +1,24 @@
-function Invoke-MicroWin-Helper {
-<#
-
-    .SYNOPSIS
-        checking unit tests
-
-    .PARAMETER Name
-        no parameters
-
-    .EXAMPLE
-        placeholder
-
-#>
-
-}
-
 function Test-CompatibleImage() {
 <#
 
     .SYNOPSIS
-        Checks the version of a Windows image and determines whether or not it is compatible depending on the Major property
+        Checks the version of a Windows image and determines whether or not it is compatible with a specific feature depending on a desired version
 
-    .PARAMETER imgVersion
+    .PARAMETER Name
-        The version of the Windows image
+        imgVersion - The version of the Windows image
+        desiredVersion - The version to compare the image version with
 
 #>
 
     param
     (
-        [Parameter(Mandatory = $true)] [string] $imgVersion
+        [Parameter(Mandatory = $true, Position=0)] [string] $imgVersion,
+        [Parameter(Mandatory = $true, Position=1)] [Version] $desiredVersion
     )
 
     try {
         $version = [Version]$imgVersion
-        if ($version.Major -ge 10)
+        return $version -ge $desiredVersion
-        {
-            return $True
-        }
-        else
-        {
-            return $False
-        }
     } catch {
         return $False
     }
@@ -59,38 +38,39 @@ function Remove-Features([switch] $dumpFeatures = $false, [switch] $keepDefender
         Remove-Features -keepDefender:$false
 
 #>
-	$appxlist = dism /English /image:$scratchDir /Get-Features | Select-String -Pattern "Feature Name : " -CaseSensitive -SimpleMatch
+	$featlist = (Get-WindowsOptionalFeature -Path $scratchDir).FeatureName
-	$appxlist = $appxlist -split "Feature Name : " | Where-Object {$_}
 	if ($dumpFeatures)
 	{
-		$appxlist > allfeaturesdump.txt
+		$featlist > allfeaturesdump.txt
 	}
 
-	$appxlist = $appxlist | Where-Object {
+	$featlist = $featlist | Where-Object {
 		$_ -NotLike "*Printing*" -AND
 		$_ -NotLike "*TelnetClient*" -AND
 		$_ -NotLike "*PowerShell*" -AND
-		$_ -NotLike "*NetFx*"
+		$_ -NotLike "*NetFx*" -AND
+		$_ -NotLike "*Media*" -AND
+		$_ -NotLike "*NFS*"
 	}
 
-	if ($keepDefender) { $appxlist = $appxlist | Where-Object { $_ -NotLike "*Defender*" }}
+	if ($keepDefender) { $featlist = $featlist | Where-Object { $_ -NotLike "*Defender*" }}
 
-	foreach($feature in $appxlist)
+	foreach($feature in $featlist)
 	{
 		$status = "Removing feature $feature"
-		Write-Progress -Activity "Removing features" -Status $status -PercentComplete ($counter++/$appxlist.Count*100)
+		Write-Progress -Activity "Removing features" -Status $status -PercentComplete ($counter++/$featlist.Count*100)
 		Write-Debug "Removing feature $feature"
-		# dism /image:$scratchDir /Disable-Feature /FeatureName:$feature /Remove /NoRestart > $null
+		Disable-WindowsOptionalFeature -Path "$scratchDir" -FeatureName $feature -Remove  -ErrorAction SilentlyContinue -NoRestart
 	}
 	Write-Progress -Activity "Removing features" -Status "Ready" -Completed
+	Write-Host "You can re-enable the disabled features at any time, using either Windows Update or the SxS folder in <installation media>\Sources."
 }
 
 function Remove-Packages
 {
-	$appxlist = dism /English /Image:$scratchDir /Get-Packages | Select-String -Pattern "Package Identity : " -CaseSensitive -SimpleMatch
+	$pkglist = (Get-WindowsPackage -Path "$scratchDir").PackageName
-	$appxlist = $appxlist -split "Package Identity : " | Where-Object {$_}
 
-	$appxlist = $appxlist | Where-Object {
+	$pkglist = $pkglist | Where-Object {
 			$_ -NotLike "*ApplicationModel*" -AND
 			$_ -NotLike "*indows-Client-LanguagePack*" -AND
 			$_ -NotLike "*LanguageFeatures-Basic*" -AND
@@ -125,14 +105,21 @@ function Remove-Packages
 			$_ -NotLike "*DesktopAppInstaller*" -AND
 			$_ -NotLike "*WebMediaExtensions*" -AND
 			$_ -NotLike "*WMIC*" -AND
-			$_ -NotLike "*UI.XaML*"	
+			$_ -NotLike "*UI.XaML*"
-		} 
+		}
 
-	foreach ($appx in $appxlist)
+	foreach ($pkg in $pkglist)
 	{
-		$status = "Removing $appx"
+		try {
-		Write-Progress -Activity "Removing Apps" -Status $status -PercentComplete ($counter++/$appxlist.Count*100)
+			$status = "Removing $pkg"
-		dism /English /image:$scratchDir /Remove-Package /PackageName:$appx /NoRestart
+			Write-Progress -Activity "Removing Apps" -Status $status -PercentComplete ($counter++/$pkglist.Count*100)
+			Remove-WindowsPackage -Path "$scratchDir" -PackageName $pkg -NoRestart -ErrorAction SilentlyContinue
+		}
+		catch {
+			# This can happen if the package that is being removed is a permanent one, like FodMetadata
+			Write-Host "Could not remove OS package $($pkg)"
+			continue
+		}
 	}
 	Write-Progress -Activity "Removing Apps" -Status "Ready" -Completed
 }
@@ -161,9 +148,9 @@ function Remove-ProvisionedPackages([switch] $keepSecurity = $false)
 			$_.PackageName -NotLike "*Notepad*" -and
 			$_.PackageName -NotLike "*Printing*" -and
 			$_.PackageName -NotLike "*Wifi*" -and
-			$_.PackageName -NotLike "*Foundation*" 
+			$_.PackageName -NotLike "*Foundation*"
-		} 
+		}
-    
+
     if ($?)
     {
         if ($keepSecurity) { $appxProvisionedPackages = $appxProvisionedPackages | Where-Object { $_.PackageName -NotLike "*SecHealthUI*" }}
@@ -172,7 +159,13 @@ function Remove-ProvisionedPackages([switch] $keepSecurity = $false)
 	    {
 		    $status = "Removing Provisioned $($appx.PackageName)"
 		    Write-Progress -Activity "Removing Provisioned Apps" -Status $status -PercentComplete ($counter++/$appxProvisionedPackages.Count*100)
-		    dism /English /image:$scratchDir /Remove-ProvisionedAppxPackage /PackageName:$($appx.PackageName) /NoRestart
+			try {
+				Remove-AppxProvisionedPackage -Path $scratchDir -PackageName $appx.PackageName -ErrorAction SilentlyContinue
+			}
+			catch {
+				Write-Host "Application $($appx.PackageName) could not be removed"
+				continue
+			}
 	    }
 	    Write-Progress -Activity "Removing Provisioned Apps" -Status "Ready" -Completed
     }
@@ -200,7 +193,7 @@ function Copy-ToUSB([string] $fileToCopy)
 					Write-Progress -Activity "Copying File" -Status "Progress" -PercentComplete $completed -CurrentOperation ("{0:N2} MB / {1:N2} MB" -f ($_.BytesTransferred / 1MB), ($totalSize / 1MB))
 				}
 
-			Write-Host "File copied to Ventoy drive $($volume.DriveLette)"
+			Write-Host "File copied to Ventoy drive $($volume.DriveLetter)"
 			return
 		}
 	}
@@ -224,13 +217,13 @@ function Remove-FileOrDirectory([string] $pathToDelete, [string] $mask = "", [sw
 	# Remove-Item -Path $directoryPath -Recurse -Force
 
 	# # Grant full control to BUILTIN\Administrators using icacls
-	# $directoryPath = "$($scratchDir)\Windows\System32\WebThreatDefSvc" 
+	# $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 "")
@@ -238,19 +231,19 @@ function Remove-FileOrDirectory([string] $pathToDelete, [string] $mask = "", [sw
 		Write-Debug "Adding $($pathToDelete) to array."
 		[void]$itemsToDelete.Add($pathToDelete)
 	}
-	else 
+	else
 	{
-		Write-Debug "Adding $($pathToDelete) to array and mask is $($mask)" 
+		Write-Debug "Adding $($pathToDelete) to array and mask is $($mask)"
 		if ($Directory)	{ $itemsToDelete = Get-ChildItem $pathToDelete -Include $mask -Recurse -Directory }
 		else { $itemsToDelete = Get-ChildItem $pathToDelete -Include $mask -Recurse }
 	}
 
 	foreach($itemToDelete in $itemsToDelete)
 	{
-		$status = "Deleteing $($itemToDelete)"
+		$status = "Deleting $($itemToDelete)"
 		Write-Progress -Activity "Removing Items" -Status $status -PercentComplete ($counter++/$itemsToDelete.Count*100)
 
-		if (Test-Path -Path "$($itemToDelete)" -PathType Container) 
+		if (Test-Path -Path "$($itemToDelete)" -PathType Container)
 		{
 			$status = "Deleting directory: $($itemToDelete)"
 
@@ -321,7 +314,7 @@ function New-Unattend {
 	<unattend xmlns="urn:schemas-microsoft-com:unattend"
 			xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"
 			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
+        <#REPLACEME#>
 		<settings pass="auditUser">
 			<component name="Microsoft-Windows-Deployment" 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">
 				<RunSynchronous>
@@ -362,7 +355,27 @@ function New-Unattend {
 		</settings>
 	</unattend>
 '@
-	$unattend | Out-File -FilePath "$env:temp\unattend.xml" -Force
+    $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>
+            </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>
+'@
+    if ((Test-CompatibleImage $imgVersion $([System.Version]::new(10,0,22000,1))) -eq $false)
+    {
+        # Replace the placeholder text with an empty string to make it valid for Windows 10 Setup
+        $unattend = $unattend.Replace("<#REPLACEME#>", "").Trim()
+    }
+    else
+    {
+        # Replace the placeholder text with the Specialize pass
+        $unattend = $unattend.Replace("<#REPLACEME#>", $specPass).Trim()
+    }
+	$unattend | Out-File -FilePath "$env:temp\unattend.xml" -Force -Encoding utf8
 }
 
 function New-CheckInstall {
@@ -450,16 +463,16 @@ function New-FirstRun {
 		param (
 			[Parameter(Mandatory = $true)]
 			[string]$RegistryPath,
-	
+
 			[Parameter(Mandatory = $true)]
 			[string]$ValueName
 		)
-	
+
 		# Check if the registry path exists
 		if (Test-Path -Path $RegistryPath)
 		{
 			$registryValue = Get-ItemProperty -Path $RegistryPath -Name $ValueName -ErrorAction SilentlyContinue
-	
+
 			# Check if the registry value exists
 			if ($registryValue)
 			{
@@ -477,7 +490,7 @@ function New-FirstRun {
 			Write-Host "Registry path '$RegistryPath' not found."
 		}
 	}
-	
+
 	function Stop-UnnecessaryServices
 	{
 		$servicesToExclude = @(
@@ -543,8 +556,8 @@ function New-FirstRun {
 			"vm3dservice",
 			"webthreatdefusersvc_dc2a4",
 			"wscsvc"
-)	
+)
-	
+
 		$runningServices = Get-Service | Where-Object { $servicesToExclude -notcontains $_.Name }
 		foreach($service in $runningServices)
 		{
@@ -553,28 +566,28 @@ function New-FirstRun {
 			"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; 
+	#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 
+	# Delete all files on the Taskbar
 	Get-ChildItem -Path $taskbarPath -File | Remove-Item -Force
 	Remove-RegistryValue -RegistryPath "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Taskband" -ValueName "FavoritesRemovedChanges"
 	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"
@@ -586,9 +599,9 @@ function New-FirstRun {
 	# Delete Edge Icon from the desktop
 	$edgeShortcutFiles = Get-ChildItem -Path $desktopPath -Filter "*Edge*.lnk"
 	# Check if Edge shortcuts exist on the desktop
-	if ($edgeShortcutFiles) 
+	if ($edgeShortcutFiles)
 	{
-		foreach ($shortcutFile in $edgeShortcutFiles) 
+		foreach ($shortcutFile in $edgeShortcutFiles)
 		{
 			# Remove each Edge shortcut
 			Remove-Item -Path $shortcutFile.FullName -Force
@@ -608,7 +621,7 @@ function New-FirstRun {
 	$shortcutPath = Join-Path $desktopPath 'winutil.lnk'
 	# Create a shell object
 	$shell = New-Object -ComObject WScript.Shell
-	
+
 	# Create a shortcut object
 	$shortcut = $shell.CreateShortcut($shortcutPath)
 
@@ -616,19 +629,26 @@ function New-FirstRun {
 	{
 		$shortcut.IconLocation = "c:\Windows\cttlogo.png"
 	}
-	
+
 	# Set properties of the shortcut
 	$shortcut.TargetPath = "powershell.exe"
 	$shortcut.Arguments = "-NoProfile -ExecutionPolicy Bypass -Command `"$command`""
 	# Save the shortcut
 	$shortcut.Save()
+
+        # Make the shortcut have 'Run as administrator' property on
+        $bytes = [System.IO.File]::ReadAllBytes($shortcutPath)
+        # Set byte value at position 0x15 in hex, or 21 in decimal, from the value 0x00 to 0x20 in hex
+        $bytes[0x15] = $bytes[0x15] -bor 0x20
+        [System.IO.File]::WriteAllBytes($shortcutPath, $bytes)
+
 	Write-Host "Shortcut created at: $shortcutPath"
-	# 
+	#
 	# Done create WinUtil shortcut on the desktop
 	# ************************************************
 
 	Start-Process explorer
-	
+
 '@
-	$firstRun | Out-File -FilePath "$env:temp\FirstStartup.ps1" -Force 
+	$firstRun | Out-File -FilePath "$env:temp\FirstStartup.ps1" -Force
-}
+}

functions/private/Invoke-WinUtilCurrentSystem.ps1

@@ -58,6 +58,9 @@ Function Invoke-WinUtilCurrentSystem {
                                 $values += $False
                             }
                         }
+                        else {
+                            $values += $False
+                        }
                     }
                 }
 

functions/private/Invoke-WinUtilGPU.ps1

@@ -0,0 +1,21 @@
+function Invoke-WinUtilGPU {
+    $gpuInfo = Get-CimInstance Win32_VideoController
+
+    # GPUs to blacklist from using Demanding Theming
+    $lowPowerGPUs = (
+        "*NVIDIA GeForce*M*",
+        "*NVIDIA GeForce*Laptop*",
+        "*NVIDIA GeForce*GT*",
+        "*AMD Radeon(TM)*",
+        "*UHD*"
+    )
+
+    foreach ($gpu in $gpuInfo) {
+        foreach ($gpuPattern in $lowPowerGPUs){
+            if ($gpu.Name -like $gpuPattern) {
+                return $false
+            }
+        }
+    }
+    return $true
+}

functions/private/Invoke-WinUtilHiddenFiles.ps1

@@ -0,0 +1,34 @@
+function Invoke-WinUtilHiddenFiles {
+    <#
+
+    .SYNOPSIS
+        Enable/Disable Hidden Files
+
+    .PARAMETER Enabled
+        Indicates whether to enable or disable Hidden Files
+
+    #>
+    Param($Enabled)
+    Try{
+        if ($Enabled -eq $false){
+            Write-Host "Enabling Hidden Files"
+            $value = 1
+        }
+        else {
+            Write-Host "Disabling Hidden Files"
+            $value = 0
+        }
+        $Path = "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced"
+        Set-ItemProperty -Path $Path -Name Hidden -Value $value
+    }
+    Catch [System.Security.SecurityException] {
+        Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
+    }
+    Catch [System.Management.Automation.ItemNotFoundException] {
+        Write-Warning $psitem.Exception.ErrorRecord
+    }
+    Catch{
+        Write-Warning "Unable to set $Name due to unhandled exception"
+        Write-Warning $psitem.Exception.StackTrace
+    }
+}

functions/private/Invoke-WinUtilMouseAcceleration.ps1

@@ -15,13 +15,13 @@ Function Invoke-WinUtilMouseAcceleration {
             $MouseSpeed = 1
             $MouseThreshold1 = 6
             $MouseThreshold2 = 10
-        } 
+        }
         else {
             Write-Host "Disabling Mouse Acceleration"
             $MouseSpeed = 0
             $MouseThreshold1 = 0
-            $MouseThreshold2 = 0 
+            $MouseThreshold2 = 0
-            
+
         }
 
         $Path = "HKCU:\Control Panel\Mouse"

functions/private/Invoke-WinUtilNumLock.ps1

@@ -15,7 +15,8 @@ function Invoke-WinUtilNumLock {
             Write-Host "Disabling Numlock on startup"
             $value = 0
         }
-        $Path = "HKCU:\Control Panel\Keyboard"
+        New-PSDrive -PSProvider Registry -Name HKU -Root HKEY_USERS
+        $Path = "HKU:\.Default\Control Panel\Keyboard"
         Set-ItemProperty -Path $Path -Name InitialKeyboardIndicators -Value $value
     }
     Catch [System.Security.SecurityException] {

functions/private/Invoke-WinUtilSnapSuggestion.ps1

@@ -0,0 +1,34 @@
+function Invoke-WinUtilSnapSuggestion {
+    <#
+    .SYNOPSIS
+        Disables/Enables Snap Assist Suggestions on startup
+    .PARAMETER Enabled
+        Indicates whether to enable or disable Snap Assist Suggestions on startup
+    #>
+    Param($Enabled)
+    Try{
+        if ($Enabled -eq $false){
+            Write-Host "Enabling Snap Assist Suggestion On startup"
+            $value = 1
+        }
+        else {
+            Write-Host "Disabling Snap Assist Suggestion 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 SnapAssist -Value $value
+        Start-Process "explorer.exe"
+    }
+    Catch [System.Security.SecurityException] {
+        Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
+    }
+    Catch [System.Management.Automation.ItemNotFoundException] {
+        Write-Warning $psitem.Exception.ErrorRecord
+    }
+    Catch{
+        Write-Warning "Unable to set $Name due to unhandled exception"
+        Write-Warning $psitem.Exception.StackTrace
+    }
+}

functions/private/Invoke-WinUtilSnapWindow.ps1

@@ -0,0 +1,31 @@
+function Invoke-WinUtilSnapWindow {
+    <#
+    .SYNOPSIS
+        Disables/Enables Snapping Windows on startup
+    .PARAMETER Enabled
+        Indicates whether to enable or disable Snapping Windows on startup
+    #>
+    Param($Enabled)
+    Try{
+        if ($Enabled -eq $false){
+            Write-Host "Enabling Snap Windows On startup | Relogin Required"
+            $value = 1
+        }
+        else {
+            Write-Host "Disabling Snap Windows On startup | Relogin Required"
+            $value = 0
+        }
+        $Path = "HKCU:\Control Panel\Desktop"
+        Set-ItemProperty -Path $Path -Name WindowArrangementActive -Value $value
+    }
+    Catch [System.Security.SecurityException] {
+        Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
+    }
+    Catch [System.Management.Automation.ItemNotFoundException] {
+        Write-Warning $psitem.Exception.ErrorRecord
+    }
+    Catch{
+        Write-Warning "Unable to set $Name due to unhandled exception"
+        Write-Warning $psitem.Exception.StackTrace
+    }
+}

functions/private/Invoke-WinUtilSponsors.ps1

@@ -0,0 +1,45 @@
+Function Invoke-WinUtilSponsors {
+    <#
+    .SYNOPSIS
+        Lists Sponsors from ChrisTitusTech
+    .DESCRIPTION
+        Lists Sponsors from ChrisTitusTech
+    .EXAMPLE
+        Invoke-WinUtilSponsors
+    .NOTES
+        This function is used to list sponsors from ChrisTitusTech
+    #>
+    try {
+        # Define the URL and headers
+        $url = "https://github.com/sponsors/ChrisTitusTech"
+        $headers = @{
+            "User-Agent" = "Chrome/58.0.3029.110"
+        }
+
+        # Fetch the webpage content
+        try {
+            $html = Invoke-RestMethod -Uri $url -Headers $headers
+        } catch {
+            Write-Output $_.Exception.Message
+            exit
+        }
+
+        # Use regex to extract the content between "Current sponsors" and "Past sponsors"
+        $currentSponsorsPattern = '(?s)(?<=Current sponsors).*?(?=Past sponsors)'
+        $currentSponsorsHtml = [regex]::Match($html, $currentSponsorsPattern).Value
+
+        # Use regex to extract the sponsor usernames from the alt attributes in the "Current Sponsors" section
+        $sponsorPattern = '(?<=alt="@)[^"]+'
+        $sponsors = [regex]::Matches($currentSponsorsHtml, $sponsorPattern) | ForEach-Object { $_.Value }
+
+        # Exclude "ChrisTitusTech" from the sponsors
+        $sponsors = $sponsors | Where-Object { $_ -ne "ChrisTitusTech" }
+
+        # Return the sponsors
+        return $sponsors
+    }
+    catch {
+        Write-Error "An error occurred while fetching or processing the sponsors: $_"
+        return $null
+    }
+}

functions/private/Invoke-WinUtilStickyKeys.ps1

@@ -6,7 +6,7 @@ Function Invoke-WinUtilStickyKeys {
         Indicates whether to enable or disable Sticky Keys on startup
     #>
     Param($Enabled)
-    Try { 
+    Try {
         if ($Enabled -eq $false){
             Write-Host "Enabling Sticky Keys On startup"
             $value = 510

functions/private/Invoke-WinUtilTaskView.ps1

@@ -0,0 +1,34 @@
+function Invoke-WinUtilTaskView {
+    <#
+
+    .SYNOPSIS
+        Enable/Disable Task View
+
+    .PARAMETER Enabled
+        Indicates whether to enable or disable Task View
+
+    #>
+    Param($Enabled)
+    Try{
+        if ($Enabled -eq $false){
+            Write-Host "Enabling Task View"
+            $value = 1
+        }
+        else {
+            Write-Host "Disabling Task View"
+            $value = 0
+        }
+        $Path = "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced"
+        Set-ItemProperty -Path $Path -Name ShowTaskViewButton -Value $value
+    }
+    Catch [System.Security.SecurityException] {
+        Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
+    }
+    Catch [System.Management.Automation.ItemNotFoundException] {
+        Write-Warning $psitem.Exception.ErrorRecord
+    }
+    Catch{
+        Write-Warning "Unable to set $Name due to unhandled exception"
+        Write-Warning $psitem.Exception.StackTrace
+    }
+}

functions/private/Invoke-WinUtilTaskbarAlignment.ps1

@@ -0,0 +1,34 @@
+function Invoke-WinUtilTaskbarAlignment {
+    <#
+
+    .SYNOPSIS
+        Switches between Center & Left Taskbar Alignment
+
+    .PARAMETER Enabled
+        Indicates whether to make Taskbar Alignment Center or Left
+
+    #>
+    Param($Enabled)
+    Try{
+        if ($Enabled -eq $false){
+            Write-Host "Making Taskbar Alignment to the Center"
+            $value = 1
+        }
+        else {
+            Write-Host "Making Taskbar Alignment to the Left"
+            $value = 0
+        }
+        $Path = "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced"
+        Set-ItemProperty -Path $Path -Name "TaskbarAl" -Value $value
+    }
+    Catch [System.Security.SecurityException] {
+        Write-Warning "Unable to set $Path\$Name to $value due to a Security Exception"
+    }
+    Catch [System.Management.Automation.ItemNotFoundException] {
+        Write-Warning $psitem.Exception.ErrorRecord
+    }
+    Catch{
+        Write-Warning "Unable to set $Name due to unhandled exception"
+        Write-Warning $psitem.Exception.StackTrace
+    }
+}

functions/private/Invoke-WinUtilTaskbarSearch.ps1

@@ -0,0 +1,34 @@
+function Invoke-WinUtilTaskbarSearch {
+    <#
+
+    .SYNOPSIS
+        Enable/Disable Taskbar Search Button.
+
+    .PARAMETER Enabled
+        Indicates whether to enable or disable Taskbar Search Button.
+
+    #>
+    Param($Enabled)
+    Try{
+        if ($Enabled -eq $false){
+            Write-Host "Enabling Search Button"
+            $value = 1
+        }
+        else {
+            Write-Host "Disabling Search Button"
+            $value = 0
+        }
+        $Path = "HKCU:\Software\Microsoft\Windows\CurrentVersion\Search\"
+        Set-ItemProperty -Path $Path -Name SearchboxTaskbarMode -Value $value
+    }
+    Catch [System.Security.SecurityException] {
+        Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
+    }
+    Catch [System.Management.Automation.ItemNotFoundException] {
+        Write-Warning $psitem.Exception.ErrorRecord
+    }
+    Catch{
+        Write-Warning "Unable to set $Name due to unhandled exception"
+        Write-Warning $psitem.Exception.StackTrace
+    }
+}

functions/private/Invoke-WinUtilTaskbarWidgets.ps1

@@ -0,0 +1,34 @@
+function Invoke-WinUtilTaskbarWidgets {
+    <#
+
+    .SYNOPSIS
+        Enable/Disable Taskbar Widgets
+
+    .PARAMETER Enabled
+        Indicates whether to enable or disable Taskbar Widgets
+
+    #>
+    Param($Enabled)
+    Try{
+        if ($Enabled -eq $false){
+            Write-Host "Enabling Taskbar Widgets"
+            $value = 1
+        }
+        else {
+            Write-Host "Disabling Taskbar Widgets"
+            $value = 0
+        }
+        $Path = "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced"
+        Set-ItemProperty -Path $Path -Name TaskbarDa -Value $value
+    }
+    Catch [System.Security.SecurityException] {
+        Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
+    }
+    Catch [System.Management.Automation.ItemNotFoundException] {
+        Write-Warning $psitem.Exception.ErrorRecord
+    }
+    Catch{
+        Write-Warning "Unable to set $Name due to unhandled exception"
+        Write-Warning $psitem.Exception.StackTrace
+    }
+}

functions/private/Invoke-WinUtilTweaks.ps1

@@ -10,11 +10,15 @@ function Invoke-WinUtilTweaks {
     .PARAMETER undo
         Indicates whether to undo the operation contained in the checkbox
 
+    .PARAMETER KeepServiceStartup
+        Indicates whether to override the startup of a service with the one given from WinUtil,
+        or to keep the startup of said service, if it was changed by the user, or another program, from its default value.
     #>
 
     param(
         $CheckBox,
-        $undo = $false
+        $undo = $false,
+        $KeepServiceStartup = $true
     )
 
     Write-Debug "Tweaks: $($CheckBox)"
@@ -32,6 +36,7 @@ function Invoke-WinUtilTweaks {
             Registry = "Value"
             ScheduledTask = "State"
             Service = "StartupType"
+            OriginalService = "OriginalType"
             ScriptType = "InvokeScript"
         }
     }
@@ -42,9 +47,29 @@ function Invoke-WinUtilTweaks {
         }
     }
     if($sync.configs.tweaks.$CheckBox.service){
+        Write-Debug "KeepServiceStartup is $KeepServiceStartup"
         $sync.configs.tweaks.$CheckBox.service | ForEach-Object {
-            Write-Debug "$($psitem.Name) and state is $($psitem.$($values.service))"
+            $changeservice = $true
-            Set-WinUtilService -Name $psitem.Name -StartupType $psitem.$($values.Service)
+
+	    # The check for !($undo) is required, without it the script will throw an error for accessing unavailable memeber, which's the 'OriginalService' Property
+            if($KeepServiceStartup -AND !($undo)) {
+                try {
+                    # Check if the service exists
+                    $service = Get-Service -Name $psitem.Name -ErrorAction Stop
+                    if(!($service.StartType.ToString() -eq $psitem.$($values.OriginalService))) {
+                        Write-Debug "Service $($service.Name) was changed in the past to $($service.StartType.ToString()) from it's original type of $($psitem.$($values.OriginalService)), will not change it to $($psitem.$($values.service))"
+                        $changeservice = $false
+                    }
+                }
+                catch [System.ServiceProcess.ServiceNotFoundException] {
+                    Write-Warning "Service $($psitem.Name) was not found"
+                }
+            }
+
+            if($changeservice) {
+                Write-Debug "$($psitem.Name) and state is $($psitem.$($values.service))"
+                Set-WinUtilService -Name $psitem.Name -StartupType $psitem.$($values.Service)
+            }
         }
     }
     if($sync.configs.tweaks.$CheckBox.registry){
@@ -70,4 +95,4 @@ function Invoke-WinUtilTweaks {
         }
 
     }
-}
+}

functions/private/Set-WinUtilDNS.ps1

@@ -24,6 +24,7 @@ function Set-WinUtilDNS {
             }
             Else{
                 Set-DnsClientServerAddress -InterfaceIndex $Adapter.ifIndex -ServerAddresses ("$($sync.configs.dns.$DNSProvider.Primary)", "$($sync.configs.dns.$DNSProvider.Secondary)")
+                Set-DnsClientServerAddress -InterfaceIndex $Adapter.ifIndex -ServerAddresses ("$($sync.configs.dns.$DNSProvider.Primary6)", "$($sync.configs.dns.$DNSProvider.Secondary6)")
             }
         }
     }
@@ -31,4 +32,4 @@ function Set-WinUtilDNS {
         Write-Warning "Unable to set DNS Provider due to an unhandled exception"
         Write-Warning $psitem.Exception.StackTrace
     }
-}
+}

functions/private/Show-CustomDialog.ps1

@@ -2,10 +2,10 @@ function Show-CustomDialog {
     <#
     .SYNOPSIS
     Displays a custom dialog box with an image, heading, message, and an OK button.
-    
+
     .DESCRIPTION
     This function creates a custom dialog box with the specified message and additional elements such as an image, heading, and an OK button. The dialog box is designed with a green border, rounded corners, and a black background.
-    
+
     .PARAMETER Message
     The message to be displayed in the dialog box.
 
@@ -14,15 +14,31 @@ function Show-CustomDialog {
 
     .PARAMETER Height
     The height of the custom dialog window.
-    
+
+    .PARAMETER FontSize
+    The Font Size for text shown inside the custom dialog window.
+
+    .PARAMETER HeaderFontSize
+    The Font Size for the Header of the custom dialog window.
+
+    .PARAMETER IconSize
+    The Size to use for Icon inside the custom dialog window.
+
+    .PARAMETER EnableScroll
+    A flag indicating whether to enable scrolling if the content exceeds the window size.
+
     .EXAMPLE
     Show-CustomDialog -Message "This is a custom dialog with a message and an image above." -Width 300 -Height 200
-    
+
     #>
     param(
         [string]$Message,
         [int]$Width = 300,
-        [int]$Height = 200
+        [int]$Height = 200,
+        [int]$FontSize = 10,
+        [int]$HeaderFontSize = 14,
+        [int]$IconSize = 25,
+        [bool]$EnableScroll = $false
     )
 
     Add-Type -AssemblyName PresentationFramework
@@ -48,6 +64,7 @@ function Show-CustomDialog {
     $dialog.Foreground = $foregroundColor
     $dialog.Background = $backgroundColor
     $dialog.FontFamily = $font
+    $dialog.FontSize = $FontSize
 
     # Create a Border for the green edge with rounded corners
     $border = New-Object Windows.Controls.Border
@@ -99,7 +116,7 @@ function Show-CustomDialog {
     $grid.RowDefinitions.Add($row0)
     $grid.RowDefinitions.Add($row1)
     $grid.RowDefinitions.Add($row2)
-        
+
     # Add StackPanel for horizontal layout with margins
     $stackPanel = New-Object Windows.Controls.StackPanel
     $stackPanel.Margin = New-Object Windows.Thickness(10)  # Add margins around the stack panel
@@ -111,9 +128,9 @@ function Show-CustomDialog {
     [Windows.Controls.Grid]::SetRow($stackPanel, 0)  # Set the row to the second row (0-based index)
 
     $viewbox = New-Object Windows.Controls.Viewbox
-    $viewbox.Width = 25
+    $viewbox.Width = $IconSize
-    $viewbox.Height = 25
+    $viewbox.Height = $IconSize
-    
+
     # Combine the paths into a single string
 #     $cttLogoPath = @"
 #     M174 1094 c-4 -14 -4 -55 -2 -92 3 -57 9 -75 41 -122 41 -60 45 -75 22 -84 -25 -9 -17 -21 30 -44 l45 -22 0 -103 c0 -91 3 -109 26 -155 30 -60 65 -87 204 -157 l95 -48 110 58 c184 96 205 127 205 293 l0 108 45 22 c47 23 55 36 30 46 -22 8 -18 30 9 63 13 16 34 48 46 71 20 37 21 52 15 116 l-6 73 -69 -23 c-38 -12 -137 -59 -220 -103 -82 -45 -160 -81 -171 -81 -12 0 -47 15 -78 34 -85 51 -239 127 -309 151 l-62 22 -6 -23z m500 -689 c20 -8 36 -19 36 -24 0 -18 -53 -51 -80 -51 -28 0 -80 33 -80 51 0 10 55 38 76 39 6 0 28 -7 48 -15z
@@ -159,7 +176,7 @@ $cttLogoPath = @"
              46.21,102.83 36.63,98.57 31.04,93.68
              16.88,81.28 19.00,62.88 19.00,46.00 Z
 "@
-    
+
     # Add SVG path
     $svgPath = New-Object Windows.Shapes.Path
     $svgPath.Data = [Windows.Media.Geometry]::Parse($cttLogoPath)
@@ -167,31 +184,89 @@ $cttLogoPath = @"
 
     # Add SVG path to Viewbox
     $viewbox.Child = $svgPath
-    
+
     # Add SVG path to the stack panel
     $stackPanel.Children.Add($viewbox)
 
     # Add "Winutil" text
     $winutilTextBlock = New-Object Windows.Controls.TextBlock
     $winutilTextBlock.Text = "Winutil"
-    $winutilTextBlock.FontSize = 18  # Adjust font size as needed
+    $winutilTextBlock.FontSize = $HeaderFontSize
     $winutilTextBlock.Foreground = $foregroundColor
     $winutilTextBlock.Margin = New-Object Windows.Thickness(10, 5, 10, 5)  # Add margins around the text block
     $stackPanel.Children.Add($winutilTextBlock)
-
     # Add TextBlock for information with text wrapping and margins
     $messageTextBlock = New-Object Windows.Controls.TextBlock
-    $messageTextBlock.Text = $Message
     $messageTextBlock.TextWrapping = [Windows.TextWrapping]::Wrap  # Enable text wrapping
     $messageTextBlock.HorizontalAlignment = [Windows.HorizontalAlignment]::Left
     $messageTextBlock.VerticalAlignment = [Windows.VerticalAlignment]::Top
     $messageTextBlock.Margin = New-Object Windows.Thickness(10)  # Add margins around the text block
-    $grid.Children.Add($messageTextBlock)
+
-    [Windows.Controls.Grid]::SetRow($messageTextBlock, 1)  # Set the row to the second row (0-based index)
+    # Define the Regex to find hyperlinks formatted as HTML <a> tags
+    $regex = [regex]::new('<a href="([^"]+)">([^<]+)</a>')
+    $lastPos = 0
+
+    # Iterate through each match and add regular text and hyperlinks
+    foreach ($match in $regex.Matches($Message)) {
+        # Add the text before the hyperlink, if any
+        $textBefore = $Message.Substring($lastPos, $match.Index - $lastPos)
+        if ($textBefore.Length -gt 0) {
+            $messageTextBlock.Inlines.Add((New-Object Windows.Documents.Run($textBefore)))
+        }
+
+        # Create and add the hyperlink
+        $hyperlink = New-Object Windows.Documents.Hyperlink
+        $hyperlink.NavigateUri = New-Object System.Uri($match.Groups[1].Value)
+        $hyperlink.Inlines.Add($match.Groups[2].Value)
+        $hyperlink.TextDecorations = [Windows.TextDecorations]::None  # Remove underline
+        $hyperlink.Foreground = $foregroundColor
+        $hyperlink.Add_Click({
+            param($sender, $args)
+            Start-Process $sender.NavigateUri.AbsoluteUri
+        })
+        $hyperlink.Add_MouseEnter({
+            param($sender, $args)
+            $sender.Foreground = [Windows.Media.Brushes]::LightGray
+        })
+        $hyperlink.Add_MouseLeave({
+            param($sender, $args)
+            $sender.Foreground = $foregroundColor
+        })
+
+        $messageTextBlock.Inlines.Add($hyperlink)
+
+        # Update the last position
+        $lastPos = $match.Index + $match.Length
+    }
+
+    # Add any remaining text after the last hyperlink
+    if ($lastPos -lt $Message.Length) {
+        $textAfter = $Message.Substring($lastPos)
+        $messageTextBlock.Inlines.Add((New-Object Windows.Documents.Run($textAfter)))
+    }
+
+    # If no matches, add the entire message as a run
+    if ($regex.Matches($Message).Count -eq 0) {
+        $messageTextBlock.Inlines.Add((New-Object Windows.Documents.Run($Message)))
+    }
+
+    # Create a ScrollViewer if EnableScroll is true
+    if ($EnableScroll) {
+        $scrollViewer = New-Object System.Windows.Controls.ScrollViewer
+        $scrollViewer.VerticalScrollBarVisibility = 'Auto'
+        $scrollViewer.HorizontalScrollBarVisibility = 'Disabled'
+        $scrollViewer.Content = $messageTextBlock
+        $grid.Children.Add($scrollViewer)
+        [Windows.Controls.Grid]::SetRow($scrollViewer, 1)  # Set the row to the second row (0-based index)
+    } else {
+        $grid.Children.Add($messageTextBlock)
+        [Windows.Controls.Grid]::SetRow($messageTextBlock, 1)  # Set the row to the second row (0-based index)
+    }
 
     # Add OK button
     $okButton = New-Object Windows.Controls.Button
     $okButton.Content = "OK"
+    $okButton.FontSize = $FontSize
     $okButton.Width = 80
     $okButton.Height = 30
     $okButton.HorizontalAlignment = [Windows.HorizontalAlignment]::Center

functions/private/Test-WinUtilPackageManager.ps1

@@ -17,37 +17,81 @@ function Test-WinUtilPackageManager {
         [System.Management.Automation.SwitchParameter]$choco
     )
 
-    # Install Winget if not detected
+    $status = "not-installed"
-    $wingetExists = Get-Command -Name winget -ErrorAction SilentlyContinue
-    if ($wingetExists) {
-        $wingetVersion = [System.Version]::Parse((winget --version).Trim('v'))
-        $minimumWingetVersion = [System.Version]::new(1,2,10691) # Win 11 23H2 comes with bad winget v1.2.10691
-        $wingetOutdated = $wingetVersion -le $minimumWingetVersion
-        
-        Write-Host "Winget v$wingetVersion"
-    }
-
-    if (!$wingetExists -or $wingetOutdated) {
-        if (!$wingetExists) {
-            Write-Host "Winget not detected"
-        } else {
-            Write-Host "- Winget out-dated"
-        } 
-    }
 
     if ($winget) {
-        if ($wingetExists -and !$wingetOutdated) {
+        # Check if Winget is available while getting it's Version if it's available
-            Write-Host "- Winget up-to-date"
+        $wingetExists = $true
-            return $true
+        try {
+            $wingetVersionFull = winget --version
+        } catch [System.Management.Automation.CommandNotFoundException], [System.Management.Automation.ApplicationFailedException] {
+            Write-Warning "Winget was not found due to un-availablity reasons"
+            $wingetExists = $false
+        } catch {
+            Write-Warning "Winget was not found due to un-known reasons, The Stack Trace is:`n$($psitem.Exception.StackTrace)"
+            $wingetExists = $false
+	}
+
+        # If Winget is available, Parse it's Version and give proper information to Terminal Output.
+	# If it isn't available, the return of this funtion will be "not-installed", indicating that
+        # Winget isn't installed/available on The System.
+	if ($wingetExists) {
+            # Check if Preview Version
+            if ($wingetVersionFull.Contains("-preview")) {
+                $wingetVersion = $wingetVersionFull.Trim("-preview")
+                $wingetPreview = $true
+            } else {
+                $wingetVersion = $wingetVersionFull
+                $wingetPreview = $false
+            }
+
+            # Check if Winget's Version is too old.
+            $wingetCurrentVersion = [System.Version]::Parse($wingetVersion.Trim('v'))
+            # Grabs the latest release of Winget from the Github API for version check process.
+            $response = Invoke-RestMethod -Uri "https://api.github.com/repos/microsoft/Winget-cli/releases/latest" -Method Get -ErrorAction Stop
+            $wingetLatestVersion = [System.Version]::Parse(($response.tag_name).Trim('v')) #Stores version number of latest release.
+            $wingetOutdated = $wingetCurrentVersion -lt $wingetLatestVersion
+            Write-Host "===========================================" -ForegroundColor Green
+            Write-Host "---        Winget is installed          ---" -ForegroundColor Green
+            Write-Host "===========================================" -ForegroundColor Green
+            Write-Host "Version: $wingetVersionFull" -ForegroundColor White
+
+            if (!$wingetPreview) {
+                Write-Host "    - Winget is a release version." -ForegroundColor Green
+            } else {
+                Write-Host "    - Winget is a preview version. Unexpected problems may occur." -ForegroundColor Yellow
+            }
+
+            if (!$wingetOutdated) {
+                Write-Host "    - Winget is Up to Date" -ForegroundColor Green
+                $status = "installed"
+            }
+            else {
+                Write-Host "    - Winget is Out of Date" -ForegroundColor Red
+                $status = "outdated"
+            }
+        } else {
+            Write-Host "===========================================" -ForegroundColor Red
+            Write-Host "---      Winget is not installed        ---" -ForegroundColor Red
+            Write-Host "===========================================" -ForegroundColor Red
+            $status = "not-installed"
         }
     }
 
-    if($choco){
+    if ($choco) {
-        if ((Get-Command -Name choco -ErrorAction Ignore) -and ($chocoVersion = (Get-Item "$env:ChocolateyInstall\choco.exe" -ErrorAction Ignore).VersionInfo.ProductVersion)){
+        if ((Get-Command -Name choco -ErrorAction Ignore) -and ($chocoVersion = (Get-Item "$env:ChocolateyInstall\choco.exe" -ErrorAction Ignore).VersionInfo.ProductVersion)) {
-            Write-Host "Chocolatey v$chocoVersion"
+            Write-Host "===========================================" -ForegroundColor Green
-            return $true
+            Write-Host "---      Chocolatey is installed        ---" -ForegroundColor Green
+            Write-Host "===========================================" -ForegroundColor Green
+            Write-Host "Version: v$chocoVersion" -ForegroundColor White
+            $status = "installed"
+        } else {
+            Write-Host "===========================================" -ForegroundColor Red
+            Write-Host "---    Chocolatey is not installed      ---" -ForegroundColor Red
+            Write-Host "===========================================" -ForegroundColor Red
+            $status = "not-installed"
         }
     }
 
-    return $false
+    return $status
-}
+}

functions/private/Update-WinUtilProgramWinget.ps1

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

functions/public/Invoke-ScratchDialog.ps1

@@ -8,13 +8,13 @@ function Invoke-ScratchDialog {
 
     .PARAMETER Button
     #>
-    $sync.WPFMicrowinISOScratchDir.IsChecked 
+    $sync.WPFMicrowinISOScratchDir.IsChecked
- 
+
 
     [System.Reflection.Assembly]::LoadWithPartialName("System.windows.forms") | Out-Null
     $Dialog = New-Object System.Windows.Forms.FolderBrowserDialog
     $Dialog.SelectedPath =          $sync.MicrowinScratchDirBox.Text
-    $Dialog.ShowDialog() 
+    $Dialog.ShowDialog()
     $filePath = $Dialog.SelectedPath
         Write-Host "No ISO is chosen+  $filePath"
 
@@ -23,7 +23,7 @@ function Invoke-ScratchDialog {
         Write-Host "No Folder had chosen"
         return
     }
-    
+
        $sync.MicrowinScratchDirBox.Text =  Join-Path $filePath "\"
 
 }

functions/public/Invoke-WPFButton.ps1

@@ -21,14 +21,14 @@ function Invoke-WPFButton {
         "WPFinstall" {Invoke-WPFInstall}
         "WPFuninstall" {Invoke-WPFUnInstall}
         "WPFInstallUpgrade" {Invoke-WPFInstallUpgrade}
-        "WPFdesktop" {Invoke-WPFPresets "Desktop"}
+        "WPFstandard" {Invoke-WPFPresets "Standard"}
-        "WPFlaptop" {Invoke-WPFPresets "laptop"}
+        "WPFminimal" {Invoke-WPFPresets "Minimal"}
-        "WPFminimal" {Invoke-WPFPresets "minimal"}
         "WPFclear" {Invoke-WPFPresets -preset $null -imported $true}
         "WPFclearWinget" {Invoke-WPFPresets -preset $null -imported $true -CheckBox "WPFInstall"}
         "WPFtweaksbutton" {Invoke-WPFtweaksbutton}
-        "WPFAddUltPerf" {Invoke-WPFUltimatePerformance -State "Enabled"}
+        "WPFOOSUbutton" {Invoke-WPFOOSU}
-        "WPFRemoveUltPerf" {Invoke-WPFUltimatePerformance -State "Disabled"}
+        "WPFAddUltPerf" {Invoke-WPFUltimatePerformance -State "Enable"}
+        "WPFRemoveUltPerf" {Invoke-WPFUltimatePerformance -State "Disable"}
         "WPFundoall" {Invoke-WPFundoall}
         "WPFFeatureInstall" {Invoke-WPFFeatureInstall}
         "WPFPanelDISM" {Invoke-WPFPanelDISM}

functions/public/Invoke-WPFFixesWinget.ps1

@@ -3,11 +3,12 @@ function Invoke-WPFFixesWinget {
     <#
 
     .SYNOPSIS
-        Fixes Winget by running choco install winget 
+        Fixes Winget by running choco install winget
     .DESCRIPTION
         BravoNorris for the fantastic idea of a button to reinstall winget
     #>
-
+    # Install Choco if not already present
+    Install-WinUtilChoco
     Start-Process -FilePath "choco" -ArgumentList "install winget -y --force" -NoNewWindow -Wait
 
 }

functions/public/Invoke-WPFGetInstalled.ps1

@@ -16,10 +16,7 @@ function Invoke-WPFGetInstalled {
         return
     }
 
-    if(!(Get-Command -Name winget -ErrorAction SilentlyContinue) -and $checkbox -eq "winget"){
+    if(((Test-WinUtilPackageManager -winget) -eq "not-installed") -and $checkbox -eq "winget"){
-        Write-Host "==========================================="
-        Write-Host "--       Winget is not installed        ---"
-        Write-Host "==========================================="
         return
     }
 
@@ -46,4 +43,4 @@ function Invoke-WPFGetInstalled {
         Write-Host "Done..."
         $sync.ProcessRunning = $false
     }
-}
+}

functions/public/Invoke-WPFGetIso.ps1

@@ -12,7 +12,7 @@ function Invoke-WPFGetIso {
         return
     }
 
-  $sync.BusyMessage.Visibility="Visible"
+    $sync.BusyMessage.Visibility="Visible"
     $sync.BusyText.Text="N Busy"
 
 
@@ -22,28 +22,26 @@ function Invoke-WPFGetIso {
 	Write-Host "/ /\/\ \| || (__ | |   | (_) | \  /\  / | || | | | "
 	Write-Host "\/    \/|_| \___||_|    \___/   \/  \/  |_||_| |_| "
 
-    $oscdimgPath = Join-Path $env:TEMP 'oscdimg.exe'   
+    $oscdimgPath = Join-Path $env:TEMP 'oscdimg.exe'
-   if( ! (Test-Path $oscdimgPath -PathType Leaf)  ) {
-   $oscdimgPath = Join-Path '.\releases\' 'oscdimg.exe'   
-}
-
     $oscdImgFound = [bool] (Get-Command -ErrorAction Ignore -Type Application oscdimg.exe) -or (Test-Path $oscdimgPath -PathType Leaf)
     Write-Host "oscdimg.exe on system: $oscdImgFound"
-    
+
-    if (!$oscdImgFound) 
+    if (!$oscdImgFound)
     {
         $downloadFromGitHub = $sync.WPFMicrowinDownloadFromGitHub.IsChecked
         $sync.BusyMessage.Visibility="Hidden"
 
-        if (!$downloadFromGitHub) 
+        if (!$downloadFromGitHub)
         {
-            # only show the message to people who did check the box to download from github, if you check the box 
+            # only show the message to people who did check the box to download from github, if you check the box
             # you consent to downloading it, no need to show extra dialogs
             [System.Windows.MessageBox]::Show("oscdimge.exe is not found on the system, winutil will now attempt do download and install it using choco. This might take a long time.")
             # the step below needs choco to download oscdimg
+            # Install Choco if not already present
+            Install-WinUtilChoco
             $chocoFound = [bool] (Get-Command -ErrorAction Ignore -Type Application choco)
             Write-Host "choco on system: $chocoFound"
-            if (!$chocoFound) 
+            if (!$chocoFound)
             {
                 [System.Windows.MessageBox]::Show("choco.exe is not found on the system, you need choco to download oscdimg.exe")
                 return
@@ -90,6 +88,29 @@ function Invoke-WPFGetIso {
         return
     }
 
+    # Detect the file size of the ISO and compare it with the free space of the system drive
+    $isoSize = (Get-Item -Path $filePath).Length
+    Write-Debug "Size of ISO file: $($isoSize) bytes"
+    # Use this procedure to get the free space of the drive depending on where the user profile folder is stored.
+    # This is done to guarantee a dynamic solution, as the installation drive may be mounted to a letter different than C
+    $driveSpace = (Get-Volume -DriveLetter ([IO.Path]::GetPathRoot([Environment]::GetFolderPath([Environment+SpecialFolder]::UserProfile)).Replace(":\", "").Trim())).SizeRemaining
+    Write-Debug "Free space on installation drive: $($driveSpace) bytes"
+    if ($driveSpace -lt ($isoSize * 2))
+    {
+        # It's not critical and we _may_ continue. Output a warning
+        Write-Warning "You may not have enough space for this operation. Proceed at your own risk."
+    }
+    elseif ($driveSpace -lt $isoSize)
+    {
+        # It's critical and we can't continue. Output an error
+        Write-Host "You don't have enough space for this operation. You need at least $([Math]::Round(($isoSize / ([Math]::Pow(1024, 2))) * 2, 2)) MB of free space to copy the ISO files to a temp directory and to be able to perform additional operations."
+        return
+    }
+    else
+    {
+        Write-Host "You have enough space for this operation."
+    }
+
     try {
         Write-Host "Mounting Iso. Please wait."
         $mountedISO = Mount-DiskImage -PassThru "$filePath"
@@ -124,13 +145,26 @@ function Invoke-WPFGetIso {
 
     }
 
+    # Detect if the folders already exist and remove them
+    if (($sync.MicrowinMountDir.Text -ne "") -and (Test-Path -Path $sync.MicrowinMountDir.Text))
+    {
+        try {
+            Write-Host "Deleting temporary files from previous run. Please wait..."
+            Remove-Item -Path $sync.MicrowinMountDir.Text -Recurse -Force
+            Remove-Item -Path $sync.MicrowinScratchDir.Text -Recurse -Force
+        }
+        catch {
+            Write-Host "Could not delete temporary files. You need to delete those manually."
+        }
+    }
+
     Write-Host "Setting up mount dir and scratch dirs"
     $timestamp = Get-Date -Format "yyyyMMdd_HHmmss"
     $randomNumber = Get-Random -Minimum 1 -Maximum 9999
     $randomMicrowin = "Microwin_${timestamp}_${randomNumber}"
     $randomMicrowinScratch = "MicrowinScratch_${timestamp}_${randomNumber}"
     $sync.BusyText.Text=" - Mounting"
-    Write-Host "Mounting Iso. Please wait."  
+    Write-Host "Mounting Iso. Please wait."
     if ($sync.MicrowinScratchDirBox.Text -eq "") {
     $mountDir = Join-Path $env:TEMP $randomMicrowin
     $scratchDir = Join-Path $env:TEMP $randomMicrowinScratch
@@ -146,12 +180,12 @@ function Invoke-WPFGetIso {
     Write-Host "Image dir is $mountDir"
 
     try {
-        
+
         #$data = @($driveLetter, $filePath)
         New-Item -ItemType Directory -Force -Path "$($mountDir)" | Out-Null
         New-Item -ItemType Directory -Force -Path "$($scratchDir)" | Out-Null
         Write-Host "Copying Windows image. This will take awhile, please don't use UI or cancel this step!"
-        
+
         # xcopy we can verify files and also not copy files that already exist, but hard to measure
         # xcopy.exe /E /I /H /R /Y /J $DriveLetter":" $mountDir >$null
         $totalTime = Measure-Command { Copy-Files "$($driveLetter):" $mountDir -Recurse -Force }
@@ -160,13 +194,18 @@ function Invoke-WPFGetIso {
         $wimFile = "$mountDir\sources\install.wim"
         Write-Host "Getting image information $wimFile"
 
-        if (-not (Test-Path -Path $wimFile -PathType Leaf))
+        if ((-not (Test-Path -Path $wimFile -PathType Leaf)) -and (-not (Test-Path -Path $wimFile.Replace(".wim", ".esd").Trim() -PathType Leaf)))
         {
-            $msg = "Install.wim file doesn't exist in the image, this could happen if you use unofficial Windows images, or a Media creation tool, which creates a final image that can not be modified. Please don't use shady images from the internet, use only official images. Here are instructions how to download ISO images if the Microsoft website is not showing the link to download and ISO. https://www.techrepublic.com/article/how-to-download-a-windows-10-iso-file-without-using-the-media-creation-tool/"
+            $msg = "Neither install.wim nor install.esd exist in the image, this could happen if you use unofficial Windows images. Please don't use shady images from the internet, use only official images. Here are instructions how to download ISO images if the Microsoft website is not showing the link to download and ISO. https://www.techrepublic.com/article/how-to-download-a-windows-10-iso-file-without-using-the-media-creation-tool/"
             Write-Host $msg
             [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Error)
             throw
         }
+        elseif ((-not (Test-Path -Path $wimFile -PathType Leaf)) -and (Test-Path -Path $wimFile.Replace(".wim", ".esd").Trim() -PathType Leaf))
+        {
+            Write-Host "Install.esd found on the image. It needs to be converted to a WIM file in order to begin processing"
+            $wimFile = $wimFile.Replace(".wim", ".esd").Trim()
+        }
         $sync.MicrowinWindowsFlavors.Items.Clear()
         Get-WindowsImage -ImagePath $wimFile | ForEach-Object {
             $imageIdx = $_.ImageIndex

functions/public/Invoke-WPFImpex.ps1

@@ -33,12 +33,12 @@ function Invoke-WPFImpex {
 
         if($FileBrowser.FileName -eq ""){
             return
-        } 
+        }
         else{
             $Config = $FileBrowser.FileName
         }
     }
-    
+
     if ($type -eq "export"){
         $jsonFile = Get-WinUtilCheckBoxes -unCheck $false
         $jsonFile | ConvertTo-Json | Out-File $FileBrowser.FileName -Force

functions/public/Invoke-WPFInstall.ps1

@@ -2,33 +2,53 @@ function Invoke-WPFInstall {
     <#
 
     .SYNOPSIS
-        Installs the selected programs using winget
+        Installs the selected programs using winget, if one or more of the selected programs are already installed on the system, winget will try and perform an upgrade if there's a newer version to install.
 
     #>
 
     if($sync.ProcessRunning){
-        $msg = "[Invoke-WPFInstall] Install process is currently running."
+        $msg = "[Invoke-WPFInstall] An Install process is currently running."
         [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
         return
     }
 
-    $WingetInstall = (Get-WinUtilCheckBoxes)["Install"]
+    $PackagesToInstall = (Get-WinUtilCheckBoxes)["Install"]
-
+    Write-Host $PackagesToInstall
-    if ($wingetinstall.Count -eq 0) {
+    if ($PackagesToInstall.Count -eq 0) {
-        $WarningMsg = "Please select the program(s) to install"
+        $WarningMsg = "Please select the program(s) to install or upgrade"
         [System.Windows.MessageBox]::Show($WarningMsg, $AppTitle, [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
         return
     }
 
-    Invoke-WPFRunspace -ArgumentList $WingetInstall -DebugPreference $DebugPreference -ScriptBlock {
+    Invoke-WPFRunspace -ArgumentList $PackagesToInstall -DebugPreference $DebugPreference -ScriptBlock {
-        param($WingetInstall, $DebugPreference)
+        param($PackagesToInstall, $DebugPreference)
+        $packagesWinget, $packagesChoco = {
+            $packagesWinget = [System.Collections.Generic.List`1[System.Object]]::new()
+            $packagesChoco = [System.Collections.Generic.List`1[System.Object]]::new()
+            foreach ($package in $PackagesToInstall) {
+                if ($package.winget -eq "na") {
+                    $packagesChoco.add($package)
+                    Write-Host "Queueing $($package.choco) for Chocolatey install"
+                } else {
+                    $packagesWinget.add($package)
+                    Write-Host "Queueing $($package.winget) for Winget install"
+                }
+            }
+            return $packagesWinget, $packagesChoco
+        }.Invoke($PackagesToInstall)
 
         try{
             $sync.ProcessRunning = $true
-
+            $errorPackages = @()
-            Install-WinUtilWinget
+            if($packagesWinget.Count -gt 0){
-            Install-WinUtilProgramWinget -ProgramsToInstall $WingetInstall
+                Install-WinUtilWinget
-
+                $errorPackages += Install-WinUtilProgramWinget -ProgramsToInstall $packagesWinget
+                $errorPackages| ForEach-Object {if($_.choco -ne "na") {$packagesChoco += $_}}
+            }
+            if($packagesChoco.Count -gt 0){
+                Install-WinUtilChoco
+                Install-WinUtilProgramChoco -ProgramsToInstall $packagesChoco
+            }
             Write-Host "==========================================="
             Write-Host "--      Installs have finished          ---"
             Write-Host "==========================================="
@@ -41,4 +61,4 @@ function Invoke-WPFInstall {
         Start-Sleep -Seconds 5
         $sync.ProcessRunning = $False
     }
-}
+}

functions/public/Invoke-WPFInstallUpgrade.ps1

@@ -5,10 +5,7 @@ function Invoke-WPFInstallUpgrade {
         Invokes the function that upgrades all installed programs using winget
 
     #>
-    if(!(Get-Command -Name winget -ErrorAction SilentlyContinue)){
+    if((Test-WinUtilPackageManager -winget) -eq "not-installed"){
-        Write-Host "==========================================="
-        Write-Host "--       Winget is not installed        ---"
-        Write-Host "==========================================="
         return
     }
 
@@ -24,4 +21,4 @@ function Invoke-WPFInstallUpgrade {
     Write-Host "--           Updates started            ---"
     Write-Host "-- You can close this window if desired ---"
     Write-Host "==========================================="
-}
+}

functions/public/Invoke-WPFMicrowin.ps1

@@ -53,14 +53,35 @@ public class PowerManagement {
 	$keepEdge = $sync.WPFMicrowinKeepEdge.IsChecked
 	$copyToUSB = $sync.WPFMicrowinCopyToUsb.IsChecked
 	$injectDrivers = $sync.MicrowinInjectDrivers.IsChecked
+	$importDrivers = $sync.MicrowinImportDrivers.IsChecked
 
     $mountDir = $sync.MicrowinMountDir.Text
     $scratchDir = $sync.MicrowinScratchDir.Text
 
+	# Detect if the Windows image is an ESD file and convert it to WIM
+	if (-not (Test-Path -Path $mountDir\sources\install.wim -PathType Leaf) -and (Test-Path -Path $mountDir\sources\install.esd -PathType Leaf))
+	{
+		Write-Host "Exporting Windows image to a WIM file, keeping the index we want to work on. This can take several minutes, depending on the performance of your computer..."
+		Export-WindowsImage -SourceImagePath $mountDir\sources\install.esd -SourceIndex $index -DestinationImagePath $mountDir\sources\install.wim -CompressionType "Max"
+		if ($?)
+		{
+            Remove-Item -Path $mountDir\sources\install.esd -Force
+			# Since we've already exported the image index we wanted, switch to the first one
+			$index = 1
+		}
+		else
+		{
+            $msg = "The export process has failed and MicroWin processing cannot continue"
+            Write-Host "Failed to export the image"
+            [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Error)
+            return
+		}
+	}
+
     $imgVersion = (Get-WindowsImage -ImagePath $mountDir\sources\install.wim -Index $index).Version
 
     # Detect image version to avoid performing MicroWin processing on Windows 8 and earlier
-    if ((Test-CompatibleImage $imgVersion) -eq $false)
+    if ((Test-CompatibleImage $imgVersion $([System.Version]::new(10,0,10240,0))) -eq $false)
     {
 		$msg = "This image is not compatible with MicroWin processing. Make sure it isn't a Windows 8 or earlier image."
         $dlg_msg = $msg + "`n`nIf you want more information, the version of the image selected is $($imgVersion)`n`nIf an image has been incorrectly marked as incompatible, report an issue to the developers."
@@ -71,7 +92,7 @@ public class PowerManagement {
 
 	$mountDirExists = Test-Path $mountDir
     $scratchDirExists = Test-Path $scratchDir
-	if (-not $mountDirExists -or -not $scratchDirExists) 
+	if (-not $mountDirExists -or -not $scratchDirExists)
 	{
         Write-Error "Required directories '$mountDirExists' '$scratchDirExists' and do not exist."
         return
@@ -80,8 +101,57 @@ public class PowerManagement {
 	try {
 
 		Write-Host "Mounting Windows image. This may take a while."
-		dism /mount-image /imagefile:$mountDir\sources\install.wim /index:$index /mountdir:$scratchDir
+        Mount-WindowsImage -ImagePath "$mountDir\sources\install.wim" -Index $index -Path "$scratchDir"
-		Write-Host "Mounting complete! Performing removal of applications..."
+        if ($?)
+        {
+		    Write-Host "Mounting complete! Performing removal of applications..."
+        }
+        else
+        {
+            Write-Host "Could not mount image. Exiting..."
+            return
+        }
+
+		if ($importDrivers)
+		{
+			Write-Host "Exporting drivers from active installation..."
+			if (Test-Path "$env:TEMP\DRV_EXPORT")
+			{
+				Remove-Item "$env:TEMP\DRV_EXPORT" -Recurse -Force
+			}
+			if (($injectDrivers -and (Test-Path $sync.MicrowinDriverLocation.Text)))
+			{
+				Write-Host "Using specified driver source..."
+				dism /english /online /export-driver /destination="$($sync.MicrowinDriverLocation.Text)" | Out-Host
+				if ($?)
+				{
+					# Don't add exported drivers yet, that is run later
+					Write-Host "Drivers have been exported successfully."
+				}
+				else
+				{
+					Write-Host "Failed to export drivers."
+				}
+			}
+			else
+			{
+				New-Item -Path "$env:TEMP\DRV_EXPORT" -ItemType Directory -Force
+				dism /english /online /export-driver /destination="$env:TEMP\DRV_EXPORT" | Out-Host
+				if ($?)
+				{
+					Write-Host "Adding exported drivers..."
+					dism /english /image="$scratchDir" /add-driver /driver="$env:TEMP\DRV_EXPORT" /recurse | Out-Host
+				}
+				else
+				{
+					Write-Host "Failed to export drivers. Continuing without importing them..."
+				}
+				if (Test-Path "$env:TEMP\DRV_EXPORT")
+				{
+					Remove-Item "$env:TEMP\DRV_EXPORT" -Recurse -Force
+				}
+			}
+		}
 
 		if ($injectDrivers)
 		{
@@ -91,7 +161,7 @@ public class PowerManagement {
 				Write-Host "Adding Windows Drivers image($scratchDir) drivers($driverPath) "
 				dism /English /image:$scratchDir /add-driver /driver:$driverPath /recurse | Out-Host
 			}
-			else 
+			else
 			{
 				Write-Host "Path to drivers is invalid continuing without driver injection"
 			}
@@ -101,23 +171,24 @@ public class PowerManagement {
 		Remove-Features -keepDefender:$keepDefender
 		Write-Host "Removing features complete!"
 
-		Write-Host "Removing Appx Bloat"
 		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. 
+		# 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) 
+		if (!$keepDefender)
 		{
 			Write-Host "Removing Defender"
 			Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Windows Defender" -Directory
@@ -134,7 +205,7 @@ public class PowerManagement {
 		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)\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
 		Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Windows Media Player" -Directory
@@ -174,26 +245,27 @@ public class PowerManagement {
 		$desktopDir = "$($scratchDir)\Windows\Users\Default\Desktop"
 		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")
+		# $command = "powershell.exe -NoProfile -ExecutionPolicy Bypass -Command 'irm https://christitus.com/win | iex'"
-		{
+		# $shortcutPath = "$desktopDir\WinUtil.lnk"
-			$pngPath = "$env:TEMP\cttlogo.png"
+		# $shell = New-Object -ComObject WScript.Shell
-			$icoPath = "$env:TEMP\cttlogo.ico"
+		# $shortcut = $shell.CreateShortcut($shortcutPath)
-			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"
+		# if (Test-Path -Path "$env:TEMP\cttlogo.png")
-		$shortcut.Arguments = "-NoProfile -ExecutionPolicy Bypass -Command `"$command`""
+		# {
-		$shortcut.Save()
+		# 	$pngPath = "$env:TEMP\cttlogo.png"
-		Write-Host "Shortcut to winutil created at: $shortcutPath"
+		# 	$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"
@@ -214,7 +286,7 @@ public class PowerManagement {
 		Write-Host "Disabling Teams"
 		reg add "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Communications" /v "ConfigureChatAutoInstall" /t REG_DWORD /d 0 /f   >$null 2>&1
 		reg add "HKLM\zSOFTWARE\Policies\Microsoft\Windows\Windows Chat" /v ChatIcon /t REG_DWORD /d 2 /f                             >$null 2>&1
-		reg add "HKLM\zNTUSER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarMn" /t REG_DWORD /d 0 /f        >$null 2>&1  
+		reg add "HKLM\zNTUSER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarMn" /t REG_DWORD /d 0 /f        >$null 2>&1
 		reg query "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Communications" /v "ConfigureChatAutoInstall"                      >$null 2>&1
 		# Write-Host Error code $LASTEXITCODE
 		Write-Host "Done disabling Teams"
@@ -239,6 +311,19 @@ public class PowerManagement {
 			reg delete "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Taskband" /v "Pinned" /f             >$null 2>&1
 			reg delete "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Taskband" /v "LayoutCycle" /f        >$null 2>&1
 			Write-Host "Edge icon removed from taskbar"
+			if (Test-Path "HKLM:\zSOFTWARE\WOW6432Node")
+			{
+				# Remove leftovers of 64-bit installations
+				# ---
+				# Remove registry values first...
+				reg delete "HKLM\zSOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge" /va /f > $null 2>&1
+				reg delete "HKLM\zSOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge Update" /va /f > $null 2>&1
+				reg delete "HKLM\zSOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft EdgeWebView" /va /f > $null 2>&1
+				# ...then the registry keys
+				reg delete "HKLM\zSOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge" /f > $null 2>&1
+				reg delete "HKLM\zSOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge Update" /f > $null 2>&1
+				reg delete "HKLM\zSOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft EdgeWebView" /f > $null 2>&1
+			}
 		}
 
 		reg add "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "SearchboxTaskbarMode" /t REG_DWORD /d 0 /f
@@ -256,7 +341,7 @@ public class PowerManagement {
 		reg add "HKLM\zSOFTWARE\Policies\Microsoft\Windows\CloudContent" /v "DisableWindowsConsumerFeatures" /t REG_DWORD /d 1 /f
 		reg add "HKLM\zSOFTWARE\Microsoft\PolicyManager\current\device\Start" /v "ConfigureStartPins" /t REG_SZ /d '{\"pinnedList\": [{}]}' /f
 		Write-Host "Done removing Sponsored Apps"
-		
+
 		Write-Host "Disabling Reserved Storage"
 		reg add "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\ReserveManager" /v "ShippedWithReserves" /t REG_DWORD /d 0 /f
 
@@ -279,13 +364,13 @@ public class PowerManagement {
 		Write-Host "Cleanup complete."
 
 		Write-Host "Unmounting image..."
-		dism /unmount-image /mountdir:$scratchDir /commit
+        Dismount-WindowsImage -Path $scratchDir -Save
-	} 
+	}
-	
+
 	try {
 
 		Write-Host "Exporting image into $mountDir\sources\install2.wim"
-		dism /Export-Image /SourceImageFile:"$mountDir\sources\install.wim" /SourceIndex:$index /DestinationImageFile:"$mountDir\sources\install2.wim" /compress:max
+        Export-WindowsImage -SourceImagePath "$mountDir\sources\install.wim" -SourceIndex $index -DestinationImagePath "$mountDir\sources\install2.wim" -CompressionType "Max"
 		Write-Host "Remove old '$mountDir\sources\install.wim' and rename $mountDir\sources\install2.wim"
 		Remove-Item "$mountDir\sources\install.wim"
 		Rename-Item "$mountDir\sources\install2.wim" "$mountDir\sources\install.wim"
@@ -297,9 +382,9 @@ public class PowerManagement {
 		}
 		Write-Host "Windows image completed. Continuing with boot.wim."
 
-		# Next step boot image		
+		# Next step boot image
 		Write-Host "Mounting boot image $mountDir\sources\boot.wim into $scratchDir"
-		dism /mount-image /imagefile:"$mountDir\sources\boot.wim" /index:2 /mountdir:"$scratchDir"
+        Mount-WindowsImage -ImagePath "$mountDir\sources\boot.wim" -Index 2 -Path "$scratchDir"
 
 		if ($injectDrivers)
 		{
@@ -309,12 +394,12 @@ public class PowerManagement {
 				Write-Host "Adding Windows Drivers image($scratchDir) drivers($driverPath) "
 				dism /English /image:$scratchDir /add-driver /driver:$driverPath /recurse | Out-Host
 			}
-			else 
+			else
 			{
 				Write-Host "Path to drivers is invalid continuing without driver injection"
 			}
 		}
-	
+
 		Write-Host "Loading registry..."
 		reg load HKLM\zCOMPONENTS "$($scratchDir)\Windows\System32\config\COMPONENTS" >$null
 		reg load HKLM\zDEFAULT "$($scratchDir)\Windows\System32\config\default" >$null
@@ -345,7 +430,7 @@ public class PowerManagement {
 		reg unload HKLM\zSYSTEM
 
 		Write-Host "Unmounting image..."
-		dism /unmount-image /mountdir:$scratchDir /commit 
+        Dismount-WindowsImage -Path $scratchDir -Save
 
 		Write-Host "Creating ISO image"
 
@@ -378,7 +463,7 @@ public class PowerManagement {
 			Copy-ToUSB("$($SaveDialog.FileName)")
 			if ($?) { Write-Host "Done Copying target ISO to USB drive!" } else { Write-Host "ISO copy failed." }
 		}
-		
+
 		Write-Host " _____                       "
 		Write-Host "(____ \                      "
 		Write-Host " _   \ \ ___  ____   ____    "
@@ -398,9 +483,9 @@ public class PowerManagement {
 		} else {
 			Write-Host "ISO creation failed. The "$($mountDir)" directory has not been removed."
 		}
-		
+
 		$sync.MicrowinOptionsPanel.Visibility = 'Collapsed'
-		
+
 		#$sync.MicrowinFinalIsoLocation.Text = "$env:temp\microwin.iso"
         $sync.MicrowinFinalIsoLocation.Text = "$($SaveDialog.FileName)"
 		# Allow the machine to sleep again (optional)

functions/public/Invoke-WPFOOSU.ps1

@@ -0,0 +1,20 @@
+function Invoke-WPFOOSU {
+    <#
+    .SYNOPSIS
+        Downloads and runs OO Shutup 10
+    #>
+    try {
+        $OOSU_filepath = "$ENV:temp\OOSU10.exe"
+        $Initial_ProgressPreference = $ProgressPreference
+        $ProgressPreference = "SilentlyContinue" # Disables the Progress Bar to drasticly speed up Invoke-WebRequest
+        Invoke-WebRequest -Uri "https://dl5.oo-software.com/files/ooshutup10/OOSU10.exe" -OutFile $OOSU_filepath
+        Write-Host "Starting OO Shutup 10 ..."
+        Start-Process $OOSU_filepath
+    }
+    catch {
+        Write-Host "Error Downloading and Running OO Shutup 10" -ForegroundColor Red
+    }
+    finally {
+        $ProgressPreference = $Initial_ProgressPreference
+    }
+}

functions/public/Invoke-WPFPanelAutologin.ps1

@@ -5,6 +5,8 @@ function Invoke-WPFPanelAutologin {
         Enables autologin using Sysinternals Autologon.exe
 
     #>
-    curl.exe -ss "https://live.sysinternals.com/Autologon.exe" -o $env:temp\autologin.exe # Official Microsoft recommendation https://learn.microsoft.com/en-us/sysinternals/downloads/autologon
+
-    cmd /c $env:temp\autologin.exe /accepteula
+    # Official Microsoft recommendation: https://learn.microsoft.com/en-us/sysinternals/downloads/autologon
-}
+    Invoke-WebRequest -Uri "https://live.sysinternals.com/Autologon.exe" -OutFile "$env:temp\autologin.exe"
+    cmd /c "$env:temp\autologin.exe" /accepteula
+}

functions/public/Invoke-WPFPresets.ps1

@@ -35,7 +35,7 @@ function Invoke-WPFPresets {
             Write-Debug $_
         }
     }
-    
+
     foreach ($CheckBox in $CheckBoxes) {
         $checkboxName = $CheckBox.Key
 

functions/public/Invoke-WPFRunAdobeCCCleanerTool.ps1

@@ -11,18 +11,22 @@ function Invoke-WPFRunAdobeCCCleanerTool {
     Write-Host "The Adobe Creative Cloud Cleaner tool is hosted at"
     Write-Host "$url"
 
-    # Don't show the progress because it will slow down the download speed
+    try {
-    $ProgressPreference='SilentlyContinue'
+        # Don't show the progress because it will slow down the download speed
+        $ProgressPreference='SilentlyContinue'
 
-    Invoke-WebRequest -Uri $url -OutFile "$env:TEMP\AdobeCreativeCloudCleanerTool.exe" -UseBasicParsing -ErrorAction SilentlyContinue -Verbose
+        Invoke-WebRequest -Uri $url -OutFile "$env:TEMP\AdobeCreativeCloudCleanerTool.exe" -UseBasicParsing -ErrorAction SilentlyContinue -Verbose
 
-    # Revert back the ProgressPreference variable to the default value since we got the file desired
+        # Revert back the ProgressPreference variable to the default value since we got the file desired
-    $ProgressPreference='Continue'
+        $ProgressPreference='Continue'
 
-    Start-Process -FilePath "$env:TEMP\AdobeCreativeCloudCleanerTool.exe" -Wait -ErrorAction SilentlyContinue -Verbose
+        Start-Process -FilePath "$env:TEMP\AdobeCreativeCloudCleanerTool.exe" -Wait -ErrorAction SilentlyContinue -Verbose
-    
+    } catch {
-    if (Test-Path -Path "$env:TEMP\AdobeCreativeCloudCleanerTool.exe") {
+        Write-Error $_.Exception.Message
-        Write-Host "Cleaning up..."
+    } finally {
-        Remove-Item -Path "$env:TEMP\AdobeCreativeCloudCleanerTool.exe" -Verbose
+        if (Test-Path -Path "$env:TEMP\AdobeCreativeCloudCleanerTool.exe") {
+            Write-Host "Cleaning up..."
+            Remove-Item -Path "$env:TEMP\AdobeCreativeCloudCleanerTool.exe" -Verbose
+        }
     }
 }

functions/public/Invoke-WPFShortcut.ps1

@@ -17,35 +17,54 @@ function Invoke-WPFShortcut {
         [bool]$RunAsAdmin = $false
     )
 
-        $iconPath = $null
+    # add an a Custom Icon if it's available at "$env:TEMP\cttlogo.png", else don't add a Custom Icon.
-        Switch ($ShortcutToAdd) {
+    $iconPath = $null
-            "WinUtil" {
+    Switch ($ShortcutToAdd) {
-                $SourceExe = "$env:SystemRoot\System32\WindowsPowerShell\v1.0\powershell.exe"
+        "WinUtil" {
-                $IRM = 'irm https://christitus.com/win | iex'
+            # Use Powershell 7 if installed and fallback to PS5 if not
-                $Powershell = '-ExecutionPolicy Bypass -Command "Start-Process powershell.exe -verb runas -ArgumentList'
+            if (Get-Command "pwsh" -ErrorAction SilentlyContinue){
-                $ArgumentsToSourceExe = "$powershell '$IRM'"
+                $shell = "pwsh.exe"
-                $DestinationName = "WinUtil.lnk"
+            }
+            else{
+                $shell = "powershell.exe"
+            }
 
-                if (Test-Path -Path "$env:TEMP\cttlogo.png") {
+            $shellArgs = "-ExecutionPolicy Bypass -Command `"Start-Process $shell -verb runas -ArgumentList `'-Command `"irm https://christitus.com/win | iex`"`'"
-                    $iconPath = "$env:SystempRoot\cttlogo.ico"
+
-                    ConvertTo-Icon -bitmapPath "$env:TEMP\cttlogo.png" -iconPath $iconPath
+            $DestinationName = "WinUtil.lnk"
-                }
+
+            Invoke-WebRequest -Uri "https://christitus.com/images/logo-full.png" -OutFile "$env:TEMP\cttlogo.png"
+
+            if (Test-Path -Path "$env:TEMP\cttlogo.png") {
+                $iconPath = "$env:LOCALAPPDATA\winutil\cttlogo.ico"
+                ConvertTo-Icon -bitmapPath "$env:TEMP\cttlogo.png" -iconPath $iconPath
             }
         }
+    }
 
+    # Show a File Dialog Browser, to let the User choose the Name and Location of where to save the Shortcut
     $FileBrowser = New-Object System.Windows.Forms.SaveFileDialog
     $FileBrowser.InitialDirectory = [Environment]::GetFolderPath('Desktop')
     $FileBrowser.Filter = "Shortcut Files (*.lnk)|*.lnk"
     $FileBrowser.FileName = $DestinationName
-    $FileBrowser.ShowDialog() | Out-Null
 
+    # Do an Early Return if the Save Operation was canceled by User's Input.
+    $FileBrowserResult = $FileBrowser.ShowDialog()
+    $DialogResultEnum = New-Object System.Windows.Forms.DialogResult
+    if (-not ($FileBrowserResult -eq $DialogResultEnum::OK)) {
+        return
+    }
+
+    # Prepare the Shortcut paramter
     $WshShell = New-Object -comObject WScript.Shell
     $Shortcut = $WshShell.CreateShortcut($FileBrowser.FileName)
-    $Shortcut.TargetPath = $SourceExe
+    $Shortcut.TargetPath = $shell
-    $Shortcut.Arguments = $ArgumentsToSourceExe
+    $Shortcut.Arguments = $shellArgs
     if ($null -ne $iconPath) {
         $shortcut.IconLocation = $iconPath
     }
+
+    # Save the Shortcut to disk
     $Shortcut.Save()
 
     if ($RunAsAdmin -eq $true) {
@@ -56,4 +75,4 @@ function Invoke-WPFShortcut {
     }
 
     Write-Host "Shortcut for $ShortcutToAdd has been saved to $($FileBrowser.FileName) with 'Run as administrator' set to $RunAsAdmin"
-}
+}

functions/public/Invoke-WPFToggle.ps1

@@ -22,8 +22,15 @@ function Invoke-WPFToggle {
         "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)}
     }
-}
+}

functions/public/Invoke-WPFTweakPS7.ps1

@@ -0,0 +1,53 @@
+function Invoke-WPFTweakPS7{
+        <#
+    .SYNOPSIS
+        This will edit the config file of the Windows Terminal Replacing the Powershell 5 to Powershell 7 and install Powershell 7 if necessary
+    .PARAMETER action
+        PS7:           Configures Powershell 7 to be the default Terminal
+        PS5:           Configures Powershell 5 to be the default Terminal
+    #>
+    param (
+        [ValidateSet("PS7", "PS5")]
+        [string]$action
+    )
+
+    switch ($action) {
+        "PS7"{
+            if (Test-Path -Path "$env:ProgramFiles\PowerShell\7") {
+                Write-Host "Powershell 7 is already installed."
+            } else {
+                Write-Host "Installing Powershell 7..."
+                Install-WinUtilProgramWinget -ProgramsToInstall @(@{"winget"="Microsoft.PowerShell"})
+            }
+            $targetTerminalName = "PowerShell"
+        }
+        "PS5"{
+            $targetTerminalName = "Windows PowerShell"
+        }
+    }
+    # Check if the Windows Terminal is installed and return if not (Prerequisite for the following code)
+    if (-not (Get-Command "wt" -ErrorAction SilentlyContinue)){
+        Write-Host "Windows Terminal not installed. Skipping Terminal preference"
+        return
+    }
+    # Check if the Windows Terminal settings.json file exists and return if not (Prereqisite for the following code)
+    $settingsPath = "$env:LOCALAPPDATA\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json"
+    if (-not (Test-Path -Path $settingsPath)){
+        Write-Host "Windows Terminal Settings file not found at $settingsPath"
+        return
+    }
+
+    Write-Host "Settings file found."
+    $settingsContent = Get-Content -Path $settingsPath | ConvertFrom-Json
+    $ps7Profile = $settingsContent.profiles.list | Where-Object { $_.name -eq $targetTerminalName }
+    if ($ps7Profile) {
+        $settingsContent.defaultProfile = $ps7Profile.guid
+        $updatedSettings = $settingsContent | ConvertTo-Json -Depth 100
+        Set-Content -Path $settingsPath -Value $updatedSettings
+        Write-Host "Default profile updated to " -NoNewline
+        Write-Host "$targetTerminalName " -ForegroundColor White -NoNewline
+        Write-Host "using the name attribute."
+    } else {
+        Write-Host "No PowerShell 7 profile found in Windows Terminal settings using the name attribute."
+    }
+}

functions/public/Invoke-WPFUltimatePerformance.ps1

@@ -10,69 +10,44 @@ Function Invoke-WPFUltimatePerformance {
     #>
     param($State)
     Try{
-
+        # Check if Ultimate Performance plan is installed
-        if($state -eq "Enabled"){
+        $ultimatePlan = powercfg -list | Select-String -Pattern "Ultimate Performance"
-            # Define the name and GUID of the power scheme
+        if($state -eq "Enable"){
-            $powerSchemeName = "Ultimate Performance"
+            if ($ultimatePlan) {
-            $powerSchemeGuid = "e9a42b02-d5df-448d-aa00-03f14749eb61"
+                Write-Host "Ultimate Performance plan is already installed."
-
+            } else {
-            # Get all power schemes
+                Write-Host "Installing Ultimate Performance plan..."
-            $schemes = powercfg /list | Out-String -Stream
+                powercfg -duplicatescheme e9a42b02-d5df-448d-aa00-03f14749eb61
-
+                Write-Host "> Ultimate Performance plan installed."
-            # Check if the power scheme already exists
-            $ultimateScheme = $schemes | Where-Object { $_ -match $powerSchemeName }
-
-            if ($null -eq $ultimateScheme) {
-                Write-Host "Power scheme '$powerSchemeName' not found. Adding..."
-
-                # Add the power scheme
-                powercfg /duplicatescheme $powerSchemeGuid
-                powercfg -attributes SUB_SLEEP 7bc4a2f9-d8fc-4469-b07b-33eb785aaca0 -ATTRIB_HIDE
-                powercfg -setactive $powerSchemeGuid
-                powercfg -change -monitor-timeout-ac 0
-
-
-                Write-Host "Power scheme added successfully."
             }
-            else {
+
-                Write-Host "Power scheme '$powerSchemeName' already exists."
+            # Set the Ultimate Performance plan as active
+            $ultimatePlanGUID = (powercfg -list | Select-String -Pattern "Ultimate Performance").Line.Split()[3]
+            powercfg -setactive $ultimatePlanGUID
+
+            Write-Host "Ultimate Performance plan is now active."
+
+
+        }
+        elseif($state -eq "Disable"){
+            if ($ultimatePlan) {
+                # Extract the GUID of the Ultimate Performance plan
+                $ultimatePlanGUID = $ultimatePlan.Line.Split()[3]
+
+                # Set a different power plan as active before deleting the Ultimate Performance plan
+                $balancedPlanGUID = (powercfg -list | Select-String -Pattern "Balanced").Line.Split()[3]
+                powercfg -setactive $balancedPlanGUID
+
+                # Delete the Ultimate Performance plan
+                powercfg -delete $ultimatePlanGUID
+
+                Write-Host "Ultimate Performance plan has been uninstalled."
+                Write-Host "> Balanced plan is now active."
+            } else {
+                Write-Host "Ultimate Performance plan is not installed."
             }
         }
-        elseif($state -eq "Disabled"){
+    } Catch{
-                # Define the name of the power scheme
-                $powerSchemeName = "Ultimate Performance"
-
-                # Get all power schemes
-                $schemes = powercfg /list | Out-String -Stream
-
-                # Find the scheme to be removed
-                $ultimateScheme = $schemes | Where-Object { $_ -match $powerSchemeName }
-
-                # If the scheme exists, remove it
-                if ($null -ne $ultimateScheme) {
-                    # Extract the GUID of the power scheme
-                    $guid = ($ultimateScheme -split '\s+')[3]
-
-                    if($null -ne $guid){
-                        Write-Host "Found power scheme '$powerSchemeName' with GUID $guid. Removing..."
-
-                        # Remove the power scheme
-                        powercfg /delete $guid
-
-                        Write-Host "Power scheme removed successfully."
-                    }
-                    else {
-                        Write-Host "Could not find GUID for power scheme '$powerSchemeName'."
-                    }
-                }
-                else {
-                    Write-Host "Power scheme '$powerSchemeName' not found."
-                }
-
-            }
-
-    }
-    Catch{
         Write-Warning $psitem.Exception.Message
     }
-}
+}

functions/public/Invoke-WPFUnInstall.ps1

@@ -12,31 +12,49 @@ function Invoke-WPFUnInstall {
         return
     }
 
-    $WingetInstall = (Get-WinUtilCheckBoxes)["Install"]
+    $PackagesToInstall = (Get-WinUtilCheckBoxes)["Install"]
 
-    if ($wingetinstall.Count -eq 0) {
+    if ($PackagesToInstall.Count -eq 0) {
-        $WarningMsg = "Please select the program(s) to install"
+        $WarningMsg = "Please select the program(s) to uninstall"
         [System.Windows.MessageBox]::Show($WarningMsg, $AppTitle, [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
         return
     }
 
     $ButtonType = [System.Windows.MessageBoxButton]::YesNo
     $MessageboxTitle = "Are you sure?"
-    $Messageboxbody = ("This will uninstall the following applications: `n $WingetInstall")
+    $Messageboxbody = ("This will uninstall the following applications: `n $($PackagesToInstall | Format-Table | Out-String)")
     $MessageIcon = [System.Windows.MessageBoxImage]::Information
 
     $confirm = [System.Windows.MessageBox]::Show($Messageboxbody, $MessageboxTitle, $ButtonType, $MessageIcon)
 
     if($confirm -eq "No"){return}
 
-    Invoke-WPFRunspace -ArgumentList $WingetInstall -DebugPreference $DebugPreference -ScriptBlock {
+    Invoke-WPFRunspace -ArgumentList $PackagesToInstall -DebugPreference $DebugPreference -ScriptBlock {
-        param($WingetInstall, $DebugPreference)
+        param($PackagesToInstall, $DebugPreference)
-
+        $packagesWinget, $packagesChoco = {
+            $packagesWinget = [System.Collections.Generic.List`1[System.Object]]::new()
+            $packagesChoco = [System.Collections.Generic.List`1[System.Object]]::new()
+            foreach ($package in $PackagesToInstall) {
+                if ($package.winget -eq "na") {
+                    $packagesChoco.add($package)
+                    Write-Host "Queueing $($package.choco) for Chocolatey Uninstall"
+                } else {
+                    $packagesWinget.add($package)
+                    Write-Host "Queueing $($package.winget) for Winget Uninstall"
+                }
+            }
+            return $packagesWinget, $packagesChoco
+        }.Invoke($PackagesToInstall)
         try{
             $sync.ProcessRunning = $true
 
             # Install all selected programs in new window
-            Install-WinUtilProgramWinget -ProgramsToInstall $WingetInstall -Manage "Uninstalling"
+            if($packagesWinget.Count -gt 0){
+                Install-WinUtilProgramWinget -ProgramsToInstall $packagesWinget -Manage "Uninstalling"
+            }
+            if($packagesChoco.Count -gt 0){
+                Install-WinUtilProgramChoco -ProgramsToInstall $packagesChoco -Manage "Uninstalling"
+            }
 
             $ButtonType = [System.Windows.MessageBoxButton]::OK
             $MessageboxTitle = "Uninstalls are Finished "
@@ -51,9 +69,9 @@ function Invoke-WPFUnInstall {
         }
         Catch {
             Write-Host "==========================================="
-            Write-Host "--       Winget failed to install       ---"
+            Write-Host "Error: $_"
             Write-Host "==========================================="
         }
         $sync.ProcessRunning = $False
     }
-}
+}

functions/public/Invoke-WPFtweaksbutton.ps1

@@ -13,7 +13,7 @@ function Invoke-WPFtweaksbutton {
   }
 
   $Tweaks = (Get-WinUtilCheckBoxes)["WPFTweaks"]
-  
+
   Set-WinUtilDNS -DNSProvider $sync["WPFchangedns"].text
 
   if ($tweaks.count -eq 0 -and  $sync["WPFchangedns"].text -eq "Default"){

mkdocs.yml

@@ -0,0 +1,44 @@
+site_name: Chris Titus WinUtil Official Documentation
+repo_url: https://github.com/ChrisTitusTech/winutil
+
+nav:
+  - Introduction: 'index.md'
+  - User Guide: 'userguide.md'
+  - Contribute: 'contribute.md'
+  - Updates: 'updates.md'
+  - Known Issues: 'KnownIssues.md'
+  - FAQ: 'faq.md'
+
+theme:
+  name: material
+  custom_dir: 'overrides'
+  features:
+    - navigation.tabs
+    - navigation.sections
+    - toc.integrate
+    - navigation.top
+    - search.suggest
+    - search.highlight
+    - content.tabs.link
+    - content.code.annotation
+    - content.code.copy
+  language: en
+  logo: assets/favicon.png
+  favicon: assets/favicon.png
+  palette:
+    - media: "(prefers-color-scheme: light)"
+      scheme: default
+      toggle:
+        icon: material/toggle-switch-off-outline
+        name: Switch to dark mode
+      primary: black
+      accent: purple
+    - media: "(prefers-color-scheme: dark)"
+      scheme: slate
+      toggle:
+        icon: material/toggle-switch
+        name: Switch to light mode
+      primary: teal
+      accent: lime
+  markdown_extensions:
+    - admonition