Update functions/public/Invoke-WPFUIElements.ps1

Co-authored-by: Mr.k <mineshtine28546271@gmail.com>

.github/CODE_OF_CONDUCT.md

@@ -1,128 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, religion, or sexual identity
-and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
-  overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-contact@christitus.com.
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series
-of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or
-permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within
-the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available at
-https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct
-enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at
-https://www.contributor-covenant.org/translations.

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/feature_request.md

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

.github/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 CT Tech Group LLC
+Copyright (c) 2022 Chris Titus
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

.github/PULL_REQUEST_TEMPLATE.md

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

.github/release-drafter.yml

@@ -1,58 +0,0 @@
-name-template: '$RESOLVED_VERSION'
-tag-template: '$RESOLVED_VERSION'
-tag-prefix: ""
-categories:
-  - title: '🚀 Features'
-    labels:
-      - 'feature'
-      - 'enhancement'
-  - title: '🐛 Bug Fixes'
-    labels:
-      - 'fix'
-      - 'bugfix'
-      - 'bug'
-  - title: '📚 Documentation'
-    label: 'documentation'
-  - title: '🔒 Security'
-    label: 'security'
-change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
-template: |
-  ## Changes
-
-  $CHANGES
-
-  ## Contributors
-
-  $CONTRIBUTORS
-
-change-title-escapes: '\<*_&"'''
-autolabeler:
-  - label: 'documentation'
-    files:
-      - '*.md'
-    branch:
-      - '/docs{0,1}\/.+/'
-  - label: 'bug'
-    branch:
-      - '/fix\/.+/'
-    title:
-      - '/fix/i'
-  - label: 'enhancement'
-    branch:
-      - '/feature\/.+/'
-    body:
-      - '/[A-Z]+-[0-9]+/'
-  - label: 'documentation'
-    files:
-      - '**/*.md'
-      - 'docs/**/*'
-  - label: 'security'
-    branch:
-      - '/security\/.+/'
-replacers:
-  - search: /"/g
-    replace: ''
-  - search: /'/g
-    replace: ''
-exclude-labels:
-  - 'skip-changelog'

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

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

.github/workflows/github-pages.yaml

@@ -7,7 +7,6 @@ on:
       - '.github/requirements.txt'
       - 'docs/**'
       - 'overrides/**'
-      - '.github/CONTRIBUTING.md'
   workflow_dispatch:
 
 jobs:

.github/workflows/pre-release.yaml

@@ -74,27 +74,16 @@ jobs:
           name: winutil
           path: ./winutil.ps1
 
-      - name: Generate Release Notes
-        id: generate_notes
-        uses: release-drafter/release-drafter@v6
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          config-name: release-drafter.yml
-          version: ${{ env.version }}
-
       - 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: |
-            ${{ steps.generate_notes.outputs.body }}
-
-            ![GitHub Downloads (specific asset, specific tag)](https://img.shields.io/github/downloads/ChrisTitusTech/winutil/${{ env.VERSION }}/winutil.ps1)
+          tag_name: ${{ env.VERSION }}
+          name: Pre-Release ${{ env.VERSION }}
+          body: "![GitHub Downloads (specific asset, specific tag)](https://img.shields.io/github/downloads/ChrisTitusTech/winutil/${{ env.VERSION }}/winutil.ps1)"
           append_body: false
           files: ./winutil.ps1
           prerelease: true
+          generate_release_notes: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Compile.ps1

@@ -1,21 +1,12 @@
 param (
     [switch]$Debug,
     [switch]$Run,
-    [switch]$SkipPreprocessing,
-    [string]$Arguments
+    [switch]$SkipPreprocessing
 )
-
-if ((Get-Item ".\winutil.ps1" -ErrorAction SilentlyContinue).IsReadOnly) {
-    Remove-Item ".\winutil.ps1" -Force
-}
-
 $OFS = "`r`n"
 $scriptname = "winutil.ps1"
 $workingdir = $PSScriptRoot
 
-Push-Location
-Set-Location $workingdir
-
 # Variable to sync between runspaces
 $sync = [Hashtable]::Synchronized(@{})
 $sync.PSScriptRoot = $workingdir
@@ -50,11 +41,11 @@ if (-NOT $SkipPreprocessing) {
 
     # Dot source the 'Invoke-Preprocessing' Function from 'tools/Invoke-Preprocessing.ps1' Script
     $preprocessingFilePath = ".\tools\Invoke-Preprocessing.ps1"
-    . $preprocessingFilePath
+    . "$(($workingdir -replace ('\\$', '')) + '\' + ($preprocessingFilePath -replace ('\.\\', '')))"
 
     $excludedFiles = @('.\.git\', '.\.gitignore', '.\.gitattributes', '.\.github\CODEOWNERS', '.\LICENSE', "$preprocessingFilePath", '*.png', '*.exe')
     $msg = "Pre-req: Code Formatting"
-    Invoke-Preprocessing -WorkingDir "$workingdir" -ExcludedFiles $excludedFiles -ProgressStatusMessage $msg -ThrowExceptionOnEmptyFilesList
+    Invoke-Preprocessing -WorkingDir "$workingdir" -ExcludedFiles $excludedFiles -ProgressStatusMessage $msg
 }
 
 # Create the script in memory.
@@ -65,22 +56,46 @@ 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)"))
+$script_content.Add($(Get-Content "$workingdir\scripts\start.ps1").replace('#{replaceme}',"$(Get-Date -Format yy.MM.dd)"))
 
 Update-Progress "Adding: Functions" 20
-Get-ChildItem "functions" -Recurse -File | ForEach-Object {
+Get-ChildItem "$workingdir\functions" -Recurse -File | ForEach-Object {
     $script_content.Add($(Get-Content $psitem.FullName))
     }
 Update-Progress "Adding: Config *.json" 40
-Get-ChildItem "config" | Where-Object {$psitem.extension -eq ".json"} | ForEach-Object {
+Get-ChildItem "$workingdir\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") {
-        foreach ($appEntryName in $jsonAsObject.PSObject.Properties.Name) {
+        for ($i = 0; $i -lt $firstLevelJsonList.Count; $i += 1) {
+            $appEntryName = $firstLevelJsonList[$i]
             $appEntryContent = $jsonAsObject.$appEntryName
+            # Remove the entire app entry, so we could add it later with a different name
             $jsonAsObject.PSObject.Properties.Remove($appEntryName)
+            # Add the app entry, but with a different name (WPFInstall + The App Entry Name)
             $jsonAsObject | Add-Member -MemberType NoteProperty -Name "WPFInstall$appEntryName" -Value $appEntryContent
         }
     }
@@ -93,52 +108,44 @@ Get-ChildItem "config" | Where-Object {$psitem.extension -eq ".json"} | ForEach-
     $script_content.Add($(Write-output "`$sync.configs.$($psitem.BaseName) = '$json' `| convertfrom-json" ))
 }
 
-# Read the entire XAML file as a single string, preserving line breaks
-$xaml = Get-Content "$workingdir\xaml\inputXML.xaml" -Raw
+$xaml = (Get-Content "$workingdir\xaml\inputXML.xaml").replace("'","''")
 
 Update-Progress "Adding: Xaml " 90
 
-# Add the XAML content to $script_content using a here-string
-$script_content.Add(@"
-`$inputXML = @'
-$xaml
-'@
-"@)
+$script_content.Add($(Write-output "`$inputXML =  '$xaml'"))
 
-$script_content.Add($(Get-Content "scripts\main.ps1"))
+$script_content.Add($(Get-Content "$workingdir\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
+    $appXamlContent | Out-File -FilePath "$workingdir\xaml\inputApp.xaml" -Encoding ascii
+    $tweaksXamlContent | Out-File -FilePath "$workingdir\xaml\inputTweaks.xaml" -Encoding ascii
+    $featuresXamlContent | Out-File -FilePath "$workingdir\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
+    Remove-Item "$workingdir\xaml\inputApp.xaml" -ErrorAction SilentlyContinue
+    Remove-Item "$workingdir\xaml\inputTweaks.xaml" -ErrorAction SilentlyContinue
+    Remove-Item "$workingdir\xaml\inputFeatures.xaml" -ErrorAction SilentlyContinue
 }
 
-Set-Content -Path "$scriptname" -Value ($script_content -join "`r`n") -Encoding ascii
+Set-Content -Path "$workingdir\$scriptname" -Value ($script_content -join "`r`n") -Encoding ascii
 Write-Progress -Activity "Compiling" -Completed
 
 Update-Progress -Activity "Validating" -StatusMessage "Checking winutil.ps1 Syntax" -Percent 0
 try {
     $null = Get-Command -Syntax .\winutil.ps1
-} catch {
+}
+catch {
     Write-Warning "Syntax Validation for 'winutil.ps1' has failed"
     Write-Host "$($Error[0])" -ForegroundColor Red
 }
 Write-Progress -Activity "Validating" -Completed
 
 if ($run) {
-    $script = "& '$workingdir\$scriptname' $Arguments"
+    try {
+        Start-Process -FilePath "pwsh" -ArgumentList "$workingdir\$scriptname"
+    } catch {
+        Start-Process -FilePath "powershell" -ArgumentList "$workingdir\$scriptname"
+    }
 
-    $powershellcmd = if (Get-Command pwsh -ErrorAction SilentlyContinue) { "pwsh" } else { "powershell" }
-    $processCmd = if (Get-Command wt.exe -ErrorAction SilentlyContinue) { "wt.exe" } else { $powershellcmd }
-
-    Start-Process $processCmd -ArgumentList "$powershellcmd -NoProfile -Command $script"
-
-    break
 }
-Pop-Location

config/applications.json

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

config/autounattend.xml

@@ -293,7 +293,7 @@
     <Extensions xmlns="https://schneegans.de/windows/unattend-generator/">
         <ExtractScript>
 param(
-    [xml]$Document
+    [xml] $Document
 );
 
 $scriptsDir = 'C:\Windows\Setup\Scripts\';

config/feature.json

@@ -282,14 +282,6 @@
     "ButtonWidth": "300",
     "link": "https://christitustech.github.io/winutil/dev/features/Legacy-Windows-Panels/sound"
   },
-  "WPFPanelprinter": {
-    "Content": "Printer Panel",
-    "category": "Legacy Windows Panels",
-    "panel": "2",
-    "Type": "Button",
-    "ButtonWidth": "300",
-    "link": "https://christitustech.github.io/winutil/dev/features/Legacy-Windows-Panels/printer"
-  },
   "WPFPanelsystem": {
     "Content": "System Properties",
     "category": "Legacy Windows Panels",
@@ -305,13 +297,5 @@
     "Type": "Button",
     "ButtonWidth": "300",
     "link": "https://christitustech.github.io/winutil/dev/features/Legacy-Windows-Panels/user"
-  },
-  "WPFWinUtilPSProfile": {
-    "Content": "Install CTT PowerShell Profile",
-    "category": "Powershell Profile",
-    "panel": "2",
-    "Order": "a083_",
-    "Type": "Button",
-    "ButtonWidth": "300"
   }
 }

config/preset.json

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

config/themes.json

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

config/tweaks.json

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

docs/dev/features/Legacy-Windows-Panels/printer.md

@@ -1,65 +0,0 @@
-# Printer Settings
-
-Last Updated: 2024-08-31
-
-
-!!! info
-     The Development Documentation is auto generated for every compilation of WinUtil, meaning a part of it will always stay up-to-date. **Developers do have the ability to add custom content, which won't be updated automatically.**
-
-
-<!-- BEGIN CUSTOM CONTENT -->
-
-<!-- END CUSTOM CONTENT -->
-
-<details>
-<summary>Preview Code</summary>
-
-```json
-{
-  "Content": "Printer Settings",
-  "category": "Legacy Windows Panels",
-  "panel": "2",
-  "Type": "Button",
-  "ButtonWidth": "300"
-}
-```
-
-</details>
-
-## Function: Invoke-WPFControlPanel
-
-```powershell
-function Invoke-WPFControlPanel {
-    <#
-
-    .SYNOPSIS
-        Opens the requested legacy panel
-
-    .PARAMETER Panel
-        The panel to open
-
-    #>
-    param($Panel)
-
-    switch ($Panel) {
-        "WPFPanelcontrol" {cmd /c control}
-        "WPFPanelnetwork" {cmd /c ncpa.cpl}
-        "WPFPanelpower"   {cmd /c powercfg.cpl}
-        "WPFPanelregion"  {cmd /c intl.cpl}
-        "WPFPanelsound"   {cmd /c mmsys.cpl}
-        "WPFPanelprinter" {Start-Process "shell:::{A8A91A66-3A7D-4424-8D24-04E180695C7A}"}
-        "WPFPanelsystem"  {cmd /c sysdm.cpl}
-        "WPFPaneluser"    {cmd /c "control userpasswords2"}
-    }
-}
-
-```
-
-
-<!-- BEGIN SECOND CUSTOM CONTENT -->
-
-<!-- END SECOND CUSTOM CONTENT -->
-
-
-[View the JSON file](https://github.com/ChrisTitusTech/winutil/tree/main/../config/feature.json)
-

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

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

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

@@ -69,7 +69,7 @@ function Invoke-WPFTweakPS7{
                 Write-Host "Powershell 7 is already installed."
             } else {
                 Write-Host "Installing Powershell 7..."
-                Install-WinUtilProgramWinget -Action Install -Programs @("Microsoft.PowerShell")
+                Invoke-WinUtilWingetProgram -Action Install -Programs @("Microsoft.PowerShell")
             }
             $targetTerminalName = "PowerShell"
         }
@@ -105,10 +105,10 @@ function Invoke-WPFTweakPS7{
 }
 
 ```
-## Function: Install-WinUtilProgramWinget
+## Function: Invoke-WinUtilWingetProgram
 
 ```powershell
-Function Install-WinUtilProgramWinget {
+Function Invoke-WinUtilWingetProgram {
     <#
     .SYNOPSIS
     Runs the designated action on the provided programs using Winget

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

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

docs/devdocs.md

@@ -3,106 +3,106 @@
 
 ## Tweaks
 
-### Essential-Tweaks
-
-- [Change Windows Terminal default: PowerShell 5 -> PowerShell 7](../docs/dev/tweaks/Essential-Tweaks/Powershell7.md)
-- [Create Restore Point](../docs/dev/tweaks/Essential-Tweaks/RestorePoint.md)
-- [Debloat Edge](../docs/dev/tweaks/Essential-Tweaks/EdgeDebloat.md)
-- [Delete Temporary Files](../docs/dev/tweaks/Essential-Tweaks/DeleteTempFiles.md)
-- [Disable Activity History](../docs/dev/tweaks/Essential-Tweaks/AH.md)
-- [Disable ConsumerFeatures](../docs/dev/tweaks/Essential-Tweaks/ConsumerFeatures.md)
-- [Disable GameDVR](../docs/dev/tweaks/Essential-Tweaks/DVR.md)
-- [Disable Hibernation](../docs/dev/tweaks/Essential-Tweaks/Hiber.md)
-- [Disable Homegroup](../docs/dev/tweaks/Essential-Tweaks/Home.md)
-- [Disable Location Tracking](../docs/dev/tweaks/Essential-Tweaks/Loc.md)
-- [Disable Powershell 7 Telemetry](../docs/dev/tweaks/Essential-Tweaks/Powershell7Tele.md)
-- [Disable Storage Sense](../docs/dev/tweaks/Essential-Tweaks/Storage.md)
-- [Disable Telemetry](../docs/dev/tweaks/Essential-Tweaks/Tele.md)
-- [Disable Wifi-Sense](../docs/dev/tweaks/Essential-Tweaks/Wifi.md)
-- [Enable End Task With Right Click](../docs/dev/tweaks/Essential-Tweaks/EndTaskOnTaskbar.md)
-- [Prefer IPv4 over IPv6](../docs/dev/tweaks/Essential-Tweaks/IPv46.md)
-- [Run Disk Cleanup](../docs/dev/tweaks/Essential-Tweaks/DiskCleanup.md)
-- [Set Hibernation as default (good for laptops)](../docs/dev/tweaks/Essential-Tweaks/LaptopHibernation.md)
-- [Set Services to Manual](../docs/dev/tweaks/Essential-Tweaks/Services.md)
-### Shortcuts
-
-- [Create WinUtil Shortcut](../docs/dev/tweaks/Shortcuts/Shortcut.md)
 ### z--Advanced-Tweaks---CAUTION
 
-- [Adobe Debloat](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/DebloatAdobe.md)
-- [Adobe Network Block](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/BlockAdobeNet.md)
-- [Disable Background Apps](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableBGapps.md)
-- [Disable Fullscreen Optimizations](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableFSO.md)
-- [Disable Intel MM (vPro LMS)](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableLMS1.md)
-- [Disable IPv6](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/Disableipsix.md)
-- [Disable Microsoft Copilot](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveCopilot.md)
-- [Disable Notification Tray/Calendar](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableNotifications.md)
-- [Disable Teredo](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/Teredo.md)
-- [DNS](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/changedns.md)
-- [Remove ALL MS Store Apps - NOT RECOMMENDED](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/DeBloat.md)
-- [Remove Home and Gallery from explorer](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveHomeGallery.md)
-- [Remove Microsoft Edge](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveEdge.md)
-- [Remove OneDrive](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveOnedrive.md)
-- [Run OO Shutup 10](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/OOSUbutton.md)
-- [Set Classic Right-Click Menu ](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/RightClickMenu.md)
-- [Set Display for Performance](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/Display.md)
-- [Set Time to UTC (Dual Boot)](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/UTC.md)
+- [Adobe Debloat](dev/tweaks/z--Advanced-Tweaks---CAUTION/DebloatAdobe.md)
+- [Adobe Network Block](dev/tweaks/z--Advanced-Tweaks---CAUTION/BlockAdobeNet.md)
+- [Disable Background Apps](dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableBGapps.md)
+- [Disable Fullscreen Optimizations](dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableFSO.md)
+- [Disable Intel MM (vPro LMS)](dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableLMS1.md)
+- [Disable IPv6](dev/tweaks/z--Advanced-Tweaks---CAUTION/Disableipsix.md)
+- [Disable Microsoft Copilot](dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveCopilot.md)
+- [Disable Notification Tray/Calendar](dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableNotifications.md)
+- [DNS](dev/tweaks/z--Advanced-Tweaks---CAUTION/changedns.md)
+- [Remove ALL MS Store Apps - NOT RECOMMENDED](dev/tweaks/z--Advanced-Tweaks---CAUTION/DeBloat.md)
+- [Remove Home and Gallery from explorer](dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveHomeGallery.md)
+- [Remove Microsoft Edge](dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveEdge.md)
+- [Remove OneDrive](dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveOnedrive.md)
+- [Run OO Shutup 10](dev/tweaks/z--Advanced-Tweaks---CAUTION/OOSUbutton.md)
+- [Run Tweaks](dev/tweaks/z--Advanced-Tweaks---CAUTION/button.md)
+- [Set Classic Right-Click Menu ](dev/tweaks/z--Advanced-Tweaks---CAUTION/RightClickMenu.md)
+- [Set Display for Performance](dev/tweaks/z--Advanced-Tweaks---CAUTION/Display.md)
+- [Set Time to UTC (Dual Boot)](dev/tweaks/z--Advanced-Tweaks---CAUTION/UTC.md)
+- [Undo Selected Tweaks](dev/tweaks/z--Advanced-Tweaks---CAUTION/Undoall.md)
+### Essential-Tweaks
+
+- [Change Windows Terminal default: PowerShell 5 -> PowerShell 7](dev/tweaks/Essential-Tweaks/Powershell7.md)
+- [Create Restore Point](dev/tweaks/Essential-Tweaks/RestorePoint.md)
+- [Debloat Edge](dev/tweaks/Essential-Tweaks/EdgeDebloat.md)
+- [Delete Temporary Files](dev/tweaks/Essential-Tweaks/DeleteTempFiles.md)
+- [Disable Activity History](dev/tweaks/Essential-Tweaks/AH.md)
+- [Disable ConsumerFeatures](dev/tweaks/Essential-Tweaks/ConsumerFeatures.md)
+- [Disable GameDVR](dev/tweaks/Essential-Tweaks/DVR.md)
+- [Disable Hibernation](dev/tweaks/Essential-Tweaks/Hiber.md)
+- [Disable Homegroup](dev/tweaks/Essential-Tweaks/Home.md)
+- [Disable Location Tracking](dev/tweaks/Essential-Tweaks/Loc.md)
+- [Disable Powershell 7 Telemetry](dev/tweaks/Essential-Tweaks/Powershell7Tele.md)
+- [Disable Storage Sense](dev/tweaks/Essential-Tweaks/Storage.md)
+- [Disable Telemetry](dev/tweaks/Essential-Tweaks/Tele.md)
+- [Disable Teredo](dev/tweaks/Essential-Tweaks/Teredo.md)
+- [Disable Wifi-Sense](dev/tweaks/Essential-Tweaks/Wifi.md)
+- [Enable End Task With Right Click](dev/tweaks/Essential-Tweaks/EndTaskOnTaskbar.md)
+- [Run Disk Cleanup](dev/tweaks/Essential-Tweaks/DiskCleanup.md)
+- [Set Hibernation as default (good for laptops)](dev/tweaks/Essential-Tweaks/LaptopHibernation.md)
+- [Set Services to Manual](dev/tweaks/Essential-Tweaks/Services.md)
+### Shortcuts
+
+- [Create WinUtil Shortcut](dev/tweaks/Shortcuts/Shortcut.md)
 ### Customize-Preferences
 
-- [Bing Search in Start Menu](../docs/dev/tweaks/Customize-Preferences/BingSearch.md)
-- [Center Taskbar Items](../docs/dev/tweaks/Customize-Preferences/TaskbarAlignment.md)
-- [Dark Theme for Windows](../docs/dev/tweaks/Customize-Preferences/DarkMode.md)
-- [Detailed BSoD](../docs/dev/tweaks/Customize-Preferences/DetailedBSoD.md)
-- [Mouse Acceleration](../docs/dev/tweaks/Customize-Preferences/MouseAcceleration.md)
-- [NumLock on Startup](../docs/dev/tweaks/Customize-Preferences/NumLock.md)
-- [Search Button in Taskbar](../docs/dev/tweaks/Customize-Preferences/TaskbarSearch.md)
-- [Show File Extensions](../docs/dev/tweaks/Customize-Preferences/ShowExt.md)
-- [Show Hidden Files](../docs/dev/tweaks/Customize-Preferences/HiddenFiles.md)
-- [Snap Assist Flyout](../docs/dev/tweaks/Customize-Preferences/SnapFlyout.md)
-- [Snap Assist Suggestion](../docs/dev/tweaks/Customize-Preferences/SnapSuggestion.md)
-- [Snap Window](../docs/dev/tweaks/Customize-Preferences/SnapWindow.md)
-- [Sticky Keys](../docs/dev/tweaks/Customize-Preferences/StickyKeys.md)
-- [Task View Button in Taskbar](../docs/dev/tweaks/Customize-Preferences/TaskView.md)
-- [Verbose Messages During Logon](../docs/dev/tweaks/Customize-Preferences/VerboseLogon.md)
-- [Widgets Button in Taskbar](../docs/dev/tweaks/Customize-Preferences/TaskbarWidgets.md)
+- [Bing Search in Start Menu](dev/tweaks/Customize-Preferences/BingSearch.md)
+- [Center Taskbar Items](dev/tweaks/Customize-Preferences/TaskbarAlignment.md)
+- [Dark Theme for Windows](dev/tweaks/Customize-Preferences/DarkMode.md)
+- [Detailed BSoD](dev/tweaks/Customize-Preferences/DetailedBSoD.md)
+- [Mouse Acceleration](dev/tweaks/Customize-Preferences/MouseAcceleration.md)
+- [NumLock on Startup](dev/tweaks/Customize-Preferences/NumLock.md)
+- [Search Button in Taskbar](dev/tweaks/Customize-Preferences/TaskbarSearch.md)
+- [Show File Extensions](dev/tweaks/Customize-Preferences/ShowExt.md)
+- [Show Hidden Files](dev/tweaks/Customize-Preferences/HiddenFiles.md)
+- [Snap Assist Flyout](dev/tweaks/Customize-Preferences/SnapFlyout.md)
+- [Snap Assist Suggestion](dev/tweaks/Customize-Preferences/SnapSuggestion.md)
+- [Snap Window](dev/tweaks/Customize-Preferences/SnapWindow.md)
+- [Sticky Keys](dev/tweaks/Customize-Preferences/StickyKeys.md)
+- [Task View Button in Taskbar](dev/tweaks/Customize-Preferences/TaskView.md)
+- [Verbose Messages During Logon](dev/tweaks/Customize-Preferences/VerboseLogon.md)
+- [Widgets Button in Taskbar](dev/tweaks/Customize-Preferences/TaskbarWidgets.md)
 ### Performance-Plans
 
-- [Add and Activate Ultimate Performance Profile](../docs/dev/tweaks/Performance-Plans/AddUltPerf.md)
-- [Remove Ultimate Performance Profile](../docs/dev/tweaks/Performance-Plans/RemoveUltPerf.md)
+- [Add and Activate Ultimate Performance Profile](dev/tweaks/Performance-Plans/AddUltPerf.md)
+- [Remove Ultimate Performance Profile](dev/tweaks/Performance-Plans/RemoveUltPerf.md)
 
 ## Features
 
-### Fixes
-
-- [Remove Adobe Creative Cloud](../docs/dev/features/Fixes/RunAdobeCCCleanerTool.md)
-- [Reset Network](../docs/dev/features/Fixes/Network.md)
-- [Reset Windows Update](../docs/dev/features/Fixes/Update.md)
-- [Set Up Autologin](../docs/dev/features/Fixes/Autologin.md)
-- [System Corruption Scan](../docs/dev/features/Fixes/DISM.md)
-- [WinGet Reinstall](../docs/dev/features/Fixes/Winget.md)
 ### Legacy-Windows-Panels
 
-- [Control Panel](../docs/dev/features/Legacy-Windows-Panels/control.md)
-- [Network Connections](../docs/dev/features/Legacy-Windows-Panels/network.md)
-- [Power Panel](../docs/dev/features/Legacy-Windows-Panels/power.md)
-- [Printer Settings](../docs/dev/features/Legacy-Windows-Panels/printer.md)
-- [Region](../docs/dev/features/Legacy-Windows-Panels/region.md)
-- [Sound Settings](../docs/dev/features/Legacy-Windows-Panels/sound.md)
-- [System Properties](../docs/dev/features/Legacy-Windows-Panels/system.md)
-- [User Accounts](../docs/dev/features/Legacy-Windows-Panels/user.md)
+- [Control Panel](dev/features/Legacy-Windows-Panels/control.md)
+- [Network Connections](dev/features/Legacy-Windows-Panels/network.md)
+- [Power Panel](dev/features/Legacy-Windows-Panels/power.md)
+- [Region](dev/features/Legacy-Windows-Panels/region.md)
+- [Sound Settings](dev/features/Legacy-Windows-Panels/sound.md)
+- [System Properties](dev/features/Legacy-Windows-Panels/system.md)
+- [User Accounts](dev/features/Legacy-Windows-Panels/user.md)
+### Fixes
+
+- [Remove Adobe Creative Cloud](dev/features/Fixes/RunAdobeCCCleanerTool.md)
+- [Reset Network](dev/features/Fixes/Network.md)
+- [Reset Windows Update](dev/features/Fixes/Update.md)
+- [Set Up Autologin](dev/features/Fixes/Autologin.md)
+- [System Corruption Scan](dev/features/Fixes/DISM.md)
+- [WinGet Reinstall](dev/features/Fixes/Winget.md)
 ### Features
 
-- [All .Net Framework (2,3,4)](../docs/dev/features/Features/dotnet.md)
-- [Disable Legacy F8 Boot Recovery](../docs/dev/features/Features/DisableLegacyRecovery.md)
-- [Disable Search Box Web Suggestions in Registry(explorer restart)](../docs/dev/features/Features/DisableSearchSuggestions.md)
-- [Enable Daily Registry Backup Task 12.30am](../docs/dev/features/Features/RegBackup.md)
-- [Enable Legacy F8 Boot Recovery](../docs/dev/features/Features/EnableLegacyRecovery.md)
-- [Enable Search Box Web Suggestions in Registry(explorer restart)](../docs/dev/features/Features/EnableSearchSuggestions.md)
-- [HyperV Virtualization](../docs/dev/features/Features/hyperv.md)
-- [Install Features](../docs/dev/features/Features/Install.md)
-- [Legacy Media (WMP, DirectPlay)](../docs/dev/features/Features/legacymedia.md)
-- [NFS - Network File System](../docs/dev/features/Features/nfs.md)
-- [Windows Sandbox](../docs/dev/features/Features/Sandbox.md)
-- [Windows Subsystem for Linux](../docs/dev/features/Features/wsl.md)
+- [All .Net Framework (2,3,4)](dev/features/Features/dotnet.md)
+- [Disable Legacy F8 Boot Recovery](dev/features/Features/DisableLegacyRecovery.md)
+- [Disable Search Box Web Suggestions in Registry(explorer restart)](dev/features/Features/DisableSearchSuggestions.md)
+- [Enable Daily Registry Backup Task 12.30am](dev/features/Features/RegBackup.md)
+- [Enable Legacy F8 Boot Recovery](dev/features/Features/EnableLegacyRecovery.md)
+- [Enable Search Box Web Suggestions in Registry(explorer restart)](dev/features/Features/EnableSearchSuggestions.md)
+- [HyperV Virtualization](dev/features/Features/hyperv.md)
+- [Install Features](dev/features/Features/Install.md)
+- [Legacy Media (WMP, DirectPlay)](dev/features/Features/legacymedia.md)
+- [NFS - Network File System](dev/features/Features/nfs.md)
+- [Windows Sandbox](dev/features/Features/Sandbox.md)
+- [Windows Subsystem for Linux](dev/features/Features/wsl.md)
 
 

docs/userguide.md

@@ -29,11 +29,6 @@
     * Click the `Clear Selection` button.
     * This will unselect all checked programs.
 
-=== "prefer Chocolatey"
-    * Check the `prefer Chocolatey` checkbox
-    * By default Winutil will use winget to install/upgrade/remove packages and fallback to Chocolatey. This option reverses the preference.
-    * This preference will be used for all Buttons on the Install page and persist across Winutil restarts
-
 ![Install Image](assets/Install-Tab-Dark.png#only-dark)
 ![Install Image](assets/Install-Tab-Light.png#only-light)
 !!! tip

functions/private/ConvertTo-Icon.ps1

@@ -0,0 +1,92 @@
+function ConvertTo-Icon {
+    <#
+
+        .DESCRIPTION
+        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
+        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 parameter 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, position=0)]
+        [string]$bitmapPath,
+        [Parameter(Mandatory, position=1)]
+        [string]$iconPath,
+        [Parameter(position=2)]
+        [bool]$overrideIconFile = $true
+    )
+
+    Add-Type -AssemblyName System.Drawing
+
+    if (Test-Path $bitmapPath) {
+        if ((Test-Path $iconPath) -AND ($overrideIconFile -eq $false)) {
+            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
+            return
+        }
+
+        # 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/Install-WinUtilChoco.ps1

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

functions/private/Install-WinUtilProgramChoco.ps1

@@ -1,258 +1,102 @@
 function Install-WinUtilProgramChoco {
     <#
     .SYNOPSIS
-    Manages the installation or uninstallation of a list of Chocolatey packages.
+    Manages the provided programs using Chocolatey
 
-    .PARAMETER Programs
-    A string array containing the programs to be installed or uninstalled.
+    .PARAMETER ProgramsToInstall
+    A list of programs to manage
 
-    .PARAMETER Action
-    Specifies the action to perform: "Install" or "Uninstall". The default value is "Install".
+    .PARAMETER manage
+    The action to perform on the programs, can be either 'Installing' or 'Uninstalling'
 
-    .DESCRIPTION
-    This function processes a list of programs to be managed using Chocolatey. Depending on the specified action, it either installs or uninstalls each program in the list, updating the taskbar progress accordingly. After all operations are completed, temporary output files are cleaned up.
-
-    .EXAMPLE
-    Install-WinUtilProgramChoco -Programs @("7zip","chrome") -Action "Uninstall"
+    .NOTES
+    The triple quotes are required any time you need a " in a normal script block.
     #>
 
     param(
-        [Parameter(Mandatory, Position = 0)]
-        [string[]]$Programs,
+        [Parameter(Mandatory, Position=0)]
+        [PsCustomObject]$ProgramsToInstall,
 
-        [Parameter(Position = 1)]
-        [String]$Action = "Install"
+        [Parameter(Position=1)]
+        [String]$manage = "Installing"
     )
 
-    function Initialize-OutputFile {
-        <#
-        .SYNOPSIS
-        Initializes an output file by removing any existing file and creating a new, empty file at the specified path.
+    $x = 0
+    $count = $ProgramsToInstall.Count
 
-        .PARAMETER filePath
-        The full path to the file to be initialized.
-
-        .DESCRIPTION
-        This function ensures that the specified file is reset by removing any existing file at the provided path and then creating a new, empty file. It is useful when preparing a log or output file for subsequent operations.
-
-        .EXAMPLE
-        Initialize-OutputFile -filePath "C:\temp\output.txt"
-        #>
-
-        param ($filePath)
-        Remove-Item -Path $filePath -Force -ErrorAction SilentlyContinue
-        New-Item -ItemType File -Path $filePath | Out-Null
-    }
-
-    function Run-ChocoCommand {
-        <#
-        .SYNOPSIS
-        Executes a Chocolatey command with the specified arguments and returns the exit code.
-
-        .PARAMETER arguments
-        The arguments to be passed to the Chocolatey command.
-
-        .DESCRIPTION
-        This function runs a specified Chocolatey command by passing the provided arguments to the `choco` executable. It waits for the process to complete and then returns the exit code, allowing the caller to determine success or failure based on the exit code.
-
-        .RETURNS
-        [int]
-        The exit code of the Chocolatey command.
-
-        .EXAMPLE
-        $exitCode = Run-ChocoCommand -arguments "install 7zip -y"
-        #>
-
-        param ($arguments)
-        return (Start-Process -FilePath "choco" -ArgumentList $arguments -Wait -PassThru).ExitCode
-    }
-
-    function Check-UpgradeNeeded {
-        <#
-        .SYNOPSIS
-        Checks if an upgrade is needed for a Chocolatey package based on the content of a log file.
-
-        .PARAMETER filePath
-        The path to the log file that contains the output of a Chocolatey install command.
-
-        .DESCRIPTION
-        This function reads the specified log file and checks for keywords that indicate whether an upgrade is needed. It returns a boolean value indicating whether the terms "reinstall" or "already installed" are present, which suggests that the package might need an upgrade.
-
-        .RETURNS
-        [bool]
-        True if the log file indicates that an upgrade is needed; otherwise, false.
-
-        .EXAMPLE
-        $isUpgradeNeeded = Check-UpgradeNeeded -filePath "C:\temp\install-output.txt"
-        #>
-
-        param ($filePath)
-        return Get-Content -Path $filePath | Select-String -Pattern "reinstall|already installed" -Quiet
-    }
-
-    function Update-TaskbarProgress {
-        <#
-        .SYNOPSIS
-        Updates the taskbar progress based on the current installation progress.
-
-        .PARAMETER currentIndex
-        The current index of the program being installed or uninstalled.
-
-        .PARAMETER totalPrograms
-        The total number of programs to be installed or uninstalled.
-
-        .DESCRIPTION
-        This function calculates the progress of the installation or uninstallation process and updates the taskbar accordingly. The taskbar is set to "Normal" if all programs have been processed, otherwise, it is set to "Error" as a placeholder.
-
-        .EXAMPLE
-        Update-TaskbarProgress -currentIndex 3 -totalPrograms 10
-        #>
-
-        param (
-            [int]$currentIndex,
-            [int]$totalPrograms
-        )
-        $progressState = if ($currentIndex -eq $totalPrograms) { "Normal" } else { "Error" }
-        $sync.form.Dispatcher.Invoke([action] { Set-WinUtilTaskbaritem -state $progressState -value ($currentIndex / $totalPrograms) })
-    }
-
-    function Install-ChocoPackage {
-        <#
-        .SYNOPSIS
-        Installs a Chocolatey package and optionally upgrades it if needed.
-
-        .PARAMETER Program
-        A string containing the name of the Chocolatey package to be installed.
-
-        .PARAMETER currentIndex
-        The current index of the program in the list of programs to be managed.
-
-        .PARAMETER totalPrograms
-        The total number of programs to be installed.
-
-        .DESCRIPTION
-        This function installs a Chocolatey package by running the `choco install` command. If the installation output indicates that an upgrade might be needed, the function will attempt to upgrade the package. The taskbar progress is updated after each package is processed.
-
-        .EXAMPLE
-        Install-ChocoPackage -Program $Program -currentIndex 0 -totalPrograms 5
-        #>
-
-        param (
-            [string]$Program,
-            [int]$currentIndex,
-            [int]$totalPrograms
-        )
-
-        $installOutputFile = "$env:TEMP\Install-WinUtilProgramChoco.install-command.output.txt"
-        Initialize-OutputFile $installOutputFile
-
-        Write-Host "Starting installation of $Program with Chocolatey."
-
-        try {
-            $installStatusCode = Run-ChocoCommand "install $Program -y --log-file $installOutputFile"
-            if ($installStatusCode -eq 0) {
-
-                if (Check-UpgradeNeeded $installOutputFile) {
-                    $upgradeStatusCode = Run-ChocoCommand "upgrade $Program -y"
-                    Write-Host "$Program was" $(if ($upgradeStatusCode -eq 0) { "upgraded successfully." } else { "not upgraded." })
-                }
-                else {
-                    Write-Host "$Program installed successfully."
-                }
-            }
-            else {
-                Write-Host "Failed to install $Program."
-            }
-        }
-        catch {
-            Write-Host "Failed to install $Program due to an error: $_"
-        }
-        finally {
-            Update-TaskbarProgress $currentIndex $totalPrograms
-        }
-    }
-
-    function Uninstall-ChocoPackage {
-        <#
-        .SYNOPSIS
-        Uninstalls a Chocolatey package and any related metapackages.
-
-        .PARAMETER Program
-        A string containing the name of the Chocolatey package to be uninstalled.
-
-        .PARAMETER currentIndex
-        The current index of the program in the list of programs to be managed.
-
-        .PARAMETER totalPrograms
-        The total number of programs to be uninstalled.
-
-        .DESCRIPTION
-        This function uninstalls a Chocolatey package and any related metapackages (e.g., .install or .portable variants). It updates the taskbar progress after processing each package.
-
-        .EXAMPLE
-        Uninstall-ChocoPackage -Program $Program -currentIndex 0 -totalPrograms 5
-        #>
-
-        param (
-            [string]$Program,
-            [int]$currentIndex,
-            [int]$totalPrograms
-        )
-
-        $uninstallOutputFile = "$env:TEMP\Install-WinUtilProgramChoco.uninstall-command.output.txt"
-        Initialize-OutputFile $uninstallOutputFile
-
-        Write-Host "Searching for metapackages of $Program (.install or .portable)"
-        $chocoPackages = ((choco list | Select-String -Pattern "$Program(\.install|\.portable)?").Matches.Value) -join " "
-        if ($chocoPackages) {
-            Write-Host "Starting uninstallation of $chocoPackages with Chocolatey."
-            try {
-                $uninstallStatusCode = Run-ChocoCommand "uninstall $chocoPackages -y"
-                Write-Host "$Program" $(if ($uninstallStatusCode -eq 0) { "uninstalled successfully." } else { "failed to uninstall." })
-            }
-            catch {
-                Write-Host "Failed to uninstall $Program due to an error: $_"
-            }
-            finally {
-                Update-TaskbarProgress $currentIndex $totalPrograms
-            }
-        }
-        else {
-            Write-Host "$Program is not installed."
-        }
-    }
-
-    $totalPrograms = $Programs.Count
-    if ($totalPrograms -le 0) {
-        throw "Parameter 'Programs' must have at least one item."
+    # 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 packages   ---"
+    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."
+                    $X++
+                    $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Normal" -value ($x/$count) })
+                    continue
+                } else {
+                    Write-Host "Failed to install $($Program.choco) using Chocolatey, Chocolatey output:`n`n$(Get-Content -Path $installOutputFilePath)."
+                    $X++
+                    $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Error" -value ($x/$count) })
+                }
+            } catch {
+                Write-Host "Failed to install $($Program.choco) due to an error: $_"
+                $X++
+                $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Error" -value ($x/$count) })
+            }
+        }
 
-    for ($currentIndex = 0; $currentIndex -lt $totalPrograms; $currentIndex++) {
-        $Program = $Programs[$currentIndex]
-        Set-WinUtilProgressBar -label "$Action $($Program)" -percent ($currentIndex / $totalPrograms * 100)
-        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -value ($currentIndex / $totalPrograms)})
+    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."
+                    $x++
+                    $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Normal" -value ($x/$count) })
+                    continue
+                } else {
+                    Write-Host "Failed to uninstall $($Program.choco) using Chocolatey, Chocolatey output:`n`n$(Get-Content -Path $uninstallOutputFilePath)."
+                    $x++
+                    $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Error" -value ($x/$count) })
+                }
+            } catch {
+                Write-Host "Failed to uninstall $($Program.choco) due to an error: $_"
+                $x++
+                $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Error" -value ($x/$count) })
+            }
+    }
+    }
+    Write-Progress -Activity "$manage Applications" -Status "Finished" -Completed
 
-        switch ($Action) {
-            "Install" {
-                Install-ChocoPackage -Program $Program -currentIndex $currentIndex -totalPrograms $totalPrograms
-            }
-            "Uninstall" {
-                Uninstall-ChocoPackage -Program $Program -currentIndex $currentIndex -totalPrograms $totalPrograms
-            }
-            default {
-                throw "Invalid action parameter value: '$Action'."
-            }
-        }
-    }
-    Set-WinUtilProgressBar -label "$($Action)ation done" -percent 100
-    # Cleanup Output Files
-    $outputFiles = @("$env:TEMP\Install-WinUtilProgramChoco.install-command.output.txt", "$env:TEMP\Install-WinUtilProgramChoco.uninstall-command.output.txt")
-    foreach ($filePath in $outputFiles) {
-        Remove-Item -Path $filePath -Force -ErrorAction SilentlyContinue
-    }
+    # Cleanup leftovers files
+    if(Test-Path -Path $installOutputFilePath) { Remove-Item -Path $installOutputFilePath }
+    if(Test-Path -Path $uninstallOutputFilePath) { Remove-Item -Path $uninstallOutputFilePath }
+
+    return;
 }
-

functions/private/Invoke-WinUtilAssets.ps1

@@ -1,199 +0,0 @@
-function Invoke-WinUtilAssets {
-  param (
-      $type,
-      $Size,
-      [switch]$render
-  )
-
-  # Create the Viewbox and set its size
-  $LogoViewbox = New-Object Windows.Controls.Viewbox
-  $LogoViewbox.Width = $Size
-  $LogoViewbox.Height = $Size
-
-  # Create a Canvas to hold the paths
-  $canvas = New-Object Windows.Controls.Canvas
-  $canvas.Width = 100
-  $canvas.Height = 100
-
-  # Define a scale factor for the content inside the Canvas
-  $scaleFactor = $Size / 100
-
-  # Apply a scale transform to the Canvas content
-  $scaleTransform = New-Object Windows.Media.ScaleTransform($scaleFactor, $scaleFactor)
-  $canvas.LayoutTransform = $scaleTransform
-
-  switch ($type) {
-      'logo' {
-          $LogoPathData1 = @"
-M 18.00,14.00
-C 18.00,14.00 45.00,27.74 45.00,27.74
-45.00,27.74 57.40,34.63 57.40,34.63
-57.40,34.63 59.00,43.00 59.00,43.00
-59.00,43.00 59.00,83.00 59.00,83.00
-55.35,81.66 46.99,77.79 44.72,74.79
-41.17,70.10 42.01,59.80 42.00,54.00
-42.00,51.62 42.20,48.29 40.98,46.21
-38.34,41.74 25.78,38.60 21.28,33.79
-16.81,29.02 18.00,20.20 18.00,14.00 Z
-"@
-          $LogoPath1 = New-Object Windows.Shapes.Path
-          $LogoPath1.Data = [Windows.Media.Geometry]::Parse($LogoPathData1)
-          $LogoPath1.Fill = [System.Windows.Media.BrushConverter]::new().ConvertFromString("#0567ff")
-
-          $LogoPathData2 = @"
-M 107.00,14.00
-C 109.01,19.06 108.93,30.37 104.66,34.21
-100.47,37.98 86.38,43.10 84.60,47.21
-83.94,48.74 84.01,51.32 84.00,53.00
-83.97,57.04 84.46,68.90 83.26,72.00
-81.06,77.70 72.54,81.42 67.00,83.00
-67.00,83.00 67.00,43.00 67.00,43.00
-67.00,43.00 67.99,35.63 67.99,35.63
-67.99,35.63 80.00,28.26 80.00,28.26
-80.00,28.26 107.00,14.00 107.00,14.00 Z
-"@
-          $LogoPath2 = New-Object Windows.Shapes.Path
-          $LogoPath2.Data = [Windows.Media.Geometry]::Parse($LogoPathData2)
-          $LogoPath2.Fill = [System.Windows.Media.BrushConverter]::new().ConvertFromString("#0567ff")
-
-          $LogoPathData3 = @"
-M 19.00,46.00
-C 21.36,47.14 28.67,50.71 30.01,52.63
-31.17,54.30 30.99,57.04 31.00,59.00
-31.04,65.41 30.35,72.16 33.56,78.00
-38.19,86.45 46.10,89.04 54.00,93.31
-56.55,94.69 60.10,97.20 63.00,97.22
-65.50,97.24 68.77,95.36 71.00,94.25
-76.42,91.55 84.51,87.78 88.82,83.68
-94.56,78.20 95.96,70.59 96.00,63.00
-96.01,60.24 95.59,54.63 97.02,52.39
-98.80,49.60 103.95,47.87 107.00,47.00
-107.00,47.00 107.00,67.00 107.00,67.00
-106.90,87.69 96.10,93.85 80.00,103.00
-76.51,104.98 66.66,110.67 63.00,110.52
-60.33,110.41 55.55,107.53 53.00,106.25
-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
-"@
-          $LogoPath3 = New-Object Windows.Shapes.Path
-          $LogoPath3.Data = [Windows.Media.Geometry]::Parse($LogoPathData3)
-          $LogoPath3.Fill = [System.Windows.Media.BrushConverter]::new().ConvertFromString("#a3a4a6")
-
-          $canvas.Children.Add($LogoPath1) | Out-Null
-          $canvas.Children.Add($LogoPath2) | Out-Null
-          $canvas.Children.Add($LogoPath3) | Out-Null
-      }
-      'checkmark' {
-          $canvas.Width = 512
-          $canvas.Height = 512
-
-          $scaleFactor = $Size / 2.54
-          $scaleTransform = New-Object Windows.Media.ScaleTransform($scaleFactor, $scaleFactor)
-          $canvas.LayoutTransform = $scaleTransform
-
-          # Define the circle path
-          $circlePathData = "M 1.27,0 A 1.27,1.27 0 1,0 1.27,2.54 A 1.27,1.27 0 1,0 1.27,0"
-          $circlePath = New-Object Windows.Shapes.Path
-          $circlePath.Data = [Windows.Media.Geometry]::Parse($circlePathData)
-          $circlePath.Fill = [System.Windows.Media.BrushConverter]::new().ConvertFromString("#39ba00")
-
-          # Define the checkmark path
-          $checkmarkPathData = "M 0.873 1.89 L 0.41 1.391 A 0.17 0.17 0 0 1 0.418 1.151 A 0.17 0.17 0 0 1 0.658 1.16 L 1.016 1.543 L 1.583 1.013 A 0.17 0.17 0 0 1 1.599 1 L 1.865 0.751 A 0.17 0.17 0 0 1 2.105 0.759 A 0.17 0.17 0 0 1 2.097 0.999 L 1.282 1.759 L 0.999 2.022 L 0.874 1.888 Z"
-          $checkmarkPath = New-Object Windows.Shapes.Path
-          $checkmarkPath.Data = [Windows.Media.Geometry]::Parse($checkmarkPathData)
-          $checkmarkPath.Fill = [Windows.Media.Brushes]::White
-
-          # Add the paths to the Canvas
-          $canvas.Children.Add($circlePath) | Out-Null
-          $canvas.Children.Add($checkmarkPath) | Out-Null
-      }
-      'warning' {
-          $canvas.Width = 512
-          $canvas.Height = 512
-
-          # Define a scale factor for the content inside the Canvas
-          $scaleFactor = $Size / 512  # Adjust scaling based on the canvas size
-          $scaleTransform = New-Object Windows.Media.ScaleTransform($scaleFactor, $scaleFactor)
-          $canvas.LayoutTransform = $scaleTransform
-
-          # Define the circle path
-          $circlePathData = "M 256,0 A 256,256 0 1,0 256,512 A 256,256 0 1,0 256,0"
-          $circlePath = New-Object Windows.Shapes.Path
-          $circlePath.Data = [Windows.Media.Geometry]::Parse($circlePathData)
-          $circlePath.Fill = [System.Windows.Media.BrushConverter]::new().ConvertFromString("#f41b43")
-
-          # Define the exclamation mark path
-          $exclamationPathData = "M 256 307.2 A 35.89 35.89 0 0 1 220.14 272.74 L 215.41 153.3 A 35.89 35.89 0 0 1 251.27 116 H 260.73 A 35.89 35.89 0 0 1 296.59 153.3 L 291.86 272.74 A 35.89 35.89 0 0 1 256 307.2 Z"
-          $exclamationPath = New-Object Windows.Shapes.Path
-          $exclamationPath.Data = [Windows.Media.Geometry]::Parse($exclamationPathData)
-          $exclamationPath.Fill = [Windows.Media.Brushes]::White
-
-          # Get the bounds of the exclamation mark path
-          $exclamationBounds = $exclamationPath.Data.Bounds
-
-          # Calculate the center position for the exclamation mark path
-          $exclamationCenterX = ($canvas.Width - $exclamationBounds.Width) / 2 - $exclamationBounds.X
-          $exclamationPath.SetValue([Windows.Controls.Canvas]::LeftProperty, $exclamationCenterX)
-
-          # Define the rounded rectangle at the bottom (dot of exclamation mark)
-          $roundedRectangle = New-Object Windows.Shapes.Rectangle
-          $roundedRectangle.Width = 80
-          $roundedRectangle.Height = 80
-          $roundedRectangle.RadiusX = 30
-          $roundedRectangle.RadiusY = 30
-          $roundedRectangle.Fill = [Windows.Media.Brushes]::White
-
-          # Calculate the center position for the rounded rectangle
-          $centerX = ($canvas.Width - $roundedRectangle.Width) / 2
-          $roundedRectangle.SetValue([Windows.Controls.Canvas]::LeftProperty, $centerX)
-          $roundedRectangle.SetValue([Windows.Controls.Canvas]::TopProperty, 324.34)
-
-          # Add the paths to the Canvas
-          $canvas.Children.Add($circlePath) | Out-Null
-          $canvas.Children.Add($exclamationPath) | Out-Null
-          $canvas.Children.Add($roundedRectangle) | Out-Null
-      }
-      default {
-          Write-Host "Invalid type: $type"
-      }
-  }
-
-  # Add the Canvas to the Viewbox
-  $LogoViewbox.Child = $canvas
-
-  if ($render) {
-      # Measure and arrange the canvas to ensure proper rendering
-      $canvas.Measure([Windows.Size]::new($canvas.Width, $canvas.Height))
-      $canvas.Arrange([Windows.Rect]::new(0, 0, $canvas.Width, $canvas.Height))
-      $canvas.UpdateLayout()
-
-      # Initialize RenderTargetBitmap correctly with dimensions
-      $renderTargetBitmap = New-Object Windows.Media.Imaging.RenderTargetBitmap($canvas.Width, $canvas.Height, 96, 96, [Windows.Media.PixelFormats]::Pbgra32)
-
-      # Render the canvas to the bitmap
-      $renderTargetBitmap.Render($canvas)
-
-      # Create a BitmapFrame from the RenderTargetBitmap
-      $bitmapFrame = [Windows.Media.Imaging.BitmapFrame]::Create($renderTargetBitmap)
-
-      # Create a PngBitmapEncoder and add the frame
-      $bitmapEncoder = [Windows.Media.Imaging.PngBitmapEncoder]::new()
-      $bitmapEncoder.Frames.Add($bitmapFrame)
-
-      # Save to a memory stream
-      $imageStream = New-Object System.IO.MemoryStream
-      $bitmapEncoder.Save($imageStream)
-      $imageStream.Position = 0
-
-      # Load the stream into a BitmapImage
-      $bitmapImage = [Windows.Media.Imaging.BitmapImage]::new()
-      $bitmapImage.BeginInit()
-      $bitmapImage.StreamSource = $imageStream
-      $bitmapImage.CacheOption = [Windows.Media.Imaging.BitmapCacheOption]::OnLoad
-      $bitmapImage.EndInit()
-
-      return $bitmapImage
-  } else {
-      return $LogoViewbox
-  }
-}

functions/private/Invoke-WinUtilCurrentSystem.ps1

@@ -13,16 +13,6 @@ Function Invoke-WinUtilCurrentSystem {
     param(
         $CheckBox
     )
-    if ($CheckBox -eq "choco") {
-        $apps = (choco list | Select-String -Pattern "^\S+").Matches.Value
-        $filter = Get-WinUtilVariables -Type Checkbox | Where-Object {$psitem -like "WPFInstall*"}
-        $sync.GetEnumerator() | Where-Object {$psitem.Key -in $filter} | ForEach-Object {
-            $dependencies = @($sync.configs.applications.$($psitem.Key).choco -split ";")
-            if ($dependencies -in $apps) {
-                Write-Output $psitem.name
-            }
-        }
-    }
 
     if ($checkbox -eq "winget") {
 

functions/private/Invoke-WinUtilGPU.ps1

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

functions/private/Invoke-WinUtilMicroWin-Helper.ps1

@@ -37,30 +37,28 @@ function Remove-Features() {
             Remove-Features
     #>
     try {
-        $featlist = (Get-WindowsOptionalFeature -Path $scratchDir)
+        $featlist = (Get-WindowsOptionalFeature -Path $scratchDir).FeatureName
 
         $featlist = $featlist | Where-Object {
-            $_.FeatureName -NotLike "*Defender*" -AND
-            $_.FeatureName -NotLike "*Printing*" -AND
-            $_.FeatureName -NotLike "*TelnetClient*" -AND
-            $_.FeatureName -NotLike "*PowerShell*" -AND
-            $_.FeatureName -NotLike "*NetFx*" -AND
-            $_.FeatureName -NotLike "*Media*" -AND
-            $_.FeatureName -NotLike "*NFS*" -AND
-            $_.State -ne "Disabled"
+            $_ -NotLike "*Defender*" -AND
+            $_ -NotLike "*Printing*" -AND
+            $_ -NotLike "*TelnetClient*" -AND
+            $_ -NotLike "*PowerShell*" -AND
+            $_ -NotLike "*NetFx*" -AND
+            $_ -NotLike "*Media*" -AND
+            $_ -NotLike "*NFS*"
         }
 
         foreach($feature in $featlist) {
-            $status = "Removing feature $($feature.FeatureName)"
+            $status = "Removing feature $feature"
             Write-Progress -Activity "Removing features" -Status $status -PercentComplete ($counter++/$featlist.Count*100)
-            Write-Debug "Removing feature $($feature.FeatureName)"
-            Disable-WindowsOptionalFeature -Path "$scratchDir" -FeatureName $($feature.FeatureName) -Remove  -ErrorAction SilentlyContinue -NoRestart
+            Write-Debug "Removing feature $feature"
+            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."
     } catch {
         Write-Host "Unable to get information about the features. MicroWin processing will continue, but features will not be processed"
-        Write-Host "Error information: $($_.Exception.Message)" -ForegroundColor Yellow
     }
 }
 
@@ -108,8 +106,6 @@ function Remove-Packages {
                 $_ -NotLike "*Wifi*"
             }
 
-        $failedCount = 0
-
         foreach ($pkg in $pkglist) {
             try {
                 $status = "Removing $pkg"
@@ -118,18 +114,12 @@ function Remove-Packages {
             } 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)"
-                $failedCount += 1
                 continue
             }
         }
         Write-Progress -Activity "Removing Apps" -Status "Ready" -Completed
-        if ($failedCount -gt 0)
-        {
-            Write-Host "Some packages could not be removed. Do not worry: your image will still work fine. This can happen if the package is permanent or has been superseded by a newer one."
-        }
     } catch {
         Write-Host "Unable to get information about the packages. MicroWin processing will continue, but packages will not be processed"
-        Write-Host "Error information: $($_.Exception.Message)" -ForegroundColor Yellow
     }
 }
 
@@ -185,7 +175,6 @@ function Remove-ProvisionedPackages() {
     {
         # This can happen if getting AppX packages fails
         Write-Host "Unable to get information about the AppX packages. MicroWin processing will continue, but AppX packages will not be processed"
-        Write-Host "Error information: $($_.Exception.Message)" -ForegroundColor Yellow
     }
 }
 
@@ -259,8 +248,8 @@ function Remove-FileOrDirectory([string]$pathToDelete, [string]$mask = "", [swit
 function New-Unattend {
 
     param (
-        [Parameter(Mandatory, Position = 0)] [string]$userName,
-        [Parameter(Position = 1)] [string]$userPassword
+        [Parameter(Mandatory, Position = 0)] [string] $userName,
+        [Parameter(Position = 1)] [string] $userPassword
     )
 
     $unattend = @'

functions/private/Invoke-WinUtilSnapFlyout.ps1

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

functions/private/Invoke-WinUtilWingetProgram.ps1

@@ -1,4 +1,4 @@
-Function Install-WinUtilProgramWinget {
+Function Invoke-WinUtilWingetProgram {
     <#
     .SYNOPSIS
     Runs the designated action on the provided programs using Winget

functions/private/Invoke-WinUtilpsProfile.ps1

@@ -1,50 +0,0 @@
-function Invoke-WinUtilpsProfile {
-    <#
-    .SYNOPSIS
-        Installs & applies the CTT Powershell Profile
-    #>
-    Invoke-WPFRunspace -Argumentlist $PROFILE -DebugPreference $DebugPreference -ScriptBlock {
-        param ( $psprofile)
-        function Invoke-PSSetup {
-            $url = "https://raw.githubusercontent.com/ChrisTitusTech/powershell-profile/main/Microsoft.PowerShell_profile.ps1"
-            $oldhash = Get-FileHash $psprofile -ErrorAction SilentlyContinue
-            Invoke-RestMethod $url -OutFile "$env:temp/Microsoft.PowerShell_profile.ps1"
-            $newhash = Get-FileHash "$env:temp/Microsoft.PowerShell_profile.ps1"
-            if ($newhash.Hash -ne $oldhash.Hash) {
-                    write-host "===> Installing Profile.. <===" -ForegroundColor Yellow
-                    # Starting new hidden shell process bc setup does not work in a runspace
-                    Start-Process -FilePath "pwsh" -ArgumentList "-ExecutionPolicy Bypass -NoProfile -Command `"Invoke-Expression (Invoke-WebRequest `'https://github.com/ChrisTitusTech/powershell-profile/raw/main/setup.ps1`')`"" -WindowStyle Hidden -Wait
-                    Write-Host "Profile has been installed. Please restart your shell to reflect changes!" -ForegroundColor Magenta
-                    write-host "===> Finished <===" -ForegroundColor Yellow
-            } else {
-                Write-Host "Profile is up to date" -ForegroundColor Green
-            }
-        }
-
-        if (Get-Command "pwsh" -ErrorAction SilentlyContinue) {
-            if ($PSVersionTable.PSVersion.Major -ge 7) {
-                Invoke-PSSetup
-            }
-            else {
-                write-host "Profile requires Powershell 7, which is currently installed but not used!" -ForegroundColor Red
-                # Load the necessary assembly for Windows Forms
-                Add-Type -AssemblyName System.Windows.Forms
-                # Display the Yes/No message box
-                $question = [System.Windows.Forms.MessageBox]::Show("Profile requires Powershell 7, which is currently installed but not used! Do you want to install Profile for Powershell 7?", "Question",
-                    [System.Windows.Forms.MessageBoxButtons]::YesNo,
-                    [System.Windows.Forms.MessageBoxIcon]::Question)
-
-                # Check the result
-                if ($question -eq [System.Windows.Forms.DialogResult]::Yes) {
-                    Invoke-PSSetup
-                }
-                else {
-                    Write-Host "Not proceeding with the profile setup!"
-                }
-            }
-        }
-        else {
-            write-host "Profile requires Powershell 7, which is not installed!" -ForegroundColor Red
-        }
-    }
-}

functions/private/Set-WinUtilTaskbarItem.ps1

@@ -61,13 +61,13 @@ function Set-WinUtilTaskbaritem {
     if ($overlay) {
         switch ($overlay) {
             'logo' {
-                $sync["Form"].taskbarItemInfo.Overlay = $sync["logorender"]
+                $sync["Form"].taskbarItemInfo.Overlay = "$env:LOCALAPPDATA\winutil\cttlogo.png"
             }
             'checkmark' {
-                $sync["Form"].taskbarItemInfo.Overlay = $sync["checkmarkrender"]
+                $sync["Form"].taskbarItemInfo.Overlay = "$env:LOCALAPPDATA\winutil\checkmark.png"
             }
             'warning' {
-                $sync["Form"].taskbarItemInfo.Overlay = $sync["warningrender"]
+                $sync["Form"].taskbarItemInfo.Overlay = "$env:LOCALAPPDATA\winutil\warning.png"
             }
             'None' {
                 $sync["Form"].taskbarItemInfo.Overlay = $null

functions/private/Set-WinUtilUITheme.ps1

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

functions/private/Set-WinUtilUiTheme.ps1

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

functions/private/Show-CustomDialog.ps1

@@ -51,7 +51,7 @@ function Show-CustomDialog {
     $buttonBackgroundColor = $sync.configs.themes.$ctttheme.ButtonInstallBackgroundColor
     $buttonForegroundColor = $sync.configs.themes.$ctttheme.ButtonInstallForegroundColor
     $shadowColor = [Windows.Media.ColorConverter]::ConvertFromString("#AAAAAAAA")
-    $logocolor = $sync.configs.themes.$ctttheme.LabelboxForegroundColor
+    $logocolor = $sync.configs.themes.$ctttheme.ButtonBackgroundPressedColor
 
     # Create a custom dialog window
     $dialog = New-Object Windows.Window
@@ -128,15 +128,73 @@ function Show-CustomDialog {
     $grid.Children.Add($stackPanel)
     [Windows.Controls.Grid]::SetRow($stackPanel, 0)  # Set the row to the second row (0-based index)
 
+    $viewbox = New-Object Windows.Controls.Viewbox
+    $viewbox.Width = $IconSize
+    $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
+#     M177 711 c-19 -88 4 -242 49 -318 43 -74 107 -127 232 -191 176 -90 199 -84 28 7 -169 91 -214 129 -258 220 -29 58 -32 74 -37 190 -4 90 -8 116 -14 92z
+#     M1069 610 c-4 -131 -5 -137 -38 -198 -43 -79 -89 -119 -210 -181 -53 -27 -116 -61 -141 -76 -74 -43 -6 -20 115 40 221 109 296 217 294 425 -1 144 -16 137 -20 -10z
+# "@
+$cttLogoPath = @"
+           M 18.00,14.00
+           C 18.00,14.00 45.00,27.74 45.00,27.74
+             45.00,27.74 57.40,34.63 57.40,34.63
+             57.40,34.63 59.00,43.00 59.00,43.00
+             59.00,43.00 59.00,83.00 59.00,83.00
+             55.35,81.66 46.99,77.79 44.72,74.79
+             41.17,70.10 42.01,59.80 42.00,54.00
+             42.00,51.62 42.20,48.29 40.98,46.21
+             38.34,41.74 25.78,38.60 21.28,33.79
+             16.81,29.02 18.00,20.20 18.00,14.00 Z
+           M 107.00,14.00
+           C 109.01,19.06 108.93,30.37 104.66,34.21
+             100.47,37.98 86.38,43.10 84.60,47.21
+             83.94,48.74 84.01,51.32 84.00,53.00
+             83.97,57.04 84.46,68.90 83.26,72.00
+             81.06,77.70 72.54,81.42 67.00,83.00
+             67.00,83.00 67.00,43.00 67.00,43.00
+             67.00,43.00 67.99,35.63 67.99,35.63
+             67.99,35.63 80.00,28.26 80.00,28.26
+             80.00,28.26 107.00,14.00 107.00,14.00 Z
+           M 19.00,46.00
+           C 21.36,47.14 28.67,50.71 30.01,52.63
+             31.17,54.30 30.99,57.04 31.00,59.00
+             31.04,65.41 30.35,72.16 33.56,78.00
+             38.19,86.45 46.10,89.04 54.00,93.31
+             56.55,94.69 60.10,97.20 63.00,97.22
+             65.50,97.24 68.77,95.36 71.00,94.25
+             76.42,91.55 84.51,87.78 88.82,83.68
+             94.56,78.20 95.96,70.59 96.00,63.00
+             96.01,60.24 95.59,54.63 97.02,52.39
+             98.80,49.60 103.95,47.87 107.00,47.00
+             107.00,47.00 107.00,67.00 107.00,67.00
+             106.90,87.69 96.10,93.85 80.00,103.00
+             76.51,104.98 66.66,110.67 63.00,110.52
+             60.33,110.41 55.55,107.53 53.00,106.25
+             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)
+    $svgPath.Fill = $logocolor  # Set fill color to white
+
+    # Add SVG path to Viewbox
+    $viewbox.Child = $svgPath
+
     # Add SVG path to the stack panel
-    $stackPanel.Children.Add((Invoke-WinUtilAssets -Type "logo" -Size 25))
+    $stackPanel.Children.Add($viewbox)
 
     # Add "Winutil" text
     $winutilTextBlock = New-Object Windows.Controls.TextBlock
     $winutilTextBlock.Text = "Winutil"
     $winutilTextBlock.FontSize = $HeaderFontSize
     $winutilTextBlock.Foreground = $logocolor
-    $winutilTextBlock.Margin = New-Object Windows.Thickness(10, 10, 10, 5)  # Add margins around the text block
+    $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

functions/private/Update-WinUtilProgramWinget.ps1

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

functions/public/Invoke-WPFButton.ps1

@@ -21,13 +21,13 @@ function Invoke-WPFButton {
     Switch -Wildcard ($Button) {
 
         "WPFTab?BT" {Invoke-WPFTab $Button}
-        "WPFInstall" {Invoke-WPFInstall}
-        "WPFUninstall" {Invoke-WPFUnInstall}
+        "WPFinstall" {Invoke-WPFInstall}
+        "WPFuninstall" {Invoke-WPFUnInstall}
         "WPFInstallUpgrade" {Invoke-WPFInstallUpgrade}
-        "WPFStandard" {Invoke-WPFPresets "Standard" -checkboxfilterpattern "WPFTweak*"}
-        "WPFMinimal" {Invoke-WPFPresets "Minimal" -checkboxfilterpattern "WPFTweak*"}
-        "WPFClearTweaksSelection" {Invoke-WPFPresets -imported $true -checkboxfilterpattern "WPFTweak*"}
-        "WPFClearInstallSelection" {Invoke-WPFPresets -imported $true -checkboxfilterpattern "WPFInstall*"}
+        "WPFstandard" {Invoke-WPFPresets "Standard"}
+        "WPFminimal" {Invoke-WPFPresets "Minimal"}
+        "WPFclear" {Invoke-WPFPresets -preset $null -imported $true}
+        "WPFclearWinget" {Invoke-WPFPresets -preset $null -imported $true -CheckBox "WPFInstall"}
         "WPFtweaksbutton" {Invoke-WPFtweaksbutton}
         "WPFOOSUbutton" {Invoke-WPFOOSU}
         "WPFAddUltPerf" {Invoke-WPFUltimatePerformance -State "Enable"}
@@ -41,7 +41,6 @@ function Invoke-WPFButton {
         "WPFPanelpower" {Invoke-WPFControlPanel -Panel $button}
         "WPFPanelregion" {Invoke-WPFControlPanel -Panel $button}
         "WPFPanelsound" {Invoke-WPFControlPanel -Panel $button}
-        "WPFPanelprinter" {Invoke-WPFControlPanel -Panel $button}
         "WPFPanelsystem" {Invoke-WPFControlPanel -Panel $button}
         "WPFPaneluser" {Invoke-WPFControlPanel -Panel $button}
         "WPFUpdatesdefault" {Invoke-WPFUpdatesdefault}
@@ -58,6 +57,5 @@ function Invoke-WPFButton {
         "WPFMicrowin" {Invoke-WPFMicrowin}
         "WPFCloseButton" {Invoke-WPFCloseButton}
         "MicrowinScratchDirBT" {Invoke-ScratchDialog}
-        "WPFWinUtilPSProfile" {Invoke-WinUtilpsProfile}
     }
 }

functions/public/Invoke-WPFControlPanel.ps1

@@ -16,7 +16,6 @@ function Invoke-WPFControlPanel {
         "WPFPanelpower"   {cmd /c powercfg.cpl}
         "WPFPanelregion"  {cmd /c intl.cpl}
         "WPFPanelsound"   {cmd /c mmsys.cpl}
-        "WPFPanelprinter" {Start-Process "shell:::{A8A91A66-3A7D-4424-8D24-04E180695C7A}"}
         "WPFPanelsystem"  {cmd /c sysdm.cpl}
         "WPFPaneluser"    {cmd /c "control userpasswords2"}
     }

functions/public/Invoke-WPFGetInstalled.ps1

@@ -1,6 +1,6 @@
 function Invoke-WPFGetInstalled {
     <#
-    TODO: Add the Option to use Chocolatey as Engine
+
     .SYNOPSIS
         Invokes the function that gets the checkboxes to check in a new runspace
 
@@ -16,12 +16,12 @@ function Invoke-WPFGetInstalled {
         return
     }
 
-    if(($sync.WPFpreferChocolatey.IsChecked -eq $false) -and ((Test-WinUtilPackageManager -winget) -eq "not-installed") -and $checkbox -eq "winget") {
+    if(((Test-WinUtilPackageManager -winget) -eq "not-installed") -and $checkbox -eq "winget") {
         return
     }
-    $preferChoco = $sync.WPFpreferChocolatey.IsChecked
-    Invoke-WPFRunspace -ArgumentList $checkbox, $preferChoco -DebugPreference $DebugPreference -ScriptBlock {
-        param($checkbox, $preferChoco, $DebugPreference)
+
+    Invoke-WPFRunspace -ArgumentList $checkbox -DebugPreference $DebugPreference -ScriptBlock {
+        param($checkbox, $DebugPreference)
 
         $sync.ProcessRunning = $true
         $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" })
@@ -32,12 +32,8 @@ function Invoke-WPFGetInstalled {
         if($checkbox -eq "tweaks") {
             Write-Host "Getting Installed Tweaks..."
         }
-        if ($preferChoco -and $checkbox -eq "winget") {
-            $Checkboxes = Invoke-WinUtilCurrentSystem -CheckBox "choco"
-        }
-        else{
+
         $Checkboxes = Invoke-WinUtilCurrentSystem -CheckBox $checkbox
-        }
 
         $sync.form.Dispatcher.invoke({
             foreach($checkbox in $Checkboxes) {

functions/public/Invoke-WPFGetIso.ps1

@@ -114,7 +114,7 @@ function Invoke-WPFGetIso {
         # @ChrisTitusTech  please copy this wiki and change the link below to your copy of the wiki
         Write-Error "Failed to mount the image. Error: $($_.Exception.Message)"
         Write-Error "This is NOT winutil's problem, your ISO might be corrupt, or there is a problem on the system"
-        Write-Host "Please refer to this wiki for more details: https://christitustech.github.io/winutil/KnownIssues/#troubleshoot-errors-during-microwin-usage" -ForegroundColor Red
+        Write-Error "Please refer to this wiki for more details https://github.com/ChrisTitusTech/winutil/blob/main/wiki/Error-in-Winutil-MicroWin-during-ISO-mounting%2Cmd"
         Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
         return
     }

functions/public/Invoke-WPFImpex.ps1

@@ -41,8 +41,6 @@ function Invoke-WPFImpex {
     if ($type -eq "export") {
         $jsonFile = Get-WinUtilCheckBoxes -unCheck $false
         $jsonFile | ConvertTo-Json | Out-File $FileBrowser.FileName -Force
-        $runscript = "iex ""& { `$(irm christitus.com/win) } -Config '$($FileBrowser.FileName)'"""
-        $runscript | Set-Clipboard
     }
     if ($type -eq "import") {
         $jsonFile = Get-Content $Config | ConvertFrom-Json
@@ -57,7 +55,6 @@ function Invoke-WPFImpex {
             }
         }
 
-        $flattenedJson = [string]$flattenedJson
         Invoke-WPFPresets -preset $flattenedJson -imported $true
     }
 }

functions/public/Invoke-WPFInstall.ps1

@@ -19,9 +19,10 @@ function Invoke-WPFInstall {
         [System.Windows.MessageBox]::Show($WarningMsg, $AppTitle, [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
         return
     }
-    $ChocoPreference = $($sync.WPFpreferChocolatey.IsChecked)
-    Invoke-WPFRunspace -ArgumentList $PackagesToInstall,$ChocoPreference -DebugPreference $DebugPreference -ScriptBlock {
-        param($PackagesToInstall, $ChocoPreference, $DebugPreference)
+
+
+    Invoke-WPFRunspace -ArgumentList $PackagesToInstall -DebugPreference $DebugPreference -ScriptBlock {
+        param($PackagesToInstall, $DebugPreference)
         if ($PackagesToInstall.count -eq 1) {
             $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })
         } else {
@@ -29,28 +30,16 @@ function Invoke-WPFInstall {
         }
         $packagesWinget, $packagesChoco = {
             $packagesWinget = [System.Collections.ArrayList]::new()
-            $packagesChoco = [System.Collections.ArrayList]::new()
-
+            $packagesChoco = [System.Collections.Generic.List`1[System.Object]]::new()
             foreach ($package in $PackagesToInstall) {
-            if ($ChocoPreference) {
-                if ($package.choco -eq "na") {
-                    $packagesWinget.add($package.winget)
-                    Write-Host "Queueing $($package.winget) for Winget install"
-                } else {
-                    $null = $packagesChoco.add($package.choco)
-                    Write-Host "Queueing $($package.choco) for Chocolatey install"
-                }
-            }
-            else {
                 if ($package.winget -eq "na") {
-                    $packagesChoco.add($package.choco)
+                    $packagesChoco.add($package)
                     Write-Host "Queueing $($package.choco) for Chocolatey install"
                 } else {
                     $null = $packagesWinget.add($($package.winget))
                     Write-Host "Queueing $($package.winget) for Winget install"
                 }
             }
-        }
             return $packagesWinget, $packagesChoco
         }.Invoke($PackagesToInstall)
 
@@ -59,12 +48,12 @@ function Invoke-WPFInstall {
             $errorPackages = @()
             if($packagesWinget.Count -gt 0) {
                 Install-WinUtilWinget
-                Install-WinUtilProgramWinget -Action Install -Programs $packagesWinget
-
+                $errorPackages += Invoke-WinUtilWingetProgram -Action Install -Programs $packagesWinget
+                $errorPackages| ForEach-Object {if($_.choco -ne "na") {$packagesChoco += $_}}
             }
             if($packagesChoco.Count -gt 0) {
                 Install-WinUtilChoco
-                Install-WinUtilProgramChoco -Action Install -Programs $packagesChoco
+                Install-WinUtilProgramChoco -ProgramsToInstall $packagesChoco
             }
             Write-Host "==========================================="
             Write-Host "--      Installs have finished          ---"

functions/public/Invoke-WPFInstallUpgrade.ps1

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

functions/public/Invoke-WPFMicrowin.ps1

@@ -263,8 +263,11 @@ public class PowerManagement {
             # reg delete "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Orchestrator\UScheduler\$_" /f | Out-Null
 
             # When in Offline Image
+            if (Test-Path "HKLM:\zSOFTWARE\Microsoft\WindowsUpdate\Orchestrator\UScheduler_Oobe\$_")
+            {
                 reg delete "HKLM\zSOFTWARE\Microsoft\WindowsUpdate\Orchestrator\UScheduler_Oobe\$_" /f | Out-Null
             }
+        }
 
         reg add "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "SearchboxTaskbarMode" /t REG_DWORD /d 0 /f
         Write-Host "Setting all services to start manually"

functions/public/Invoke-WPFPresets.ps1

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

functions/public/Invoke-WPFRunspace.ps1

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

functions/public/Invoke-WPFShortcut.ps1

@@ -51,9 +51,6 @@ function Invoke-WPFShortcut {
     $Shortcut = $WshShell.CreateShortcut($FileBrowser.FileName)
     $Shortcut.TargetPath = $shell
     $Shortcut.Arguments = $shellArgs
-    if (-NOT (Test-Path -Path $winutildir["logo.ico"])) {
-        Invoke-WebRequest -Uri "https://christitus.com/images/logo-full.ico" -OutFile $winutildir["logo.ico"]
-    }
     if (Test-Path -Path $winutildir["logo.ico"]) {
         $shortcut.IconLocation = $winutildir["logo.ico"]
     }

functions/public/Invoke-WPFToggle.ps1

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

functions/public/Invoke-WPFTweakPS7.ps1

@@ -17,7 +17,7 @@ function Invoke-WPFTweakPS7{
                 Write-Host "Powershell 7 is already installed."
             } else {
                 Write-Host "Installing Powershell 7..."
-                Install-WinUtilProgramWinget -Action Install -Programs @("Microsoft.PowerShell")
+                Invoke-WinUtilWingetProgram -Action Install -Programs @("Microsoft.PowerShell")
             }
             $targetTerminalName = "PowerShell"
         }

functions/public/Invoke-WPFUIElements.ps1

@@ -15,43 +15,17 @@ function Invoke-WPFUIElements {
     #>
 
     param(
-        [Parameter(Mandatory, position=0)]
+        [Parameter(Mandatory)]
         [PSCustomObject]$configVariable,
 
-        [Parameter(Mandatory, position=1)]
+        [Parameter(Mandatory)]
         [string]$targetGridName,
 
-        [Parameter(Mandatory, position=2)]
+        [Parameter(Mandatory)]
         [int]$columncount
     )
 
-    $window = $sync["Form"]
-
     $theme = $sync.configs.themes.$ctttheme
-    $borderstyle = $window.FindResource("BorderStyle")
-    $HoverTextBlockStyle = $window.FindResource("HoverTextBlockStyle")
-    $ColorfulToggleSwitchStyle = $window.FindResource("ColorfulToggleSwitchStyle")
-
-    if (!$borderstyle -or !$HoverTextBlockStyle -or !$ColorfulToggleSwitchStyle) {
-        throw "Failed to retrieve Styles using 'FindResource' from main window element."
-    }
-
-    $targetGrid = $window.FindName($targetGridName)
-
-    if (!$targetGrid) {
-        throw "Failed to retrieve Target Grid by name, provided name: $targetGrid"
-    }
-
-    # Clear existing ColumnDefinitions and Children
-    $targetGrid.ColumnDefinitions.Clear() | Out-Null
-    $targetGrid.Children.Clear() | Out-Null
-
-    # Add ColumnDefinitions to the target Grid
-    for ($i = 0; $i -lt $columncount; $i++) {
-        $colDef = New-Object Windows.Controls.ColumnDefinition
-        $colDef.Width = New-Object Windows.GridLength(1, [Windows.GridUnitType]::Star)
-        $targetGrid.ColumnDefinitions.Add($colDef) | Out-Null
-    }
 
     # Convert PSCustomObject to Hashtable
     $configHashtable = @{}
@@ -91,6 +65,22 @@ function Invoke-WPFUIElements {
 
         # Store application data in an array under the category
         $organizedData[$entryObject.Panel][$entryObject.Category] += $entryObject
+    }
+
+    # Retrieve the main window and the target Grid by name
+    $window = $sync["Form"]
+    $targetGrid = $window.FindName($targetGridName)
+
+    # Clear existing ColumnDefinitions and Children
+    $targetGrid.ColumnDefinitions.Clear() | Out-Null
+    $targetGrid.Children.Clear() | Out-Null
+
+    # Add ColumnDefinitions to the target Grid
+    for ($i = 0; $i -lt $columncount; $i++) {
+        $colDef = New-Object Windows.Controls.ColumnDefinition
+        $colDef.Width = New-Object Windows.GridLength(1, [Windows.GridUnitType]::Star)
+        $targetGrid.ColumnDefinitions.Add($colDef) | Out-Null
+    }
 
     # Only apply the logic for distributing entries across columns if the targetGridName is "appspanel"
     if ($targetGridName -eq "appspanel") {
@@ -98,7 +88,6 @@ function Invoke-WPFUIElements {
         $entrycount = $configHashtable.Keys.Count + $organizedData["0"].Keys.Count
         $maxcount = [Math]::Round($entrycount / $columncount + 0.5)
     }
-    }
 
     # Iterate through 'organizedData' by panel, category, and application
     $count = 0
@@ -107,7 +96,7 @@ function Invoke-WPFUIElements {
         $border = New-Object Windows.Controls.Border
         $border.VerticalAlignment = "Stretch" # Ensure the border stretches vertically
         [System.Windows.Controls.Grid]::SetColumn($border, $panelcount)
-        $border.style = $borderstyle
+        $border.style = $window.FindResource("BorderStyle")
         $targetGrid.Children.Add($border) | Out-Null
 
         # Create a StackPanel inside the Border
@@ -127,7 +116,7 @@ function Invoke-WPFUIElements {
                     $border = New-Object Windows.Controls.Border
                     $border.VerticalAlignment = "Stretch" # Ensure the border stretches vertically
                     [System.Windows.Controls.Grid]::SetColumn($border, $panelcount)
-                    $border.style = $borderstyle
+                    $border.style = $window.FindResource("BorderStyle")
                     $targetGrid.Children.Add($border) | Out-Null
 
                     # Create a new StackPanel inside the Border
@@ -159,7 +148,7 @@ function Invoke-WPFUIElements {
                         $border = New-Object Windows.Controls.Border
                         $border.VerticalAlignment = "Stretch" # Ensure the border stretches vertically
                         [System.Windows.Controls.Grid]::SetColumn($border, $panelcount)
-                        $border.style = $borderstyle
+                        $border.style = $window.FindResource("BorderStyle")
                         $targetGrid.Children.Add($border) | Out-Null
 
                         # Create a new StackPanel inside the Border
@@ -179,14 +168,13 @@ function Invoke-WPFUIElements {
                         $checkBox.Name = $entryInfo.Name
                         $checkBox.HorizontalAlignment = "Right"
                         $dockPanel.Children.Add($checkBox) | Out-Null
-                        $checkBox.Style = $ColorfulToggleSwitchStyle
+                        $checkBox.Style = $window.FindResource("ColorfulToggleSwitchStyle")
 
                         $label = New-Object Windows.Controls.Label
                         $label.Content = $entryInfo.Content
                         $label.ToolTip = $entryInfo.Description
                         $label.HorizontalAlignment = "Left"
                         $label.FontSize = $theme.FontSize
-                        $label.Foreground = $theme.MainForegroundColor
                         $dockPanel.Children.Add($label) | Out-Null
                         $stackPanel.Children.Add($dockPanel) | Out-Null
 
@@ -250,7 +238,7 @@ function Invoke-WPFUIElements {
                         $comboBox.Width = $theme.ButtonWidth
                         $comboBox.HorizontalAlignment = "Left"
                         $comboBox.VerticalAlignment = "Center"
-                        $comboBox.Margin = $theme.ButtonMargin
+                        $comboBox.Margin = "5,5"
 
                         foreach ($comboitem in ($entryInfo.ComboItems -split " ")) {
                             $comboBoxItem = New-Object Windows.Controls.ComboBoxItem
@@ -272,7 +260,8 @@ function Invoke-WPFUIElements {
                         $button.Name = $entryInfo.Name
                         $button.Content = $entryInfo.Content
                         $button.HorizontalAlignment = "Left"
-                        $button.Margin = $theme.ButtonMargin
+                        $button.Margin = "5"
+                        $button.Padding = "20,5"
                         $button.FontSize = $theme.ButtonFontSize
                         if ($entryInfo.ButtonWidth) {
                             $button.Width = $entryInfo.ButtonWidth
@@ -302,7 +291,14 @@ function Invoke-WPFUIElements {
                             $textBlock.Name = $checkBox.Name + "Link"
                             $textBlock.Text = "(?)"
                             $textBlock.ToolTip = $entryInfo.Link
-                            $textBlock.Style = $HoverTextBlockStyle
+                            $textBlock.Style = $window.FindResource("HoverTextBlockStyle")
+
+                            # Add event handler for click to open link
+                            $handler = [System.Windows.Input.MouseButtonEventHandler]{
+                                param($sender, $e)
+                                Start-Process $sender.ToolTip.ToString()
+                            }
+                            $textBlock.AddHandler([Windows.Controls.TextBlock]::MouseLeftButtonUpEvent, $handler)
 
                             $horizontalStackPanel.Children.Add($textBlock) | Out-Null
 

functions/public/Invoke-WPFUltimatePerformance.ps1

@@ -2,65 +2,43 @@ Function Invoke-WPFUltimatePerformance {
     <#
 
     .SYNOPSIS
-        Enables or disables the Ultimate Performance power scheme based on its GUID.
+        Creates or removes the Ultimate Performance power scheme
 
     .PARAMETER State
-        Specifies whether to "Enable" or "Disable" the Ultimate Performance power scheme.
+        Indicates whether to enable or disable the Ultimate Performance power scheme
 
     #>
     param($State)
-
     try {
-        # GUID of the Ultimate Performance power plan
-        $ultimateGUID = "e9a42b02-d5df-448d-aa00-03f14749eb61"
-
-        if ($State -eq "Enable") {
-            # Duplicate the Ultimate Performance power plan using its GUID
-            $duplicateOutput = powercfg /duplicatescheme $ultimateGUID
-
-            $guid = $null
-            $nameFromFile = "ChrisTitus - Ultimate Power Plan"
-            $description = "Ultimate Power Plan, added via WinUtils"
-
-            # Extract the new GUID from the duplicateOutput
-            foreach ($line in $duplicateOutput) {
-                if ($line -match "\b[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}\b") {
-                    $guid = $matches[0]  # $matches[0] will contain the first match, which is the GUID
-                    Write-Output "GUID: $guid has been extracted and stored in the variable."
-                    break
-                }
+        # Check if Ultimate Performance plan is installed
+        $ultimatePlan = powercfg -list | Select-String -Pattern "Ultimate Performance"
+        if($state -eq "Enable") {
+            if ($ultimatePlan) {
+                Write-Host "Ultimate Performance plan is already installed."
+            } else {
+                Write-Host "Installing Ultimate Performance plan..."
+                powercfg -duplicatescheme e9a42b02-d5df-448d-aa00-03f14749eb61
+                Write-Host "> Ultimate Performance plan installed."
             }
 
-            if (-not $guid) {
-                Write-Output "No GUID found in the duplicateOutput. Check the output format."
-                exit 1
+            # 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."
+
+
         }
-
-            # Change the name of the power plan and set its description
-            $changeNameOutput = powercfg /changename $guid "$nameFromFile" "$description"
-            Write-Output "The power plan name and description have been changed. Output:"
-            Write-Output $changeNameOutput
-
-            # Set the duplicated Ultimate Performance plan as active
-            $setActiveOutput = powercfg /setactive $guid
-            Write-Output "The power plan has been set as active. Output:"
-            Write-Output $setActiveOutput
-
-            Write-Host "> Ultimate Performance plan installed and set as active."
-
-        } elseif ($State -eq "Disable") {
-            # Check if the Ultimate Performance plan is installed by GUID
-            $installedPlan = powercfg -list | Select-String -Pattern $ultimateGUID
-
-            if ($installedPlan) {
-                # Extract the GUID of the installed Ultimate Performance plan
-                $ultimatePlanGUID = $installedPlan.Line.Split()[3]
+        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 by GUID
+                # Delete the Ultimate Performance plan
                 powercfg -delete $ultimatePlanGUID
 
                 Write-Host "Ultimate Performance plan has been uninstalled."
@@ -70,6 +48,6 @@ Function Invoke-WPFUltimatePerformance {
             }
         }
     } catch {
-        Write-Error "Error occurred: $_"
+        Write-Warning $psitem.Exception.Message
     }
 }

functions/public/Invoke-WPFUnInstall.ps1

@@ -28,51 +28,38 @@ function Invoke-WPFUnInstall {
     $confirm = [System.Windows.MessageBox]::Show($Messageboxbody, $MessageboxTitle, $ButtonType, $MessageIcon)
 
     if($confirm -eq "No") {return}
-    $ChocoPreference = $($sync.WPFpreferChocolatey.IsChecked)
 
-    Invoke-WPFRunspace -ArgumentList $PackagesToInstall, $ChocoPreference -DebugPreference $DebugPreference -ScriptBlock {
-        param($PackagesToInstall, $ChocoPreference, $DebugPreference)
+
+    Invoke-WPFRunspace -ArgumentList $PackagesToInstall -DebugPreference $DebugPreference -ScriptBlock {
+        param($PackagesToInstall, $DebugPreference)
         if ($PackagesToInstall.count -eq 1) {
             $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })
         } else {
             $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Normal" -value 0.01 -overlay "logo" })
         }
         $packagesWinget, $packagesChoco = {
-            $packagesWinget = [System.Collections.ArrayList]::new()
-            $packagesChoco = [System.Collections.ArrayList]::new()
-
+            $packagesWinget = [System.Collections.Generic.List`1[System.Object]]::new()
+            $packagesChoco = [System.Collections.Generic.List`1[System.Object]]::new()
             foreach ($package in $PackagesToInstall) {
-            if ($ChocoPreference) {
-                if ($package.choco -eq "na") {
-                    $packagesWinget.add($package.winget)
-                    Write-Host "Queueing $($package.winget) for Winget uninstall"
-                } else {
-                    $null = $packagesChoco.add($package.choco)
-                    Write-Host "Queueing $($package.choco) for Chocolatey uninstall"
-                }
-            }
-            else {
                 if ($package.winget -eq "na") {
-                    $packagesChoco.add($package.choco)
-                    Write-Host "Queueing $($package.choco) for Chocolatey uninstall"
+                    $packagesChoco.add($package)
+                    Write-Host "Queueing $($package.choco) for Chocolatey Uninstall"
                 } else {
-                    $null = $packagesWinget.add($($package.winget))
-                    Write-Host "Queueing $($package.winget) for Winget uninstall"
-                }
+                    $packagesWinget.add($($package.winget))
+                    Write-Host "Queueing $($package.winget) for Winget Uninstall"
                 }
             }
             return $packagesWinget, $packagesChoco
         }.Invoke($PackagesToInstall)
-
         try {
             $sync.ProcessRunning = $true
 
             # Install all selected programs in new window
             if($packagesWinget.Count -gt 0) {
-                Install-WinUtilProgramWinget -Action Uninstall -Programs $packagesWinget
+                Invoke-WinUtilWingetProgram -Action Uninstall -Programs $packagesWinget
             }
             if($packagesChoco.Count -gt 0) {
-                Install-WinUtilProgramChoco -Action Uninstall -Programs $packagesChoco
+                Install-WinUtilProgramChoco -ProgramsToInstall $packagesChoco -Manage "Uninstalling"
             }
 
             Write-Host "==========================================="

overrides/main.html

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

pester/configs.Tests.ps1

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

scripts/main.ps1

@@ -32,19 +32,19 @@ $sync.runspace.Open()
 # Create classes for different exceptions
 
     class WingetFailedInstall : Exception {
-        [string]$additionalData
+        [string] $additionalData
 
         WingetFailedInstall($Message) : base($Message) {}
     }
 
     class ChocoFailedInstall : Exception {
-        [string]$additionalData
+        [string] $additionalData
 
         ChocoFailedInstall($Message) : base($Message) {}
     }
 
     class GenericException : Exception {
-        [string]$additionalData
+        [string] $additionalData
 
         GenericException($Message) : base($Message) {}
     }
@@ -52,7 +52,6 @@ $sync.runspace.Open()
 
 $inputXML = $inputXML -replace 'mc:Ignorable="d"', '' -replace "x:N", 'N' -replace '^<Win.*', '<Window'
 
-$defaulttheme = '_default'
 if ((Get-WinUtilToggleStatus WPFToggleDarkMode) -eq $True) {
     if (Invoke-WinUtilGPU -eq $True) {
         $ctttheme = 'Matrix'
@@ -62,47 +61,26 @@ if ((Get-WinUtilToggleStatus WPFToggleDarkMode) -eq $True) {
 } else {
     $ctttheme = 'Classic'
 }
-
-$returnVal = Set-WinUtilUITheme -inputXML $inputXML -customThemeName $ctttheme -defaultThemeName $defaulttheme
-if ($returnVal[0] -eq "") {
-    Write-Host "Failed to statically apply theming to xaml content using Set-WinUtilTheme, please check previous Error/Warning messages." -ForegroundColor Red
-    Write-Host "Quitting winutil..." -ForegroundColor Red
-    $sync.runspace.Dispose()
-    $sync.runspace.Close()
-    [System.GC]::Collect()
-    exit 1
-}
-$inputXML = $returnVal[0]
-$ctttheme = $returnVal[1]
+$inputXML = Set-WinUtilUITheme -inputXML $inputXML -themeName $ctttheme
 
 [void][System.Reflection.Assembly]::LoadWithPartialName('presentationframework')
 [xml]$XAML = $inputXML
 
 # Read the XAML file
-$readerOperationSuccessful = $false # There's more cases of failure then success.
 $reader = (New-Object System.Xml.XmlNodeReader $xaml)
 try {
     $sync["Form"] = [Windows.Markup.XamlReader]::Load( $reader )
-    $readerOperationSuccessful = $true
 } catch [System.Management.Automation.MethodInvocationException] {
-    Write-Host "We ran into a problem with the XAML code.  Check the syntax for this control..." -ForegroundColor Red
+    Write-Warning "We ran into a problem with the XAML code.  Check the syntax for this control..."
     Write-Host $error[0].Exception.Message -ForegroundColor Red
 
     If ($error[0].Exception.Message -like "*button*") {
-        write-Host "Ensure your &lt;button in the `$inputXML does NOT have a Click=ButtonClick property.  PS can't handle this`n`n`n`n" -ForegroundColor Red
+        write-warning "Ensure your &lt;button in the `$inputXML does NOT have a Click=ButtonClick property.  PS can't handle this`n`n`n`n"
     }
 } catch {
-    Write-Host "Unable to load Windows.Markup.XamlReader. Double-check syntax and ensure .net is installed." -ForegroundColor Red
+    Write-Host "Unable to load Windows.Markup.XamlReader. Double-check syntax and ensure .net is installed."
 }
 
-if (-NOT ($readerOperationSuccessful)) {
-    Write-Host "Failed to parse xaml content using Windows.Markup.XamlReader's Load Method." -ForegroundColor Red
-    Write-Host "Quitting winutil..." -ForegroundColor Red
-    $sync.runspace.Dispose()
-    $sync.runspace.Close()
-    [System.GC]::Collect()
-    exit 1
-}
 
 # Load the configuration files
 #Invoke-WPFUIElements -configVariable $sync.configs.nav -targetGridName "WPFMainGrid"
@@ -110,20 +88,13 @@ Invoke-WPFUIElements -configVariable $sync.configs.applications -targetGridName
 Invoke-WPFUIElements -configVariable $sync.configs.tweaks -targetGridName "tweakspanel" -columncount 2
 Invoke-WPFUIElements -configVariable $sync.configs.feature -targetGridName "featurespanel" -columncount 2
 
+
 #===========================================================================
 # Store Form Objects In PowerShell
 #===========================================================================
 
 $xaml.SelectNodes("//*[@Name]") | ForEach-Object {$sync["$("$($psitem.Name)")"] = $sync["Form"].FindName($psitem.Name)}
 
-#Persist the Chocolatey preference across winutil restarts
-$ChocoPreferencePath = "$env:LOCALAPPDATA\winutil\preferChocolatey.ini"
-$sync.WPFpreferChocolatey.Add_Checked({New-Item -Path $ChocoPreferencePath -Force })
-$sync.WPFpreferChocolatey.Add_Unchecked({Remove-Item $ChocoPreferencePath -Force})
-if (Test-Path $ChocoPreferencePath) {
-    $sync.WPFpreferChocolatey.IsChecked = $true
-}
-
 $sync.keys | ForEach-Object {
     if($sync.$psitem) {
         if($($sync["$psitem"].GetType() | Select-Object -ExpandProperty Name) -eq "ToggleButton") {
@@ -447,31 +418,35 @@ $sync["SearchBar"].Add_TextChanged({
     }
 })
 
-$sync["Form"].Add_Loaded({
-    param($e)
-    $sync["Form"].MaxWidth = [Double]::PositiveInfinity
-    $sync["Form"].MaxHeight = [Double]::PositiveInfinity
-})
-
-$NavLogoPanel = $sync["Form"].FindName("NavLogoPanel")
-$NavLogoPanel.Children.Add((Invoke-WinUtilAssets -Type "logo" -Size 25)) | Out-Null
-
 # Initialize the hashtable
 $winutildir = @{}
 
 # Set the path for the winutil directory
 $winutildir["path"] = "$env:LOCALAPPDATA\winutil\"
-[System.IO.Directory]::CreateDirectory($winutildir["path"]) | Out-Null
-
-$winutildir["logo.ico"] = $winutildir["path"] + "cttlogo.ico"
-
-if (Test-Path $winutildir["logo.ico"]) {
-    $sync["logorender"] = $winutildir["logo.ico"]
-} else {
-    $sync["logorender"] = (Invoke-WinUtilAssets -Type "Logo" -Size 90 -Render)
+if (-NOT (Test-Path -Path $winutildir["path"])) {
+    New-Item -Path $winutildir["path"] -ItemType Directory
 }
-$sync["checkmarkrender"] = (Invoke-WinUtilAssets -Type "checkmark" -Size 512 -Render)
-$sync["warningrender"] = (Invoke-WinUtilAssets -Type "warning" -Size 512 -Render)
+
+# Set the path for the logo and checkmark images
+$winutildir["logo.png"] = $winutildir["path"] + "cttlogo.png"
+$winutildir["logo.ico"] = $winutildir["path"] + "cttlogo.ico"
+if (-NOT (Test-Path -Path $winutildir["logo.png"])) {
+    Invoke-WebRequest -Uri "https://christitus.com/images/logo-full.png" -OutFile $winutildir["logo.png"]
+}
+
+if (-NOT (Test-Path -Path $winutildir["logo.ico"])) {
+    ConvertTo-Icon -bitmapPath $winutildir["logo.png"] -iconPath $winutildir["logo.ico"]
+}
+
+$winutildir["checkmark.png"] = $winutildir["path"] + "checkmark.png"
+$winutildir["warning.png"] = $winutildir["path"] + "warning.png"
+if (-NOT (Test-Path -Path $winutildir["checkmark.png"])) {
+    Invoke-WebRequest -Uri "https://christitus.com/images/checkmark.png" -OutFile $winutildir["checkmark.png"]
+}
+if (-NOT (Test-Path -Path $winutildir["warning.png"])) {
+    Invoke-WebRequest -Uri "https://christitus.com/images/warning.png" -OutFile $winutildir["warning.png"]
+}
+
 
 Set-WinUtilTaskbaritem -overlay "logo"
 
@@ -520,10 +495,10 @@ Version  : <a href="https://github.com/ChrisTitusTech/winutil/releases/tag/$($sy
 "@
     $FontSize = $sync.configs.themes.$ctttheme.CustomDialogFontSize
     $HeaderFontSize = $sync.configs.themes.$ctttheme.CustomDialogFontSizeHeader
-    $LogoSize = $sync.configs.themes.$ctttheme.CustomDialogLogoSize
+    $IconSize = $sync.configs.themes.$ctttheme.CustomDialogIconSize
     $Width = $sync.configs.themes.$ctttheme.CustomDialogWidth
     $Height = $sync.configs.themes.$ctttheme.CustomDialogHeight
-    Show-CustomDialog -Message $authorInfo -Width $Width -Height $Height -FontSize $FontSize -HeaderFontSize $HeaderFontSize -LogoSize $LogoSize
+    Show-CustomDialog -Message $authorInfo -Width $Width -Height $Height -FontSize $FontSize -HeaderFontSize $HeaderFontSize -IconSize $IconSize
 })
 
 $sync["SponsorMenuItem"].Add_Click({
@@ -546,10 +521,10 @@ $sync["SponsorMenuItem"].Add_Click({
 
     $FontSize = $sync.configs.themes.$ctttheme.CustomDialogFontSize
     $HeaderFontSize = $sync.configs.themes.$ctttheme.CustomDialogFontSizeHeader
-    $LogoSize = $sync.configs.themes.$ctttheme.CustomDialogLogoSize
+    $IconSize = $sync.configs.themes.$ctttheme.CustomDialogIconSize
     $Width = $sync.configs.themes.$ctttheme.CustomDialogWidth
     $Height = $sync.configs.themes.$ctttheme.CustomDialogHeight
-    Show-CustomDialog -Message $authorInfo -Width $Width -Height $Height -FontSize $FontSize -HeaderFontSize $HeaderFontSize -LogoSize $LogoSize -EnableScroll $true
+    Show-CustomDialog -Message $authorInfo -Width $Width -Height $Height -FontSize $FontSize -HeaderFontSize $HeaderFontSize -IconSize $IconSize -EnableScroll $true
 })
 $sync["Form"].ShowDialog() | out-null
 Stop-Transcript

scripts/start.ps1

@@ -5,7 +5,6 @@
     GitHub         : https://github.com/ChrisTitusTech
     Version        : #{replaceme}
 #>
-
 param (
     [switch]$Debug,
     [string]$Config,
@@ -28,6 +27,12 @@ if ($Run) {
     $PARAM_RUN = $true
 }
 
+if (!(Test-Path -Path $ENV:TEMP)) {
+    New-Item -ItemType Directory -Force -Path $ENV:TEMP
+}
+
+Start-Transcript $ENV:TEMP\Winutil.log -Append
+
 # Load DLLs
 Add-Type -AssemblyName PresentationFramework
 Add-Type -AssemblyName System.Windows.Forms
@@ -39,38 +44,15 @@ $sync.version = "#{replaceme}"
 $sync.configs = @{}
 $sync.ProcessRunning = $false
 
-if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)) {
-    Write-Output "Winutil needs to be run as Administrator. Attempting to relaunch."
-    $argList = @()
-
-    $PSBoundParameters.GetEnumerator() | ForEach-Object {
-        $argList += if ($_.Value -is [switch] -and $_.Value) {
-            "-$($_.Key)"
-        } elseif ($_.Value) {
-            "-$($_.Key) `"$($_.Value)`""
-        }
-    }
-
-    $script = if ($MyInvocation.MyCommand.Path) {
-        "& { & '$($MyInvocation.MyCommand.Path)' $argList }"
-    } else {
-        "iex '& { $(irm https://github.com/ChrisTitusTech/winutil/releases/latest/download/winutil.ps1) } $argList'"
-    }
-
-    $powershellcmd = if (Get-Command pwsh -ErrorAction SilentlyContinue) { "pwsh" } else { "powershell" }
-    $processCmd = if (Get-Command wt.exe -ErrorAction SilentlyContinue) { "wt.exe" } else { $powershellcmd }
-
-    Start-Process $processCmd -ArgumentList "$powershellcmd -ExecutionPolicy Bypass -NoProfile -Command $script" -Verb RunAs
-
+# If script isn't running as admin, show error message and quit
+If (([Security.Principal.WindowsIdentity]::GetCurrent()).Owner.Value -ne "S-1-5-32-544") {
+    Write-Host "===========================================" -Foregroundcolor Red
+    Write-Host "-- Scripts must be run as Administrator ---" -Foregroundcolor Red
+    Write-Host "-- Right-Click Start -> Terminal(Admin) ---" -Foregroundcolor Red
+    Write-Host "===========================================" -Foregroundcolor Red
     break
 }
 
-$dateTime = Get-Date -Format "yyyy-MM-dd_HH-mm-ss"
-
-$logdir = "$env:localappdata\winutil\logs"
-[System.IO.Directory]::CreateDirectory("$logdir") | Out-Null
-Start-Transcript -Path "$logdir\winutil_$dateTime.log" -Append -NoClobber | Out-Null
-
 # Set PowerShell window title
 $Host.UI.RawUI.WindowTitle = $myInvocation.MyCommand.Definition + "(Admin)"
 clear-host

tools/Invoke-Preprocessing.ps1

@@ -1,4 +1,4 @@
-function Invoke-Preprocessing {
+ function Invoke-Preprocessing {
     <#
         .SYNOPSIS
         A function that does Code Formatting using RegEx, useful when trying to force specific coding standard(s) to a project.
@@ -39,7 +39,7 @@ function Invoke-Preprocessing {
         .EXAMPLE
         Invoke-Preprocessing -ThrowExceptionOnEmptyFilesList -WorkingDir "DRIVE:\Path\To\Folder\" -ExcludedFiles @('file.txt', '.\.git\', '*.png') -ProgressStatusMessage "Doing Preprocessing"
 
-        Same as Example No. 1, but uses '-ThrowExceptionOnEmptyFilesList', which's an optional parameter that'll make 'Invoke-Preprocessing' throw an exception when no files are found in 'WorkingDir' (not including the ExcludedFiles, of course), useful when you want to double check your parameters & you're sure there's files to process in the 'WorkingDir'.
+        Same as Example No. 1, but will throw an exception when 'Invoke-Preprocessing' function doesn't find any files in 'WorkingDir' (not including 'ExcludedFiles' list).
 
         .EXAMPLE
         Invoke-Preprocessing -Skip -WorkingDir "DRIVE:\Path\To\Folder\" -ExcludedFiles @('file.txt', '.\.git\', '*.png') -ProgressStatusMessage "Doing Preprocessing"
@@ -73,79 +73,21 @@ function Invoke-Preprocessing {
     }
 
     $count = $ExcludedFiles.Count
-
-    # Make sure there's a * at the end of folders in ExcludedFiles list
-    for ($i = 0; $i -lt $count; $i++) {
-        $excludedFile = $ExcludedFiles[$i]
-        $isFolder = ($excludedFile) -match '\\$'
-        if ($isFolder) { $ExcludedFiles[$i] = $excludedFile + '*' }
-    }
-
-    # Validate the ExcludedFiles List before continuing on,
-    # that's if there's a list in the first place, and '-SkipExcludedFilesValidation' was not provided.
-    if (-not $SkipExcludedFilesValidation) {
+    if ((-NOT ($count -eq 0)) -AND (-NOT $SkipExcludedFilesValidation)) {
         for ($i = 0; $i -lt $count; $i++) {
             $excludedFile = $ExcludedFiles[$i]
             $filePath = "$(($WorkingDir -replace ('\\$', '')) + '\' + ($excludedFile -replace ('\.\\', '')))"
-
-            # Handle paths with wildcards in a different implementation
-            $matches = ($filePath) -match '^.*?\*'
-
-            if ($matches) {
-                if (-NOT (Get-ChildItem -Recurse -Path "$filePath" -File -Force)) {
+            if (-NOT (Get-ChildItem -Recurse -Path "$filePath" -File)) {
                 $failedFilesList += "'$filePath', "
             }
-            } else {
-                if (-NOT (Test-Path -Path "$filePath")) {
-                    $failedFilesList += "'$filePath', "
-                }
-            }
         }
         $failedFilesList = $failedFilesList -replace (',\s*$', '')
         if (-NOT $failedFilesList -eq "") {
-            throw "[Invoke-Preprocessing] One or more File Paths and/or File Patterns were not found, you can use '-SkipExcludedFilesValidation' switch to skip this check, the failed to validate are: $failedFilesList"
+            throw "[Invoke-Preprocessing] One or more File Paths & File Patterns were not found, you can use '-SkipExcludedFilesValidation' switch to skip this check, and the failed files are: $failedFilesList"
         }
     }
 
-    # Get Files List
-    [System.Collections.ArrayList]$files = Get-ChildItem $WorkingDir -Recurse -Exclude $ExcludedFiles -File -Force
-    $numOfFiles = $files.Count
-
-    # Only keep the 'FullName' Property for every entry in the list
-    for ($i = 0; $i -lt $numOfFiles; $i++) {
-        $file = $files[$i]
-        $files[$i] = $file.FullName
-    }
-
-    # If a file(s) are found in Exclude List,
-    # Remove the file from files list.
-    for ($j = 0; $j -lt $excludedFiles.Count; $j++) {
-        # Prepare some variables
-        $excluded = $excludedFiles[$j]
-        $pathToFind = ($excluded) -replace ('^\.\\', '')
-        $pathToFind = $WorkingDir + '\' + $pathToFind
-        $index = -1 # reset index on every iteration
-
-        # Handle paths with wildcards in a different implementation
-        $matches = ($pathToFind) -match '^.*?\*'
-
-        if ($matches) {
-             $filesToCheck = Get-ChildItem -Recurse -Path "$pathToFind" -File -Force
-             if ($filesToCheck) {
-                for ($k = 0; $k -lt $filesToCheck.Count; $k++) {
-                    $fileToCheck = $filesToCheck[$k]
-                    $index = $files.IndexOf("$fileToCheck")
-                    if ($index -ge 0) { $files.RemoveAt($index) }
-                }
-             }
-        } else {
-            $index = $files.IndexOf("$pathToFind")
-            if ($index -ge 0) { $files.RemoveAt($index) }
-        }
-    }
-
-    # Make sure 'numOfFiles' is synced with the actual Number of Files found in '$files'
-    # This's done because previous may or may not edit the files list, so we should update it
+    $files = Get-ChildItem $WorkingDir -Recurse -Exclude $ExcludedFiles -File
     $numOfFiles = $files.Count
 
     if ($numOfFiles -eq 0) {
@@ -157,11 +99,26 @@ function Invoke-Preprocessing {
     }
 
     for ($i = 0; $i -lt $numOfFiles; $i++) {
-        $fullFileName = $files[$i]
+        $file = $files[$i]
+
+        # If the file is in Exclude List, don't proceed to check/modify said file.
+        $fileIsExcluded = $False
+        for ($j = 0; $j -lt $excludedFiles.Count; $j++) {
+            $excluded = $excludedFiles[$j]
+            $strToCompare = ($excluded) -replace ('^\.\\', '')
+            if ($file.FullName.Contains("$strToCompare")) {
+                $fileIsExcluded = $True
+                break
+            }
+        }
+
+        if ($fileIsExcluded) {
+            continue
+        }
 
         # TODO:
         #   make more formatting rules, and document them in WinUtil Official Documentation
-        (Get-Content "$fullFileName").TrimEnd() `
+        (Get-Content "$file").TrimEnd() `
             -replace ('\t', '    ') `
             -replace ('\)\s*\{', ') {') `
             -replace ('(?<keyword>if|for|foreach)\s*(?<condition>\([.*?]\))\s*\{', '${keyword} ${condition} {') `
@@ -172,8 +129,8 @@ function Invoke-Preprocessing {
             -replace ('\}\s*Catch', '} catch') `
             -replace ('\}\s*Catch\s*(?<exceptions>(\[.*?\]\s*(\,)?\s*)+)\s*\{', '} catch ${exceptions} {') `
             -replace ('\}\s*Catch\s*(?<exceptions>\[.*?\])\s*\{', '} catch ${exceptions} {') `
-            -replace ('(?<parameter_type>\[[^$0-9]+\])\s*(?<str_after_type>\$.*?)', '${parameter_type}${str_after_type}') `
-        | Set-Content "$fullFileName"
+            -replace ('(?<parameter_type>\[.*?\])\s*(?<str_after_type>\$.*?(,|\s*\)))', '${parameter_type}${str_after_type}') `
+        | Set-Content "$file"
 
         Write-Progress -Activity $ProgressActivity -Status "$ProgressStatusMessage - Finished $i out of $numOfFiles" -PercentComplete (($i/$numOfFiles)*100)
     }

windev.ps1

@@ -34,20 +34,7 @@ function RedirectToLatestPreRelease {
         Write-Host "Using latest Full Release"
         $url = "https://github.com/ChrisTitusTech/winutil/releases/latest/download/winutil.ps1"
     }
-
-    $script = Invoke-RestMethod $url
-    # Elevate Shell if necessary
-    if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)) {
-        Write-Output "Winutil needs to be run as Administrator. Attempting to relaunch."
-
-        $powershellcmd = if (Get-Command pwsh -ErrorAction SilentlyContinue) { "pwsh" } else { "powershell" }
-        $processCmd = if (Get-Command wt.exe -ErrorAction SilentlyContinue) { "wt.exe" } else { $powershellcmd }
-
-        Start-Process $processCmd -ArgumentList "$powershellcmd -ExecutionPolicy Bypass -NoProfile -Command $(Invoke-Expression $script)" -Verb RunAs
-    }
-    else{
-        Invoke-Expression $script
-    }
+    Invoke-RestMethod $url | Invoke-Expression
 }
 
 # Call the redirect function

xaml/inputXML.xaml

@@ -9,11 +9,7 @@
         WindowStartupLocation="CenterScreen"
         UseLayoutRounding="True"
         WindowStyle="None"
-        Width="Auto"
-        Height="Auto"
-        MaxWidth="1280"
-        MaxHeight="800"
-        Title="Chris Titus Tech's Windows Utility">
+        Title="Chris Titus Tech's Windows Utility" Height="800" Width="1280">
     <WindowChrome.WindowChrome>
         <WindowChrome CaptionHeight="0" CornerRadius="10"/>
     </WindowChrome.WindowChrome>
@@ -217,7 +213,7 @@
                                 <Setter TargetName="BackgroundBorder" Property="Background" Value="{ButtonBackgroundMouseoverColor}"/>
                                 <Setter Property="Effect">
                                     <Setter.Value>
-                                        <DropShadowEffect Opacity="1" ShadowDepth="5" Color="{ButtonBackgroundMouseoverColor}" Direction="-100" BlurRadius="15"/>
+                                        <DropShadowEffect Opacity="1" ShadowDepth="5" Color="Gold" Direction="-100" BlurRadius="45"/>
                                     </Setter.Value>
                                 </Setter>
                                 <Setter Property="Panel.ZIndex" Value="2000"/>
@@ -228,7 +224,7 @@
                                 <Setter TargetName="BackgroundBorder" Property="Background" Value="{ButtonBackgroundSelectedColor}"/>
                                 <Setter Property="Effect">
                                     <Setter.Value>
-                                        <DropShadowEffect Opacity="1" ShadowDepth="2" Color="{ButtonBackgroundMouseoverColor}" Direction="-111" BlurRadius="10"/>
+                                        <DropShadowEffect Opacity="1" ShadowDepth="2" Color="Gold" Direction="-111" BlurRadius="25"/>
                                     </Setter.Value>
                                 </Setter>
                             </Trigger>
@@ -288,12 +284,12 @@
             <Setter Property="Padding" Value="0"/>
             <Setter Property="BorderBrush" Value="Transparent"/>
             <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="Cursor" Value="Hand"/>
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
                     <Setter Property="Foreground" Value="Red"/>
                     <Setter Property="Background" Value="Transparent"/>
                     <Setter Property="BorderThickness" Value="10"/>
-                    <Setter Property="Cursor" Value="Hand"/>
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -309,17 +305,17 @@
                         <Grid Background="{TemplateBinding Background}" Margin="{CheckBoxMargin}">
                             <BulletDecorator Background="Transparent">
                                 <BulletDecorator.Bullet>
-                                    <Grid Width="{CheckBoxBulletDecoratorSize}" Height="{CheckBoxBulletDecoratorSize}">
+                                    <Grid Width="{CheckBoxBulletDecoratorFontSize}" Height="{CheckBoxBulletDecoratorFontSize}">
                                         <Border x:Name="Border"
                                                 BorderBrush="{TemplateBinding BorderBrush}"
                                                 Background="{ButtonBackgroundColor}"
                                                 BorderThickness="1"
-                                                Width="{Binding Path={CheckBoxBulletDecoratorSize}-2}"
-                                                Height="{Binding Path={CheckBoxBulletDecoratorSize}-2}"
+                                                Width="{Binding Path={CheckBoxBulletDecoratorFontSize}-2}"
+                                                Height="{Binding Path={CheckBoxBulletDecoratorFontSize}-2}"
                                                 Margin="2"
                                                 SnapsToDevicePixels="True"/>
                                         <Path x:Name="CheckMark"
-                                              Stroke="{ToggleButtonOnColor}"
+                                              Stroke="{TemplateBinding Foreground}"
                                               StrokeThickness="2"
                                               Data="M 0 5 L 5 10 L 12 0"
                                               Visibility="Collapsed"/>
@@ -431,11 +427,7 @@
                                 Width="34" Height="17">
                             <Ellipse x:Name="Ellipse" Fill="{MainForegroundColor}" Stretch="Uniform"
                                     Margin="2,2,2,1"
-                                    HorizontalAlignment="Left" Width="10.8"
-                                    RenderTransformOrigin="0.5, 0.5">
-                                <Ellipse.RenderTransform>
-                                    <ScaleTransform ScaleX="1" ScaleY="1" />
-                                </Ellipse.RenderTransform>
+                                    HorizontalAlignment="Left" Width="12">
                             </Ellipse>
                         </Border>
                         </Grid>
@@ -446,35 +438,12 @@
                                 <Setter TargetName="Border" Property="Background" Value="{LinkHoverForegroundColor}"/>
                                 <Setter Property="Cursor" Value="Hand" />
                                 <Setter Property="Panel.ZIndex" Value="1000"/>
-                                <Trigger.EnterActions>
-                                    <BeginStoryboard>
-                                        <Storyboard>
-                                            <DoubleAnimation Storyboard.TargetName="Ellipse"
-                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)"
-                                                            To="1.1" Duration="0:0:0.1" />
-                                            <DoubleAnimation Storyboard.TargetName="Ellipse"
-                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)"
-                                                            To="1.1" Duration="0:0:0.1" />
-                                        </Storyboard>
-                                    </BeginStoryboard>
-                                </Trigger.EnterActions>
-                                <Trigger.ExitActions>
-                                    <BeginStoryboard>
-                                        <Storyboard>
-                                            <DoubleAnimation Storyboard.TargetName="Ellipse"
-                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)"
-                                                            To="1.0" Duration="0:0:0.1" />
-                                            <DoubleAnimation Storyboard.TargetName="Ellipse"
-                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)"
-                                                            To="1.0" Duration="0:0:0.1" />
-                                        </Storyboard>
-                                    </BeginStoryboard>
-                                </Trigger.ExitActions>
                             </Trigger>
                             <Trigger Property="ToggleButton.IsChecked" Value="False">
                                 <Setter TargetName="Border" Property="Background" Value="{MainBackgroundColor}" />
-                                <Setter TargetName="Border" Property="BorderBrush" Value="#707070" />
-                                <Setter TargetName="Ellipse" Property="Fill" Value="#707070" />
+                                <Setter TargetName="Border" Property="BorderBrush" Value="{MainForegroundColor}" />
+                                <Setter TargetName="Ellipse" Property="Fill" Value="{MainForegroundColor}" />
+
                             </Trigger>
 
                             <Trigger Property="ToggleButton.IsChecked" Value="True">
@@ -649,8 +618,8 @@
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
         <DockPanel HorizontalAlignment="Stretch" Background="{MainBackgroundColor}" SnapsToDevicePixels="True" Grid.Row="0" Width="Auto">
-            <StackPanel Name="NavLogoPanel" Orientation="Horizontal" HorizontalAlignment="Left" Background="{MainBackgroundColor}" SnapsToDevicePixels="True" Margin="10,0,20,0">
-            </StackPanel>
+            <Image Height="{WinUtilIconSize}" Width="{WinUtilIconSize}" Name="WPFIcon"
+                SnapsToDevicePixels="True" Source="https://christitus.com/images/logo-full.png" Margin="10"/>
             <ToggleButton HorizontalAlignment="Left" Height="{TabButtonHeight}" Width="{TabButtonWidth}"
                 Background="{ButtonInstallBackgroundColor}" Foreground="white" FontWeight="Bold" Name="WPFTab1BT">
                 <ToggleButton.Content>
@@ -693,10 +662,10 @@
             </ToggleButton>
             <Grid Background="{MainBackgroundColor}" ShowGridLines="False" Width="Auto" Height="Auto" HorizontalAlignment="Stretch">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"/> <!-- Main content area -->
-                    <ColumnDefinition Width="Auto"/> <!-- Space for options button -->
-                    <ColumnDefinition Width="Auto"/> <!-- Space for close button -->
-                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="50px"/>
+                    <ColumnDefinition Width="50px"/>
                 </Grid.ColumnDefinitions>
 
                 <!--
@@ -708,26 +677,25 @@
                     Consider using a Math Solver, will help in making
                     development of these things much easier
                 -->
+                <!-- Changed the font size from {SearchBarTextBoxFontSize} to 12. This now display the text box correctly in the text box.-->
                 <TextBox
                     Grid.Column="0"
                     Width="{SearchBarWidth}"
                     Height="{SearchBarHeight}"
-                    FontSize="{SearchBarTextBoxFontSize}"
+                    FontSize="12"
                     VerticalAlignment="Center" HorizontalAlignment="Left"
                     BorderThickness="1"
                     Name="SearchBar"
                     Foreground="{MainForegroundColor}" Background="{MainBackgroundColor}"
-                    Padding="3,3,30,0"
-                    Margin="5,0,0,0"
                     ToolTip="Press Ctrl-F and type app name to filter application list below. Press Esc to reset the filter">
                 </TextBox>
+                <!--Changed the margin from 16 to 180, which now places the magnifying glass icon on the right side of the text box. Now able to see what is been searched for.-->
                 <TextBlock
                     Grid.Column="0"
                     VerticalAlignment="Center" HorizontalAlignment="Left"
                     FontFamily="Segoe MDL2 Assets"
                     FontSize="{IconFontSize}"
-                    Margin="180,0,0,0">&#xE721;
-                </TextBlock>
+                    Margin="180,0,0,0">&#xE721;</TextBlock>
                 <!--
                   TODO:
                     Make this ClearButton Positioning react to
@@ -735,12 +703,12 @@
                     Consider using a Math Solver, will help in making
                     development of these things much easier
                 -->
+                <!-- changed the {SearchBarClearButtonMargin} value from 193 to 205, which now places the clear button on the outside of the text box. -->
                 <Button Grid.Column="0"
                     VerticalAlignment="Center" HorizontalAlignment="Left"
                     Name="SearchBarClearButton"
                     Style="{StaticResource SearchBarClearButtonStyle}"
-                    Margin="210,0,0,0" Visibility="Collapsed">
-                </Button>
+                    Margin="205,0,0,0" Visibility="Collapsed"/>
 
                 <ProgressBar
                     Grid.Column="1"
@@ -779,7 +747,7 @@
                     FontSize="{SettingsIconFontSize}"
                     Width="{IconButtonSize}" Height="{IconButtonSize}"
                     HorizontalAlignment="Right" VerticalAlignment="Top"
-                    Margin="5,5,5,0"
+                    Margin="0,5,5,0"
                     FontFamily="Segoe MDL2 Assets"
                     Content="&#xE713;"/>
                 <Popup Grid.Column="2" Name="SettingsPopup"
@@ -788,16 +756,8 @@
                     HorizontalAlignment="Right" VerticalAlignment="Top">
                     <Border Background="{MainBackgroundColor}" BorderBrush="{MainForegroundColor}" BorderThickness="1" CornerRadius="0" Margin="0">
                         <StackPanel Background="{MainBackgroundColor}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                            <MenuItem FontSize="{ButtonFontSize}" Header="Import" Name="ImportMenuItem" Foreground="{MainForegroundColor}">
-                                <MenuItem.ToolTip>
-                                    <ToolTip Content="Import Configuration from exported file."/>
-                                </MenuItem.ToolTip>
-                            </MenuItem>
-                            <MenuItem FontSize="{ButtonFontSize}" Header="Export" Name="ExportMenuItem" Foreground="{MainForegroundColor}">
-                                <MenuItem.ToolTip>
-                                    <ToolTip Content="Export Selected Elements and copy execution command to clipboard."/>
-                                </MenuItem.ToolTip>
-                            </MenuItem>
+                            <MenuItem FontSize="{ButtonFontSize}" Header="Import" Name="ImportMenuItem" Foreground="{MainForegroundColor}"/>
+                            <MenuItem FontSize="{ButtonFontSize}" Header="Export" Name="ExportMenuItem" Foreground="{MainForegroundColor}"/>
                             <Separator/>
                             <MenuItem FontSize="{ButtonFontSize}" Header="About" Name="AboutMenuItem" Foreground="{MainForegroundColor}"/>
                             <MenuItem FontSize="{ButtonFontSize}" Header="Sponsors" Name="SponsorMenuItem" Foreground="{MainForegroundColor}"/>
@@ -814,7 +774,7 @@
                 HorizontalAlignment="Right" VerticalAlignment="Top"
                 Margin="0,5,5,0"
                 FontFamily="Arial"
-                Foreground="{MainForegroundColor}" FontSize="{CloseIconFontSize}" Name="WPFCloseButton" />
+                Foreground="{MainForegroundColor}" FontSize="{IconFontSize}" Name="WPFCloseButton" />
             </Grid>
 
         </DockPanel>
@@ -827,24 +787,21 @@
                         <RowDefinition Height="45px"/>
                         <RowDefinition Height="0.95*"/>
                     </Grid.RowDefinitions>
-                    <StackPanel Background="{MainBackgroundColor}" Orientation="Horizontal" Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.Column="0" Grid.ColumnSpan="3" Margin="{TabContentMargin}">
-                        <Button Name="WPFInstall" Content=" Install/Upgrade Selected" Margin="2" />
+                    <StackPanel Background="{MainBackgroundColor}" Orientation="Horizontal" Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.Column="0" Grid.ColumnSpan="3" Margin="5">
+                        <Button Name="WPFinstall" Content=" Install/Upgrade Selected" Margin="2" />
                         <Button Name="WPFInstallUpgrade" Content=" Upgrade All" Margin="2"/>
-                        <Button Name="WPFUninstall" Content=" Uninstall Selected" Margin="2"/>
+                        <Button Name="WPFuninstall" Content=" Uninstall Selected" Margin="2"/>
                         <Button Name="WPFGetInstalled" Content=" Get Installed" Margin="2"/>
-                        <Button Name="WPFClearInstallSelection" Content=" Clear Selection" Margin="2"/>
-                        <CheckBox Name="WPFpreferChocolatey" VerticalAlignment="Center" VerticalContentAlignment="Center">
-                            <TextBlock Text="Prefer Chocolatey" ToolTip="Prefers Chocolatey as Download Engine instead of Winget" VerticalAlignment="Center" />
-                        </CheckBox>
+                        <Button Name="WPFclearWinget" Content=" Clear Selection" Margin="2"/>
                     </StackPanel>
 
-                    <ScrollViewer x:Name="scrollViewer" Grid.Row="1" Grid.Column="0" Margin="{TabContentMargin}" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"
+                    <ScrollViewer x:Name="scrollViewer" Grid.Row="1" Grid.Column="0" Padding="-1" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"
                                 BorderBrush="Transparent" BorderThickness="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                         <Grid Name="appspanel" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                         </Grid>
                     </ScrollViewer>
 
-                    <Rectangle Grid.Row="1" Grid.Column="0" Width="22" Height="22" Fill="{MainBackgroundColor}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Style="{StaticResource ScrollVisibilityRectangle}"/>
+                    <Rectangle Grid.Row="1" Grid.Column="0" Width="18" Height="18" Fill="{MainBackgroundColor}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Style="{StaticResource ScrollVisibilityRectangle}"/>
 
                 </Grid>
             </TabItem>
@@ -856,7 +813,7 @@
                         <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
 
-                    <ScrollViewer VerticalScrollBarVisibility="Auto" Grid.Row="0" Margin="{TabContentMargin}">
+                    <ScrollViewer VerticalScrollBarVisibility="Auto" Grid.Row="0">
                         <Grid Background="Transparent">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="45px"/>
@@ -868,7 +825,7 @@
                                 <Label Content="Recommended Selections:" FontSize="{FontSize}" VerticalAlignment="Center" Margin="2"/>
                                 <Button Name="WPFstandard" Content=" Standard " Margin="2"/>
                                 <Button Name="WPFminimal" Content=" Minimal " Margin="2"/>
-                                <Button Name="WPFClearTweaksSelection" Content=" Clear " Margin="2"/>
+                                <Button Name="WPFclear" Content=" Clear " Margin="2"/>
                                 <Button Name="WPFGetInstalledTweaks" Content=" Get Installed " Margin="2"/>
                             </StackPanel>
 
@@ -886,22 +843,16 @@
                             </Border>
                         </Grid>
                     </ScrollViewer>
-                    <Border Grid.Row="1" Background="{MainBackgroundColor}" BorderBrush="{BorderColor}" BorderThickness="1" CornerRadius="5" HorizontalAlignment="Stretch" Padding="10">
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Grid.Column="0">
-                            <Button Name="WPFTweaksbutton" Content="Run Tweaks" Margin="5"/>
-                            <Button Name="WPFUndoall" Content="Undo Selected Tweaks" Margin="5"/>
-                        </StackPanel>
-                    </Border>
                 </Grid>
             </TabItem>
             <TabItem Header="Config" Visibility="Collapsed" Name="WPFTab3">
-                <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="{TabContentMargin}">
+                <ScrollViewer VerticalScrollBarVisibility="Auto">
                     <Grid Name="featurespanel" Grid.Row="1" Background="Transparent">
                     </Grid>
                 </ScrollViewer>
             </TabItem>
             <TabItem Header="Updates" Visibility="Collapsed" Name="WPFTab4">
-                <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="{TabContentMargin}">
+                <ScrollViewer VerticalScrollBarVisibility="Auto">
                 <Grid Background="Transparent">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
@@ -931,7 +882,7 @@
                 </ScrollViewer>
             </TabItem>
             <TabItem Header="MicroWin" Visibility="Collapsed" Name="WPFTab5">
-                <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="{TabContentMargin}">
+                <ScrollViewer VerticalScrollBarVisibility="Auto">
                 <Grid Width="Auto" Height="Auto">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
@@ -946,12 +897,12 @@
                         HorizontalAlignment="Stretch">
                     <StackPanel Name="MicrowinMain" Background="{MainBackgroundColor}" SnapsToDevicePixels="True" Grid.Column="0" Grid.Row="0">
                         <StackPanel Background="Transparent" SnapsToDevicePixels="True" Margin="1">
-                            <CheckBox x:Name="WPFMicrowinDownloadFromGitHub" Content="Download oscdimg.exe from CTT Github repo" IsChecked="False" Margin="{MicrowinCheckBoxMargin}" />
+                            <CheckBox x:Name="WPFMicrowinDownloadFromGitHub" Content="Download oscdimg.exe from CTT Github repo" IsChecked="False" Margin="{CheckBoxMargin}" />
                             <TextBlock Margin="5" Padding="1" TextWrapping="Wrap" Foreground="{ComboBoxForegroundColor}">
                                 Choose a Windows ISO file that you've downloaded <LineBreak/>
                                 Check the status in the console
                             </TextBlock>
-                            <CheckBox x:Name="WPFMicrowinISOScratchDir" Content="Use ISO directory for ScratchDir " IsChecked="False" Margin="{MicrowinCheckBoxMargin}"
+                            <CheckBox x:Name="WPFMicrowinISOScratchDir" Content="Use ISO directory for ScratchDir " IsChecked="False" Margin="{CheckBoxMargin}"
                                 ToolTip="Use ISO directory for ScratchDir " />
                             <Grid>
                             <Grid.ColumnDefinitions>
@@ -998,7 +949,7 @@
                             <TextBlock Margin="6" Padding="1" TextWrapping="Wrap">Choose Windows SKU</TextBlock>
                             <ComboBox x:Name = "MicrowinWindowsFlavors" Margin="1" />
                             <Rectangle Fill="{MainForegroundColor}" Height="2" HorizontalAlignment="Stretch" Margin="0,10,0,10"/>
-                            <CheckBox Name="MicrowinInjectDrivers" Content="Inject drivers (I KNOW WHAT I'M DOING)" Margin="{MicrowinCheckBoxMargin}" IsChecked="False" ToolTip="Path to unpacked drivers all sys and inf files for devices that need drivers"/>
+                            <CheckBox Name="MicrowinInjectDrivers" Content="Inject drivers (I KNOW WHAT I'M DOING)" Margin="-10,5,0,0" IsChecked="False" ToolTip="Path to unpacked drivers all sys and inf files for devices that need drivers"/>
                             <TextBox Name="MicrowinDriverLocation" Background="Transparent" BorderThickness="1" BorderBrush="{MainForegroundColor}"
                                 Margin="6"
                                 Text=""
@@ -1007,9 +958,9 @@
                                 Foreground="{LabelboxForegroundColor}"
                                 ToolTip="Path to unpacked drivers all sys and inf files for devices that need drivers"
                             />
-                            <CheckBox Name="MicrowinImportDrivers" Content="Import drivers from current system" Margin="{MicrowinCheckBoxMargin}" IsChecked="False" ToolTip="Export all third-party drivers from your system and inject them to the MicroWin image"/>
+                            <CheckBox Name="MicrowinImportDrivers" Content="Import drivers from current system" Margin="{CheckBoxMargin}" IsChecked="False" ToolTip="Export all third-party drivers from your system and inject them to the MicroWin image"/>
                             <Rectangle Fill="{MainForegroundColor}" Height="2" HorizontalAlignment="Stretch" Margin="0,10,0,10"/>
-                            <CheckBox Name="WPFMicrowinCopyToUsb" Content="Copy to Ventoy" Margin="{MicrowinCheckBoxMargin}" IsChecked="False" ToolTip="Copy to USB disk with a label Ventoy"/>
+                            <CheckBox Name="WPFMicrowinCopyToUsb" Content="Copy to Ventoy" Margin="{CheckBoxMargin}" IsChecked="False" ToolTip="Copy to USB disk with a label Ventoy"/>
                             <Rectangle Fill="{MainForegroundColor}" Height="2" HorizontalAlignment="Stretch" Margin="0,10,0,10"/>
                             <TextBlock Margin="6" Padding="1" TextWrapping="Wrap"><Bold>Custom user settings (leave empty for default user)</Bold></TextBlock>
                             <TextBlock Margin="6" Padding="1" TextWrapping="Wrap">User name (20 characters max.):</TextBlock>