Revert "Better Image handling (#2665)"

This reverts commit 5059b93cd7.

.github/CODE_OF_CONDUCT.md

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

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,4 @@
-# Pull Request
+<!--Before you make this PR have you followed the docs here? - https://christitustech.github.io/winutil/contribute/ -->
-
-## Title
-[Provide a succinct and descriptive title for the pull request.]
 
 ## Type of Change
 - [ ] New feature
@@ -13,20 +10,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

@@ -0,0 +1,58 @@
+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'
+
+filter-by-commitish: true

.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: 7
+        days-before-issue-stale: 90
-        days-before-issue-close: 7
+        days-before-issue-close: 365
         # 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,6 +7,7 @@ on:
       - '.github/requirements.txt'
       - 'docs/**'
       - 'overrides/**'
+      - '.github/CONTRIBUTING.md'
   workflow_dispatch:
 
 jobs:

.github/workflows/pre-release.yaml

@@ -74,16 +74,27 @@ 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 }} # Pass the version variable
+
       - name: Create and Upload Release
         id: create_release
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ env.VERSION }}
           name: Pre-Release ${{ env.VERSION }}
-          body: "![GitHub Downloads (specific asset, specific tag)](https://img.shields.io/github/downloads/ChrisTitusTech/winutil/${{ env.VERSION }}/winutil.ps1)"
+          body: |
+            ${{ steps.generate_notes.outputs.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,12 +1,21 @@
 param (
     [switch]$Debug,
     [switch]$Run,
-    [switch]$SkipPreprocessing
+    [switch]$SkipPreprocessing,
+    [string]$Arguments
 )
+
+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
@@ -41,11 +50,11 @@ if (-NOT $SkipPreprocessing) {
 
     # Dot source the 'Invoke-Preprocessing' Function from 'tools/Invoke-Preprocessing.ps1' Script
     $preprocessingFilePath = ".\tools\Invoke-Preprocessing.ps1"
-    . "$(($workingdir -replace ('\\$', '')) + '\' + ($preprocessingFilePath -replace ('\.\\', '')))"
+    . $preprocessingFilePath
 
     $excludedFiles = @('.\.git\', '.\.gitignore', '.\.gitattributes', '.\.github\CODEOWNERS', '.\LICENSE', "$preprocessingFilePath", '*.png', '*.exe')
     $msg = "Pre-req: Code Formatting"
-    Invoke-Preprocessing -WorkingDir "$workingdir" -ExcludedFiles $excludedFiles -ProgressStatusMessage $msg
+    Invoke-Preprocessing -WorkingDir "$workingdir" -ExcludedFiles $excludedFiles -ProgressStatusMessage $msg -ThrowExceptionOnEmptyFilesList
 }
 
 # Create the script in memory.
@@ -56,14 +65,14 @@ Update-Progress "Adding: Header" 5
 $script_content.Add($header)
 
 Update-Progress "Adding: Version" 10
-$script_content.Add($(Get-Content "$workingdir\scripts\start.ps1").replace('#{replaceme}',"$(Get-Date -Format yy.MM.dd)"))
+$script_content.Add($(Get-Content "scripts\start.ps1").replace('#{replaceme}',"$(Get-Date -Format yy.MM.dd)"))
 
 Update-Progress "Adding: Functions" 20
-Get-ChildItem "$workingdir\functions" -Recurse -File | ForEach-Object {
+Get-ChildItem "functions" -Recurse -File | ForEach-Object {
     $script_content.Add($(Get-Content $psitem.FullName))
     }
 Update-Progress "Adding: Config *.json" 40
-Get-ChildItem "$workingdir\config" | Where-Object {$psitem.extension -eq ".json"} | ForEach-Object {
+Get-ChildItem "config" | Where-Object {$psitem.extension -eq ".json"} | ForEach-Object {
     $json = (Get-Content $psitem.FullName).replace("'","''")
     $jsonAsObject = $json | convertfrom-json
 
@@ -84,44 +93,52 @@ Get-ChildItem "$workingdir\config" | Where-Object {$psitem.extension -eq ".json"
     $script_content.Add($(Write-output "`$sync.configs.$($psitem.BaseName) = '$json' `| convertfrom-json" ))
 }
 
-$xaml = (Get-Content "$workingdir\xaml\inputXML.xaml").replace("'","''")
+# Read the entire XAML file as a single string, preserving line breaks
+$xaml = Get-Content "$workingdir\xaml\inputXML.xaml" -Raw
 
 Update-Progress "Adding: Xaml " 90
 
-$script_content.Add($(Write-output "`$inputXML =  '$xaml'"))
+# Add the XAML content to $script_content using a here-string
+$script_content.Add(@"
+`$inputXML = @'
+$xaml
+'@
+"@)
 
-$script_content.Add($(Get-Content "$workingdir\scripts\main.ps1"))
+$script_content.Add($(Get-Content "scripts\main.ps1"))
 
 if ($Debug) {
     Update-Progress "Writing debug files" 95
-    $appXamlContent | Out-File -FilePath "$workingdir\xaml\inputApp.xaml" -Encoding ascii
+    $appXamlContent | Out-File -FilePath "xaml\inputApp.xaml" -Encoding ascii
-    $tweaksXamlContent | Out-File -FilePath "$workingdir\xaml\inputTweaks.xaml" -Encoding ascii
+    $tweaksXamlContent | Out-File -FilePath "xaml\inputTweaks.xaml" -Encoding ascii
-    $featuresXamlContent | Out-File -FilePath "$workingdir\xaml\inputFeatures.xaml" -Encoding ascii
+    $featuresXamlContent | Out-File -FilePath "xaml\inputFeatures.xaml" -Encoding ascii
 } else {
     Update-Progress "Removing temporary files" 99
-    Remove-Item "$workingdir\xaml\inputApp.xaml" -ErrorAction SilentlyContinue
+    Remove-Item "xaml\inputApp.xaml" -ErrorAction SilentlyContinue
-    Remove-Item "$workingdir\xaml\inputTweaks.xaml" -ErrorAction SilentlyContinue
+    Remove-Item "xaml\inputTweaks.xaml" -ErrorAction SilentlyContinue
-    Remove-Item "$workingdir\xaml\inputFeatures.xaml" -ErrorAction SilentlyContinue
+    Remove-Item "xaml\inputFeatures.xaml" -ErrorAction SilentlyContinue
 }
 
-Set-Content -Path "$workingdir\$scriptname" -Value ($script_content -join "`r`n") -Encoding ascii
+Set-Content -Path "$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) {
-    try {
+    $script = "& '$workingdir\$scriptname' $Arguments"
-        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

LICENSE

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

config/applications.json

@@ -87,14 +87,6 @@
         "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",
@@ -511,14 +503,6 @@
         "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",
@@ -813,7 +797,7 @@
         "content": "Google Drive",
         "description": "File syncing across devices all tied to your google account",
         "link": "https://www.google.com/drive/",
-        "winget": "Google.Drive"
+        "winget": "Google.GoogleDrive"
     },
     "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,6 +282,14 @@
     "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",
@@ -297,5 +305,13 @@
     "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/themes.json

@@ -6,7 +6,7 @@
         "CustomDialogWidth":          "400",
         "CustomDialogHeight":         "200",
 
-        "FontSize":         "14",
+        "FontSize":         "12",
         "FontFamily":       "Arial",
         "FontSizeHeading":  "16",
         "HeaderFontFamily": "Consolas, Monaco",
@@ -26,20 +26,21 @@
         "CloseIconFontSize":      "18",
 
         "MicroWinLogoSize": "10",
+        "MicrowinCheckBoxMargin": "-10,5,0,0",
 
-        "ProgressBarForegroundColor": "#FFAC1C",
+        "ProgressBarForegroundColor": "#2e77ff",
         "ProgressBarBackgroundColor": "Transparent",
-        "ProgressBarTextColor": "#000000",
+        "ProgressBarTextColor": "#232629",
 
-        "ComboBoxBackgroundColor":  "#FFFFFF",
+        "ComboBoxBackgroundColor":  "#F7F7F7",
-        "LabelboxForegroundColor":  "#000000",
+        "LabelboxForegroundColor":  "#232629",
-        "MainForegroundColor":  "#000000",
+        "MainForegroundColor":  "#232629",
-        "MainBackgroundColor":  "#FFFFFF",
+        "MainBackgroundColor":  "#F7F7F7",
-        "LabelBackgroundColor":  "#FFFFFF",
+        "LabelBackgroundColor":  "#F7F7F7",
-        "LinkForegroundColor":  "#000000",
+        "LinkForegroundColor":  "#232629",
-        "LinkHoverForegroundColor":  "#000000",
+        "LinkHoverForegroundColor":  "#232629",
-        "GroupBorderBackgroundColor":  "#000000",
+        "GroupBorderBackgroundColor":  "#232629",
-        "ComboBoxForegroundColor":  "#000000",
+        "ComboBoxForegroundColor":  "#232629",
 
         "ButtonFontSize":   "12",
         "ButtonFontFamily": "Arial",
@@ -52,65 +53,65 @@
         "SearchBarTextBoxFontSize":     "12",
         "SearchBarClearButtonFontSize": "14",
 
-        "ButtonInstallBackgroundColor":  "#FFFFFF",
+        "ButtonInstallBackgroundColor":  "#F7F7F7",
-        "ButtonTweaksBackgroundColor":  "#FFFFFF",
+        "ButtonTweaksBackgroundColor":  "#F7F7F7",
-        "ButtonConfigBackgroundColor":  "#FFFFFF",
+        "ButtonConfigBackgroundColor":  "#F7F7F7",
-        "ButtonUpdatesBackgroundColor":  "#FFFFFF",
+        "ButtonUpdatesBackgroundColor":  "#F7F7F7",
-        "ButtonInstallForegroundColor":  "#000000",
+        "ButtonInstallForegroundColor":  "#232629",
-        "ButtonTweaksForegroundColor":  "#000000",
+        "ButtonTweaksForegroundColor":  "#232629",
-        "ButtonConfigForegroundColor":  "#000000",
+        "ButtonConfigForegroundColor":  "#232629",
-        "ButtonUpdatesForegroundColor":  "#000000",
+        "ButtonUpdatesForegroundColor":  "#232629",
         "ButtonBackgroundColor":  "#F5F5F5",
         "ButtonBackgroundPressedColor":  "#1A1A1A",
         "CheckboxMouseOverColor": "#999999",
         "ButtonBackgroundMouseoverColor":  "#C2C2C2",
         "ButtonBackgroundSelectedColor":  "#F0F0F0",
-        "ButtonForegroundColor":  "#000000",
+        "ButtonForegroundColor":  "#232629",
         "ToggleButtonOnColor":  "#2e77ff",
 
         "ButtonBorderThickness":  "1",
         "ButtonMargin":  "1",
         "ButtonCornerRadius": "2",
-        "BorderColor": "#000000",
+        "BorderColor": "#232629",
         "BorderOpacity": "0.2",
         "ShadowPulse": "Forever"
     },
     "Classic": {
-        "ComboBoxBackgroundColor":  "#FFFFFF",
+        "ComboBoxBackgroundColor":  "#F7F7F7",
-        "LabelboxForegroundColor":  "#000000",
+        "LabelboxForegroundColor":  "#232629",
-        "MainForegroundColor":  "#000000",
+        "MainForegroundColor":  "#232629",
-        "MainBackgroundColor":  "#FFFFFF",
+        "MainBackgroundColor":  "#F7F7F7",
-        "LabelBackgroundColor":  "#FFFFFF",
+        "LabelBackgroundColor":  "#F7F7F7",
-        "LinkForegroundColor":  "#000000",
+        "LinkForegroundColor":  "#232629",
-        "LinkHoverForegroundColor":  "#000000",
+        "LinkHoverForegroundColor":  "#232629",
-        "GroupBorderBackgroundColor":  "#000000",
+        "GroupBorderBackgroundColor":  "#232629",
-        "ComboBoxForegroundColor":  "#000000",
+        "ComboBoxForegroundColor":  "#232629",
 
-        "ButtonInstallBackgroundColor":  "#FFFFFF",
+        "ButtonInstallBackgroundColor":  "#F7F7F7",
-        "ButtonTweaksBackgroundColor":  "#FFFFFF",
+        "ButtonTweaksBackgroundColor":  "#F7F7F7",
-        "ButtonConfigBackgroundColor":  "#FFFFFF",
+        "ButtonConfigBackgroundColor":  "#F7F7F7",
-        "ButtonUpdatesBackgroundColor":  "#FFFFFF",
+        "ButtonUpdatesBackgroundColor":  "#F7F7F7",
-        "ButtonInstallForegroundColor":  "#000000",
+        "ButtonInstallForegroundColor":  "#232629",
-        "ButtonTweaksForegroundColor":  "#000000",
+        "ButtonTweaksForegroundColor":  "#232629",
-        "ButtonConfigForegroundColor":  "#000000",
+        "ButtonConfigForegroundColor":  "#232629",
-        "ButtonUpdatesForegroundColor":  "#000000",
+        "ButtonUpdatesForegroundColor":  "#232629",
         "ButtonBackgroundColor":  "#F5F5F5",
         "ButtonBackgroundPressedColor":  "#1A1A1A",
         "CheckboxMouseOverColor": "#999999",
         "ButtonBackgroundMouseoverColor":  "#C2C2C2",
         "ButtonBackgroundSelectedColor":  "#F0F0F0",
-        "ButtonForegroundColor":  "#000000",
+        "ButtonForegroundColor":  "#232629",
         "ToggleButtonOnColor":  "#2e77ff"
     },
     "Matrix": {
-        "ComboBoxBackgroundColor":  "#000000",
+        "ComboBoxBackgroundColor":  "#232629",
-        "LabelboxForegroundColor":  "#FFEE58",
+        "LabelboxForegroundColor":  "#81a1c1",
-        "MainForegroundColor":  "#9CCC65",
+        "MainForegroundColor":  "#F7F7F7",
-        "MainBackgroundColor":  "#000000",
+        "MainBackgroundColor":  "#232629",
-        "LabelBackgroundColor":  "#000000",
+        "LabelBackgroundColor":  "#232629",
         "LinkForegroundColor":  "#add8e6",
-        "LinkHoverForegroundColor":  "#FFFFFF",
+        "LinkHoverForegroundColor":  "#F7F7F7",
-        "ComboBoxForegroundColor":  "#FFEE58",
+        "ComboBoxForegroundColor":  "#81a1c1",
 
         "ProgressBarForegroundColor": "#222222",
         "ProgressBarBackgroundColor": "Transparent",
@@ -120,30 +121,30 @@
         "ButtonTweaksBackgroundColor":  "#333333",
         "ButtonConfigBackgroundColor":  "#444444",
         "ButtonUpdatesBackgroundColor":  "#555555",
-        "ButtonInstallForegroundColor":  "#FFFFFF",
+        "ButtonInstallForegroundColor":  "#F7F7F7",
-        "ButtonTweaksForegroundColor":  "#FFFFFF",
+        "ButtonTweaksForegroundColor":  "#F7F7F7",
-        "ButtonConfigForegroundColor":  "#FFFFFF",
+        "ButtonConfigForegroundColor":  "#F7F7F7",
-        "ButtonUpdatesForegroundColor":  "#FFFFFF",
+        "ButtonUpdatesForegroundColor":  "#F7F7F7",
-        "ButtonBackgroundColor":  "#000019",
+        "ButtonBackgroundColor":  "#1E3747",
-        "ButtonBackgroundPressedColor":  "#FFFFFF",
+        "ButtonBackgroundPressedColor":  "#F7F7F7",
-        "ButtonBackgroundMouseoverColor":  "#A55A64",
+        "ButtonBackgroundMouseoverColor":  "#3B4252",
-        "ButtonBackgroundSelectedColor":  "#FF5733",
+        "ButtonBackgroundSelectedColor":  "#5E81AC",
-        "ButtonForegroundColor":  "#9CCC65",
+        "ButtonForegroundColor":  "#F7F7F7",
         "ToggleButtonOnColor":  "#2e77ff",
 
-        "BorderColor": "#FFAC1C",
+        "BorderColor": "#0060CC",
-        "BorderOpacity": "0.8",
+        "BorderOpacity": "0.2",
         "ShadowPulse": "0:0:3"
     },
     "Dark": {
-        "ComboBoxBackgroundColor":  "#000000",
+        "ComboBoxBackgroundColor":  "#232629",
-        "LabelboxForegroundColor":  "#FFEE58",
+        "LabelboxForegroundColor":  "#81a1c1",
-        "MainForegroundColor":  "#9CCC65",
+        "MainForegroundColor":  "#F7F7F7",
-        "MainBackgroundColor":  "#000000",
+        "MainBackgroundColor":  "#232629",
-        "LabelBackgroundColor":  "#000000",
+        "LabelBackgroundColor":  "#232629",
         "LinkForegroundColor":  "#add8e6",
-        "LinkHoverForegroundColor":  "#FFFFFF",
+        "LinkHoverForegroundColor":  "#F7F7F7",
-        "ComboBoxForegroundColor":  "#FFEE58",
+        "ComboBoxForegroundColor":  "#81a1c1",
 
         "ProgressBarForegroundColor": "#222222",
         "ProgressBarBackgroundColor": "Transparent",
@@ -153,17 +154,17 @@
         "ButtonTweaksBackgroundColor":  "#333333",
         "ButtonConfigBackgroundColor":  "#444444",
         "ButtonUpdatesBackgroundColor": "#555555",
-        "ButtonInstallForegroundColor": "#FFFFFF",
+        "ButtonInstallForegroundColor": "#F7F7F7",
-        "ButtonTweaksForegroundColor":  "#FFFFFF",
+        "ButtonTweaksForegroundColor":  "#F7F7F7",
-        "ButtonConfigForegroundColor":  "#FFFFFF",
+        "ButtonConfigForegroundColor":  "#F7F7F7",
-        "ButtonUpdatesForegroundColor": "#FFFFFF",
+        "ButtonUpdatesForegroundColor": "#F7F7F7",
-        "ButtonBackgroundColor":  "#000019",
+        "ButtonBackgroundColor":  "#1E3747",
-        "ButtonBackgroundPressedColor":   "#9CCC65",
+        "ButtonBackgroundPressedColor":   "#00CFFF",
-        "ButtonBackgroundMouseoverColor": "#FF5733",
+        "ButtonBackgroundMouseoverColor": "#5E81AC",
-        "ButtonBackgroundSelectedColor":  "#FF5733",
+        "ButtonBackgroundSelectedColor":  "#5E81AC",
-        "ButtonForegroundColor":  "#9CCC65",
+        "ButtonForegroundColor":  "#F7F7F7",
         "ToggleButtonOnColor":    "#2e77ff",
 
-        "BorderColor": "#FFAC1C"
+        "BorderColor": "#0b1215"
     }
 }

config/tweaks.json

@@ -2713,6 +2713,9 @@
       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\"
 
@@ -3399,22 +3402,6 @@
     "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

@@ -0,0 +1,65 @@
+# 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/Powershell7.md

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

docs/devdocs.md

@@ -3,107 +3,106 @@
 
 ## Tweaks
 
-### z--Advanced-Tweaks---CAUTION
-
-- [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)
-- [Disable Teredo](dev/tweaks/z--Advanced-Tweaks---CAUTION/Teredo.md)
-- [DNS](dev/tweaks/z--Advanced-Tweaks---CAUTION/changedns.md)
-- [Remove ALL MS Store Apps - NOT RECOMMENDED](dev/tweaks/z--Advanced-Tweaks---CAUTION/DeBloat.md)
-- [Remove Home and Gallery from explorer](dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveHomeGallery.md)
-- [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)
+- [Change Windows Terminal default: PowerShell 5 -> PowerShell 7](../docs/dev/tweaks/Essential-Tweaks/Powershell7.md)
-- [Create Restore Point](dev/tweaks/Essential-Tweaks/RestorePoint.md)
+- [Create Restore Point](../docs/dev/tweaks/Essential-Tweaks/RestorePoint.md)
-- [Debloat Edge](dev/tweaks/Essential-Tweaks/EdgeDebloat.md)
+- [Debloat Edge](../docs/dev/tweaks/Essential-Tweaks/EdgeDebloat.md)
-- [Delete Temporary Files](dev/tweaks/Essential-Tweaks/DeleteTempFiles.md)
+- [Delete Temporary Files](../docs/dev/tweaks/Essential-Tweaks/DeleteTempFiles.md)
-- [Prefer IPv4 over IPv6](dev/tweaks/Essential-Tweaks/IPv46.md)
+- [Disable Activity History](../docs/dev/tweaks/Essential-Tweaks/AH.md)
-- [Disable Activity History](dev/tweaks/Essential-Tweaks/AH.md)
+- [Disable ConsumerFeatures](../docs/dev/tweaks/Essential-Tweaks/ConsumerFeatures.md)
-- [Disable ConsumerFeatures](dev/tweaks/Essential-Tweaks/ConsumerFeatures.md)
+- [Disable GameDVR](../docs/dev/tweaks/Essential-Tweaks/DVR.md)
-- [Disable GameDVR](dev/tweaks/Essential-Tweaks/DVR.md)
+- [Disable Hibernation](../docs/dev/tweaks/Essential-Tweaks/Hiber.md)
-- [Disable Hibernation](dev/tweaks/Essential-Tweaks/Hiber.md)
+- [Disable Homegroup](../docs/dev/tweaks/Essential-Tweaks/Home.md)
-- [Disable Homegroup](dev/tweaks/Essential-Tweaks/Home.md)
+- [Disable Location Tracking](../docs/dev/tweaks/Essential-Tweaks/Loc.md)
-- [Disable Location Tracking](dev/tweaks/Essential-Tweaks/Loc.md)
+- [Disable Powershell 7 Telemetry](../docs/dev/tweaks/Essential-Tweaks/Powershell7Tele.md)
-- [Disable Powershell 7 Telemetry](dev/tweaks/Essential-Tweaks/Powershell7Tele.md)
+- [Disable Storage Sense](../docs/dev/tweaks/Essential-Tweaks/Storage.md)
-- [Disable Storage Sense](dev/tweaks/Essential-Tweaks/Storage.md)
+- [Disable Telemetry](../docs/dev/tweaks/Essential-Tweaks/Tele.md)
-- [Disable Telemetry](dev/tweaks/Essential-Tweaks/Tele.md)
+- [Disable Wifi-Sense](../docs/dev/tweaks/Essential-Tweaks/Wifi.md)
-- [Disable Wifi-Sense](dev/tweaks/Essential-Tweaks/Wifi.md)
+- [Enable End Task With Right Click](../docs/dev/tweaks/Essential-Tweaks/EndTaskOnTaskbar.md)
-- [Enable End Task With Right Click](dev/tweaks/Essential-Tweaks/EndTaskOnTaskbar.md)
+- [Prefer IPv4 over IPv6](../docs/dev/tweaks/Essential-Tweaks/IPv46.md)
-- [Run Disk Cleanup](dev/tweaks/Essential-Tweaks/DiskCleanup.md)
+- [Run Disk Cleanup](../docs/dev/tweaks/Essential-Tweaks/DiskCleanup.md)
-- [Set Hibernation as default (good for laptops)](dev/tweaks/Essential-Tweaks/LaptopHibernation.md)
+- [Set Hibernation as default (good for laptops)](../docs/dev/tweaks/Essential-Tweaks/LaptopHibernation.md)
-- [Set Services to Manual](dev/tweaks/Essential-Tweaks/Services.md)
+- [Set Services to Manual](../docs/dev/tweaks/Essential-Tweaks/Services.md)
 ### Shortcuts
 
-- [Create WinUtil Shortcut](dev/tweaks/Shortcuts/Shortcut.md)
+- [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)
 ### Customize-Preferences
 
-- [Bing Search in Start Menu](dev/tweaks/Customize-Preferences/BingSearch.md)
+- [Bing Search in Start Menu](../docs/dev/tweaks/Customize-Preferences/BingSearch.md)
-- [Center Taskbar Items](dev/tweaks/Customize-Preferences/TaskbarAlignment.md)
+- [Center Taskbar Items](../docs/dev/tweaks/Customize-Preferences/TaskbarAlignment.md)
-- [Dark Theme for Windows](dev/tweaks/Customize-Preferences/DarkMode.md)
+- [Dark Theme for Windows](../docs/dev/tweaks/Customize-Preferences/DarkMode.md)
-- [Detailed BSoD](dev/tweaks/Customize-Preferences/DetailedBSoD.md)
+- [Detailed BSoD](../docs/dev/tweaks/Customize-Preferences/DetailedBSoD.md)
-- [Mouse Acceleration](dev/tweaks/Customize-Preferences/MouseAcceleration.md)
+- [Mouse Acceleration](../docs/dev/tweaks/Customize-Preferences/MouseAcceleration.md)
-- [NumLock on Startup](dev/tweaks/Customize-Preferences/NumLock.md)
+- [NumLock on Startup](../docs/dev/tweaks/Customize-Preferences/NumLock.md)
-- [Search Button in Taskbar](dev/tweaks/Customize-Preferences/TaskbarSearch.md)
+- [Search Button in Taskbar](../docs/dev/tweaks/Customize-Preferences/TaskbarSearch.md)
-- [Show File Extensions](dev/tweaks/Customize-Preferences/ShowExt.md)
+- [Show File Extensions](../docs/dev/tweaks/Customize-Preferences/ShowExt.md)
-- [Show Hidden Files](dev/tweaks/Customize-Preferences/HiddenFiles.md)
+- [Show Hidden Files](../docs/dev/tweaks/Customize-Preferences/HiddenFiles.md)
-- [Snap Assist Flyout](dev/tweaks/Customize-Preferences/SnapFlyout.md)
+- [Snap Assist Flyout](../docs/dev/tweaks/Customize-Preferences/SnapFlyout.md)
-- [Snap Assist Suggestion](dev/tweaks/Customize-Preferences/SnapSuggestion.md)
+- [Snap Assist Suggestion](../docs/dev/tweaks/Customize-Preferences/SnapSuggestion.md)
-- [Snap Window](dev/tweaks/Customize-Preferences/SnapWindow.md)
+- [Snap Window](../docs/dev/tweaks/Customize-Preferences/SnapWindow.md)
-- [Sticky Keys](dev/tweaks/Customize-Preferences/StickyKeys.md)
+- [Sticky Keys](../docs/dev/tweaks/Customize-Preferences/StickyKeys.md)
-- [Task View Button in Taskbar](dev/tweaks/Customize-Preferences/TaskView.md)
+- [Task View Button in Taskbar](../docs/dev/tweaks/Customize-Preferences/TaskView.md)
-- [Verbose Messages During Logon](dev/tweaks/Customize-Preferences/VerboseLogon.md)
+- [Verbose Messages During Logon](../docs/dev/tweaks/Customize-Preferences/VerboseLogon.md)
-- [Widgets Button in Taskbar](dev/tweaks/Customize-Preferences/TaskbarWidgets.md)
+- [Widgets Button in Taskbar](../docs/dev/tweaks/Customize-Preferences/TaskbarWidgets.md)
 ### Performance-Plans
 
-- [Add and Activate Ultimate Performance Profile](dev/tweaks/Performance-Plans/AddUltPerf.md)
+- [Add and Activate Ultimate Performance Profile](../docs/dev/tweaks/Performance-Plans/AddUltPerf.md)
-- [Remove Ultimate Performance Profile](dev/tweaks/Performance-Plans/RemoveUltPerf.md)
+- [Remove Ultimate Performance Profile](../docs/dev/tweaks/Performance-Plans/RemoveUltPerf.md)
 
 ## Features
 
-### Legacy-Windows-Panels
-
-- [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)
+- [Remove Adobe Creative Cloud](../docs/dev/features/Fixes/RunAdobeCCCleanerTool.md)
-- [Reset Network](dev/features/Fixes/Network.md)
+- [Reset Network](../docs/dev/features/Fixes/Network.md)
-- [Reset Windows Update](dev/features/Fixes/Update.md)
+- [Reset Windows Update](../docs/dev/features/Fixes/Update.md)
-- [Set Up Autologin](dev/features/Fixes/Autologin.md)
+- [Set Up Autologin](../docs/dev/features/Fixes/Autologin.md)
-- [System Corruption Scan](dev/features/Fixes/DISM.md)
+- [System Corruption Scan](../docs/dev/features/Fixes/DISM.md)
-- [WinGet Reinstall](dev/features/Fixes/Winget.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)
 ### Features
 
-- [All .Net Framework (2,3,4)](dev/features/Features/dotnet.md)
+- [All .Net Framework (2,3,4)](../docs/dev/features/Features/dotnet.md)
-- [Disable Legacy F8 Boot Recovery](dev/features/Features/DisableLegacyRecovery.md)
+- [Disable Legacy F8 Boot Recovery](../docs/dev/features/Features/DisableLegacyRecovery.md)
-- [Disable Search Box Web Suggestions in Registry(explorer restart)](dev/features/Features/DisableSearchSuggestions.md)
+- [Disable Search Box Web Suggestions in Registry(explorer restart)](../docs/dev/features/Features/DisableSearchSuggestions.md)
-- [Enable Daily Registry Backup Task 12.30am](dev/features/Features/RegBackup.md)
+- [Enable Daily Registry Backup Task 12.30am](../docs/dev/features/Features/RegBackup.md)
-- [Enable Legacy F8 Boot Recovery](dev/features/Features/EnableLegacyRecovery.md)
+- [Enable Legacy F8 Boot Recovery](../docs/dev/features/Features/EnableLegacyRecovery.md)
-- [Enable Search Box Web Suggestions in Registry(explorer restart)](dev/features/Features/EnableSearchSuggestions.md)
+- [Enable Search Box Web Suggestions in Registry(explorer restart)](../docs/dev/features/Features/EnableSearchSuggestions.md)
-- [HyperV Virtualization](dev/features/Features/hyperv.md)
+- [HyperV Virtualization](../docs/dev/features/Features/hyperv.md)
-- [Install Features](dev/features/Features/Install.md)
+- [Install Features](../docs/dev/features/Features/Install.md)
-- [Legacy Media (WMP, DirectPlay)](dev/features/Features/legacymedia.md)
+- [Legacy Media (WMP, DirectPlay)](../docs/dev/features/Features/legacymedia.md)
-- [NFS - Network File System](dev/features/Features/nfs.md)
+- [NFS - Network File System](../docs/dev/features/Features/nfs.md)
-- [Windows Sandbox](dev/features/Features/Sandbox.md)
+- [Windows Sandbox](../docs/dev/features/Features/Sandbox.md)
-- [Windows Subsystem for Linux](dev/features/Features/wsl.md)
+- [Windows Subsystem for Linux](../docs/dev/features/Features/wsl.md)
 
 

docs/userguide.md

@@ -29,6 +29,11 @@
     * 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/Install-WinUtilChoco.ps1

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

functions/private/Install-WinUtilProgramChoco.ps1

@@ -1,102 +1,258 @@
 function Install-WinUtilProgramChoco {
     <#
     .SYNOPSIS
-    Manages the provided programs using Chocolatey
+    Manages the installation or uninstallation of a list of Chocolatey packages.
 
-    .PARAMETER ProgramsToInstall
+    .PARAMETER Programs
-    A list of programs to manage
+    A string array containing the programs to be installed or uninstalled.
 
-    .PARAMETER manage
+    .PARAMETER Action
-    The action to perform on the programs, can be either 'Installing' or 'Uninstalling'
+    Specifies the action to perform: "Install" or "Uninstall". The default value is "Install".
 
-    .NOTES
+    .DESCRIPTION
-    The triple quotes are required any time you need a " in a normal script block.
+    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"
     #>
 
     param(
-        [Parameter(Mandatory, Position=0)]
+        [Parameter(Mandatory, Position = 0)]
-        [PsCustomObject]$ProgramsToInstall,
+        [string[]]$Programs,
 
-        [Parameter(Position=1)]
+        [Parameter(Position = 1)]
-        [String]$manage = "Installing"
+        [String]$Action = "Install"
     )
 
-    $x = 0
+    function Initialize-OutputFile {
-    $count = $ProgramsToInstall.Count
+        <#
+        .SYNOPSIS
+        Initializes an output file by removing any existing file and creating a new, empty file at the specified path.
 
-    # This check isn't really necessary, as there's a couple of checks before this Private Function gets called, but just to make sure ;)
+        .PARAMETER filePath
-    if($count -le 0) {
+        The full path to the file to be initialized.
-        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."
+
+        .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
     }
 
-    Write-Progress -Activity "$manage Applications" -Status "Starting" -PercentComplete 0
+    function Run-ChocoCommand {
-    Write-Host "==========================================="
+        <#
-    Write-Host "--   Configuring Chocolatey pacakages   ---"
+        .SYNOPSIS
-    Write-Host "==========================================="
+        Executes a Chocolatey command with the specified arguments and returns the exit code.
-    Foreach ($Program in $ProgramsToInstall) {
+
-        Write-Progress -Activity "$manage Applications" -Status "$manage $($Program.choco) $($x + 1) of $count" -PercentComplete $($x/$count*100)
+        .PARAMETER arguments
-        if($manage -eq "Installing") {
+        The arguments to be passed to the Chocolatey command.
-            write-host "Starting install of $($Program.choco) with Chocolatey."
+
+        .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 {
-                $tryUpgrade = $false
+            $installStatusCode = Run-ChocoCommand "install $Program -y --log-file $installOutputFile"
-        $installOutputFilePath = "$env:TEMP\Install-WinUtilProgramChoco.install-command.output.txt"
+            if ($installStatusCode -eq 0) {
-        New-Item -ItemType File -Path $installOutputFilePath
+
-        $chocoInstallStatus = $(Start-Process -FilePath "choco" -ArgumentList "install $($Program.choco) -y" -Wait -PassThru -RedirectStandardOutput $installOutputFilePath).ExitCode
+                if (Check-UpgradeNeeded $installOutputFile) {
-            if(($chocoInstallStatus -eq 0) -AND (Test-Path -Path $installOutputFilePath)) {
+                    $upgradeStatusCode = Run-ChocoCommand "upgrade $Program -y"
-                $keywordsFound = Get-Content -Path $installOutputFilePath | Where-Object {$_ -match "reinstall" -OR $_ -match "already installed"}
+                    Write-Host "$Program was" $(if ($upgradeStatusCode -eq 0) { "upgraded successfully." } else { "not upgraded." })
-                if ($keywordsFound) {
+                }
-                    $tryUpgrade = $true
+                else {
+                    Write-Host "$Program installed successfully."
                 }
             }
-        # 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.
+            else {
-        if ($tryUpgrade) {
+                Write-Host "Failed to install $Program."
-            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 {
+        catch {
-                Write-Host "Failed to install $($Program.choco) due to an error: $_"
+            Write-Host "Failed to install $Program due to an error: $_"
-                $X++
+        }
-                $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Error" -value ($x/$count) })
+        finally {
+            Update-TaskbarProgress $currentIndex $totalPrograms
         }
     }
 
-    if($manage -eq "Uninstalling") {
+    function Uninstall-ChocoPackage {
-            write-host "Starting uninstall of $($Program.choco) with Chocolatey."
+        <#
+        .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 {
-        $uninstallOutputFilePath = "$env:TEMP\Install-WinUtilProgramChoco.uninstall-command.output.txt"
+                $uninstallStatusCode = Run-ChocoCommand "uninstall $chocoPackages -y"
-        New-Item -ItemType File -Path $uninstallOutputFilePath
+                Write-Host "$Program" $(if ($uninstallStatusCode -eq 0) { "uninstalled successfully." } else { "failed to uninstall." })
-        $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 {
+            catch {
-                Write-Host "Failed to uninstall $($Program.choco) due to an error: $_"
+                Write-Host "Failed to uninstall $Program due to an error: $_"
-                $x++
+            }
-                $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Error" -value ($x/$count) })
+            finally {
+                Update-TaskbarProgress $currentIndex $totalPrograms
             }
         }
+        else {
+            Write-Host "$Program is not installed."
+        }
     }
-    Write-Progress -Activity "$manage Applications" -Status "Finished" -Completed
 
-    # Cleanup leftovers files
+    $totalPrograms = $Programs.Count
-    if(Test-Path -Path $installOutputFilePath) { Remove-Item -Path $installOutputFilePath }
+    if ($totalPrograms -le 0) {
-    if(Test-Path -Path $uninstallOutputFilePath) { Remove-Item -Path $uninstallOutputFilePath }
+        throw "Parameter 'Programs' must have at least one item."
+    }
 
-    return;
+    Write-Host "==========================================="
+    Write-Host "--   Configuring Chocolatey packages   ---"
+    Write-Host "==========================================="
+
+    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)})
+
+        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
+    }
 }
+

functions/private/Install-WinUtilProgramWinget.ps1

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

functions/private/Invoke-WinUtilCurrentSystem.ps1

@@ -13,6 +13,16 @@ 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,7 +7,9 @@ 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,28 +37,30 @@ function Remove-Features() {
             Remove-Features
     #>
     try {
-        $featlist = (Get-WindowsOptionalFeature -Path $scratchDir).FeatureName
+        $featlist = (Get-WindowsOptionalFeature -Path $scratchDir)
 
         $featlist = $featlist | Where-Object {
-            $_ -NotLike "*Defender*" -AND
+            $_.FeatureName -NotLike "*Defender*" -AND
-            $_ -NotLike "*Printing*" -AND
+            $_.FeatureName -NotLike "*Printing*" -AND
-            $_ -NotLike "*TelnetClient*" -AND
+            $_.FeatureName -NotLike "*TelnetClient*" -AND
-            $_ -NotLike "*PowerShell*" -AND
+            $_.FeatureName -NotLike "*PowerShell*" -AND
-            $_ -NotLike "*NetFx*" -AND
+            $_.FeatureName -NotLike "*NetFx*" -AND
-            $_ -NotLike "*Media*" -AND
+            $_.FeatureName -NotLike "*Media*" -AND
-            $_ -NotLike "*NFS*"
+            $_.FeatureName -NotLike "*NFS*" -AND
+            $_.State -ne "Disabled"
         }
 
         foreach($feature in $featlist) {
-            $status = "Removing feature $feature"
+            $status = "Removing feature $($feature.FeatureName)"
             Write-Progress -Activity "Removing features" -Status $status -PercentComplete ($counter++/$featlist.Count*100)
-            Write-Debug "Removing feature $feature"
+            Write-Debug "Removing feature $($feature.FeatureName)"
-            Disable-WindowsOptionalFeature -Path "$scratchDir" -FeatureName $feature -Remove  -ErrorAction SilentlyContinue -NoRestart
+            Disable-WindowsOptionalFeature -Path "$scratchDir" -FeatureName $($feature.FeatureName) -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
     }
 }
 
@@ -106,6 +108,8 @@ function Remove-Packages {
                 $_ -NotLike "*Wifi*"
             }
 
+        $failedCount = 0
+
         foreach ($pkg in $pkglist) {
             try {
                 $status = "Removing $pkg"
@@ -114,12 +118,18 @@ 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
     }
 }
 
@@ -175,6 +185,7 @@ 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
     }
 }
 
@@ -248,8 +259,8 @@ function Remove-FileOrDirectory([string]$pathToDelete, [string]$mask = "", [swit
 function New-Unattend {
 
     param (
-        [Parameter(Mandatory, Position = 0)] [string] $userName,
+        [Parameter(Mandatory, Position = 0)] [string]$userName,
-        [Parameter(Position = 1)] [string] $userPassword
+        [Parameter(Position = 1)] [string]$userPassword
     )
 
     $unattend = @'

functions/private/Invoke-WinUtilpsProfile.ps1

@@ -0,0 +1,50 @@
+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/Update-WinUtilProgramWinget.ps1

@@ -11,7 +11,7 @@ Function Update-WinUtilProgramWinget {
 
         $host.ui.RawUI.WindowTitle = """Winget Install"""
 
-        Start-Transcript $ENV:TEMP\winget-update.log -Append
+        Start-Transcript "$logdir\winget-update_$dateTime.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}
+        "WPFInstall" {Invoke-WPFInstall}
-        "WPFuninstall" {Invoke-WPFUnInstall}
+        "WPFUninstall" {Invoke-WPFUnInstall}
         "WPFInstallUpgrade" {Invoke-WPFInstallUpgrade}
-        "WPFstandard" {Invoke-WPFPresets "Standard"}
+        "WPFStandard" {Invoke-WPFPresets "Standard" -checkboxfilterpattern "WPFTweak*"}
-        "WPFminimal" {Invoke-WPFPresets "Minimal"}
+        "WPFMinimal" {Invoke-WPFPresets "Minimal" -checkboxfilterpattern "WPFTweak*"}
-        "WPFclear" {Invoke-WPFPresets -preset $null -imported $true}
+        "WPFClearTweaksSelection" {Invoke-WPFPresets -imported $true -checkboxfilterpattern "WPFTweak*"}
-        "WPFclearWinget" {Invoke-WPFPresets -preset $null -imported $true -CheckBox "WPFInstall"}
+        "WPFClearInstallSelection" {Invoke-WPFPresets -imported $true -checkboxfilterpattern "WPFInstall*"}
         "WPFtweaksbutton" {Invoke-WPFtweaksbutton}
         "WPFOOSUbutton" {Invoke-WPFOOSU}
         "WPFAddUltPerf" {Invoke-WPFUltimatePerformance -State "Enable"}
@@ -41,6 +41,7 @@ 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}
@@ -57,5 +58,6 @@ function Invoke-WPFButton {
         "WPFMicrowin" {Invoke-WPFMicrowin}
         "WPFCloseButton" {Invoke-WPFCloseButton}
         "MicrowinScratchDirBT" {Invoke-ScratchDialog}
+        "WPFWinUtilPSProfile" {Invoke-WinUtilpsProfile}
     }
 }

functions/public/Invoke-WPFControlPanel.ps1

@@ -16,6 +16,7 @@ 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(((Test-WinUtilPackageManager -winget) -eq "not-installed") -and $checkbox -eq "winget") {
+    if(($sync.WPFpreferChocolatey.IsChecked -eq $false) -and ((Test-WinUtilPackageManager -winget) -eq "not-installed") -and $checkbox -eq "winget") {
         return
     }
-
+    $preferChoco = $sync.WPFpreferChocolatey.IsChecked
-    Invoke-WPFRunspace -ArgumentList $checkbox -DebugPreference $DebugPreference -ScriptBlock {
+    Invoke-WPFRunspace -ArgumentList $checkbox, $preferChoco -DebugPreference $DebugPreference -ScriptBlock {
-        param($checkbox, $DebugPreference)
+        param($checkbox, $preferChoco, $DebugPreference)
 
         $sync.ProcessRunning = $true
         $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" })
@@ -32,8 +32,12 @@ 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-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"
+        Write-Host "Please refer to this wiki for more details: https://christitustech.github.io/winutil/KnownIssues/#troubleshoot-errors-during-microwin-usage" -ForegroundColor Red
         Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
         return
     }

functions/public/Invoke-WPFImpex.ps1

@@ -41,6 +41,8 @@ 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
@@ -55,6 +57,7 @@ function Invoke-WPFImpex {
             }
         }
 
+        $flattenedJson = [string]$flattenedJson
         Invoke-WPFPresets -preset $flattenedJson -imported $true
     }
 }

functions/public/Invoke-WPFInstall.ps1

@@ -19,10 +19,9 @@ 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 {
-    Invoke-WPFRunspace -ArgumentList $PackagesToInstall -DebugPreference $DebugPreference -ScriptBlock {
+        param($PackagesToInstall, $ChocoPreference, $DebugPreference)
-        param($PackagesToInstall, $DebugPreference)
         if ($PackagesToInstall.count -eq 1) {
             $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })
         } else {
@@ -30,16 +29,28 @@ function Invoke-WPFInstall {
         }
         $packagesWinget, $packagesChoco = {
             $packagesWinget = [System.Collections.ArrayList]::new()
-            $packagesChoco = [System.Collections.Generic.List`1[System.Object]]::new()
+            $packagesChoco = [System.Collections.ArrayList]::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)
+                    $packagesChoco.add($package.choco)
                     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)
 
@@ -48,12 +59,12 @@ function Invoke-WPFInstall {
             $errorPackages = @()
             if($packagesWinget.Count -gt 0) {
                 Install-WinUtilWinget
-                $errorPackages += Invoke-WinUtilWingetProgram -Action Install -Programs $packagesWinget
+                Install-WinUtilProgramWinget -Action Install -Programs $packagesWinget
-                $errorPackages| ForEach-Object {if($_.choco -ne "na") {$packagesChoco += $_}}
+
             }
             if($packagesChoco.Count -gt 0) {
                 Install-WinUtilChoco
-                Install-WinUtilProgramChoco -ProgramsToInstall $packagesChoco
+                Install-WinUtilProgramChoco -Action Install -Programs $packagesChoco
             }
             Write-Host "==========================================="
             Write-Host "--      Installs have finished          ---"

functions/public/Invoke-WPFInstallUpgrade.ps1

@@ -2,9 +2,20 @@ function Invoke-WPFInstallUpgrade {
     <#
 
     .SYNOPSIS
-        Invokes the function that upgrades all installed programs using winget
+        Invokes the function that upgrades all installed programs
 
     #>
+    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
         }
@@ -15,12 +26,11 @@ 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-WPFPresets.ps1

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

functions/public/Invoke-WPFRunspace.ps1

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

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..."
-                Invoke-WinUtilWingetProgram -Action Install -Programs @("Microsoft.PowerShell")
+                Install-WinUtilProgramWinget -Action Install -Programs @("Microsoft.PowerShell")
             }
             $targetTerminalName = "PowerShell"
         }

functions/public/Invoke-WPFUIElements.ps1

@@ -186,6 +186,7 @@ function Invoke-WPFUIElements {
                         $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
 
@@ -303,13 +304,6 @@ function Invoke-WPFUIElements {
                             $textBlock.ToolTip = $entryInfo.Link
                             $textBlock.Style = $HoverTextBlockStyle
 
-                            # Add event handler for click to open link
-                            $handler = [System.Windows.Input.MouseButtonEventHandler]{
-                                param($sender, $e)
-                                Start-Process $sender.ToolTip.ToString()
-                            }
-                            $textBlock.AddHandler([Windows.Controls.TextBlock]::MouseLeftButtonUpEvent, $handler)
-
                             $horizontalStackPanel.Children.Add($textBlock) | Out-Null
 
                             $sync[$textBlock.Name] = $textBlock

functions/public/Invoke-WPFUltimatePerformance.ps1

@@ -2,43 +2,65 @@ Function Invoke-WPFUltimatePerformance {
     <#
 
     .SYNOPSIS
-        Creates or removes the Ultimate Performance power scheme
+        Enables or disables the Ultimate Performance power scheme based on its GUID.
 
     .PARAMETER State
-        Indicates whether to enable or disable the Ultimate Performance power scheme
+        Specifies whether to "Enable" or "Disable" the Ultimate Performance power scheme.
 
     #>
     param($State)
+
     try {
-        # Check if Ultimate Performance plan is installed
+        # GUID of the Ultimate Performance power plan
-        $ultimatePlan = powercfg -list | Select-String -Pattern "Ultimate Performance"
+        $ultimateGUID = "e9a42b02-d5df-448d-aa00-03f14749eb61"
-        if($state -eq "Enable") {
+
-            if ($ultimatePlan) {
+        if ($State -eq "Enable") {
-                Write-Host "Ultimate Performance plan is already installed."
+            # Duplicate the Ultimate Performance power plan using its GUID
-            } else {
+            $duplicateOutput = powercfg /duplicatescheme $ultimateGUID
-                Write-Host "Installing Ultimate Performance plan..."
+
-                powercfg -duplicatescheme e9a42b02-d5df-448d-aa00-03f14749eb61
+            $guid = $null
-                Write-Host "> Ultimate Performance plan installed."
+            $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
+                }
             }
 
-            # Set the Ultimate Performance plan as active
+            if (-not $guid) {
-            $ultimatePlanGUID = (powercfg -list | Select-String -Pattern "Ultimate Performance").Line.Split()[3]
+                Write-Output "No GUID found in the duplicateOutput. Check the output format."
-            powercfg -setactive $ultimatePlanGUID
+                exit 1
-
-            Write-Host "Ultimate Performance plan is now active."
-
-
             }
-        elseif($state -eq "Disable") {
+
-            if ($ultimatePlan) {
+            # Change the name of the power plan and set its description
-                # Extract the GUID of the Ultimate Performance plan
+            $changeNameOutput = powercfg /changename $guid "$nameFromFile" "$description"
-                $ultimatePlanGUID = $ultimatePlan.Line.Split()[3]
+            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]
 
                 # 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
+                # Delete the Ultimate Performance plan by GUID
                 powercfg -delete $ultimatePlanGUID
 
                 Write-Host "Ultimate Performance plan has been uninstalled."
@@ -48,6 +70,6 @@ Function Invoke-WPFUltimatePerformance {
             }
         }
     } catch {
-        Write-Warning $psitem.Exception.Message
+        Write-Error "Error occurred: $_"
     }
 }

functions/public/Invoke-WPFUnInstall.ps1

@@ -28,38 +28,51 @@ 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 {
-    Invoke-WPFRunspace -ArgumentList $PackagesToInstall -DebugPreference $DebugPreference -ScriptBlock {
+        param($PackagesToInstall, $ChocoPreference, $DebugPreference)
-        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.Generic.List`1[System.Object]]::new()
+            $packagesWinget = [System.Collections.ArrayList]::new()
-            $packagesChoco = [System.Collections.Generic.List`1[System.Object]]::new()
+            $packagesChoco = [System.Collections.ArrayList]::new()
+
         foreach ($package in $PackagesToInstall) {
-                if ($package.winget -eq "na") {
+            if ($ChocoPreference) {
-                    $packagesChoco.add($package)
+                if ($package.choco -eq "na") {
-                    Write-Host "Queueing $($package.choco) for Chocolatey Uninstall"
+                    $packagesWinget.add($package.winget)
+                    Write-Host "Queueing $($package.winget) for Winget uninstall"
                 } else {
-                    $packagesWinget.add($($package.winget))
+                    $null = $packagesChoco.add($package.choco)
-                    Write-Host "Queueing $($package.winget) for Winget Uninstall"
+                    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"
+                } else {
+                    $null = $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) {
-                Invoke-WinUtilWingetProgram -Action Uninstall -Programs $packagesWinget
+                Install-WinUtilProgramWinget -Action Uninstall -Programs $packagesWinget
             }
             if($packagesChoco.Count -gt 0) {
-                Install-WinUtilProgramChoco -ProgramsToInstall $packagesChoco -Manage "Uninstalling"
+                Install-WinUtilProgramChoco -Action Uninstall -Programs $packagesChoco
             }
 
             Write-Host "==========================================="

overrides/main.html

@@ -1,5 +1,12 @@
 {% 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,6 +37,12 @@ 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) {}
     }
@@ -85,22 +85,16 @@ try {
     $sync["Form"] = [Windows.Markup.XamlReader]::Load( $reader )
     $readerOperationSuccessful = $true
 } catch [System.Management.Automation.MethodInvocationException] {
-    Write-Warning "We ran into a problem with the XAML code.  Check the syntax for this control..."
+    Write-Host "We ran into a problem with the XAML code.  Check the syntax for this control..." -ForegroundColor Red
     Write-Host $error[0].Exception.Message -ForegroundColor Red
 
     If ($error[0].Exception.Message -like "*button*") {
-        write-warning "Ensure your <button in the `$inputXML does NOT have a Click=ButtonClick property.  PS can't handle this`n`n`n`n"
+        write-Host "Ensure your <button in the `$inputXML does NOT have a Click=ButtonClick property.  PS can't handle this`n`n`n`n" -ForegroundColor Red
     }
 } catch {
-    Write-Host "Unable to load Windows.Markup.XamlReader. Double-check syntax and ensure .net is installed."
+    Write-Host "Unable to load Windows.Markup.XamlReader. Double-check syntax and ensure .net is installed." -ForegroundColor Red
 }
 
-# Load the configuration files
-#Invoke-WPFUIElements -configVariable $sync.configs.nav -targetGridName "WPFMainGrid"
-Invoke-WPFUIElements -configVariable $sync.configs.applications -targetGridName "appspanel" -columncount 5
-Invoke-WPFUIElements -configVariable $sync.configs.tweaks -targetGridName "tweakspanel" -columncount 2
-Invoke-WPFUIElements -configVariable $sync.configs.feature -targetGridName "featurespanel" -columncount 2
-
 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
@@ -110,12 +104,26 @@ if (-NOT ($readerOperationSuccessful)) {
     exit 1
 }
 
+# Load the configuration files
+#Invoke-WPFUIElements -configVariable $sync.configs.nav -targetGridName "WPFMainGrid"
+Invoke-WPFUIElements -configVariable $sync.configs.applications -targetGridName "appspanel" -columncount 5
+Invoke-WPFUIElements -configVariable $sync.configs.tweaks -targetGridName "tweakspanel" -columncount 2
+Invoke-WPFUIElements -configVariable $sync.configs.feature -targetGridName "featurespanel" -columncount 2
+
 #===========================================================================
 # Store Form Objects In PowerShell
 #===========================================================================
 
 $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") {
@@ -408,7 +416,7 @@ $sync["SearchBar"].Add_TextChanged({
         # Retrieve the corresponding text block based on the generated name
         $textBlock = $sync[$textBlockName]
 
-        if ($CheckBox.Value.Content.ToLower().Contains($textToSearch)) {
+        if ($CheckBox.Value.Content.ToString().ToLower().Contains($textToSearch)) {
             $CheckBox.Value.Visibility = "Visible"
             $activeApplications += $sync.configs.applications.$checkboxName
             # Set the corresponding text block visibility
@@ -439,14 +447,18 @@ $sync["SearchBar"].Add_TextChanged({
     }
 })
 
+$sync["Form"].Add_Loaded({
+    param($e)
+    $sync["Form"].MaxWidth = [Double]::PositiveInfinity
+    $sync["Form"].MaxHeight = [Double]::PositiveInfinity
+})
+
 # Initialize the hashtable
 $winutildir = @{}
 
 # Set the path for the winutil directory
 $winutildir["path"] = "$env:LOCALAPPDATA\winutil\"
-if (-NOT (Test-Path -Path $winutildir["path"])) {
+[System.IO.Directory]::CreateDirectory("$winutildir") | Out-Null
-    New-Item -Path $winutildir["path"] -ItemType Directory
-}
 
 # Set the path for the logo and checkmark images
 $winutildir["logo.png"] = $winutildir["path"] + "cttlogo.png"
@@ -454,7 +466,6 @@ $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"]
 }

scripts/start.ps1

@@ -5,6 +5,7 @@
     GitHub         : https://github.com/ChrisTitusTech
     Version        : #{replaceme}
 #>
+
 param (
     [switch]$Debug,
     [string]$Config,
@@ -27,12 +28,6 @@ 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
@@ -46,8 +41,22 @@ $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'"
+    }
 
-    $script = if ($MyInvocation.MyCommand.Path) { "& '" + $MyInvocation.MyCommand.Path + "'" } else { "irm 'https://github.com/ChrisTitusTech/winutil/releases/latest/download/winutil.ps1' | iex"}
     $powershellcmd = if (Get-Command pwsh -ErrorAction SilentlyContinue) { "pwsh" } else { "powershell" }
     $processCmd = if (Get-Command wt.exe -ErrorAction SilentlyContinue) { "wt.exe" } else { $powershellcmd }
 
@@ -56,6 +65,12 @@ if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]:
     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 @@
         .EXAMPLE
         Invoke-Preprocessing -ThrowExceptionOnEmptyFilesList -WorkingDir "DRIVE:\Path\To\Folder\" -ExcludedFiles @('file.txt', '.\.git\', '*.png') -ProgressStatusMessage "Doing Preprocessing"
 
-        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).
+        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'.
 
         .EXAMPLE
         Invoke-Preprocessing -Skip -WorkingDir "DRIVE:\Path\To\Folder\" -ExcludedFiles @('file.txt', '.\.git\', '*.png') -ProgressStatusMessage "Doing Preprocessing"
@@ -73,21 +73,79 @@
     }
 
     $count = $ExcludedFiles.Count
-    if ((-NOT ($count -eq 0)) -AND (-NOT $SkipExcludedFilesValidation)) {
+
+    # 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) {
         for ($i = 0; $i -lt $count; $i++) {
             $excludedFile = $ExcludedFiles[$i]
             $filePath = "$(($WorkingDir -replace ('\\$', '')) + '\' + ($excludedFile -replace ('\.\\', '')))"
-            if (-NOT (Get-ChildItem -Recurse -Path "$filePath" -File)) {
+
+            # Handle paths with wildcards in a different implementation
+            $matches = ($filePath) -match '^.*?\*'
+
+            if ($matches) {
+                if (-NOT (Get-ChildItem -Recurse -Path "$filePath" -File -Force)) {
                     $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 & File Patterns were not found, you can use '-SkipExcludedFilesValidation' switch to skip this check, and the failed files are: $failedFilesList"
+            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"
         }
     }
 
-    $files = Get-ChildItem $WorkingDir -Recurse -Exclude $ExcludedFiles -File
+    # 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
     $numOfFiles = $files.Count
 
     if ($numOfFiles -eq 0) {
@@ -99,26 +157,11 @@
     }
 
     for ($i = 0; $i -lt $numOfFiles; $i++) {
-        $file = $files[$i]
+        $fullFileName = $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 "$file").TrimEnd() `
+        (Get-Content "$fullFileName").TrimEnd() `
             -replace ('\t', '    ') `
             -replace ('\)\s*\{', ') {') `
             -replace ('(?<keyword>if|for|foreach)\s*(?<condition>\([.*?]\))\s*\{', '${keyword} ${condition} {') `
@@ -129,8 +172,8 @@
             -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>\[.*?\])\s*(?<str_after_type>\$.*?(,|\s*\)))', '${parameter_type}${str_after_type}') `
+            -replace ('(?<parameter_type>\[[^$0-9]+\])\s*(?<str_after_type>\$.*?)', '${parameter_type}${str_after_type}') `
-        | Set-Content "$file"
+        | Set-Content "$fullFileName"
 
         Write-Progress -Activity $ProgressActivity -Status "$ProgressStatusMessage - Finished $i out of $numOfFiles" -PercentComplete (($i/$numOfFiles)*100)
     }

windev.ps1

@@ -12,18 +12,6 @@
     Run in Admin Powershell >  ./windev.ps1
 #>
 
-if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)) {
-    Write-Output "Winutil needs to be run as Administrator. Attempting to relaunch."
-
-    $script = if ($MyInvocation.MyCommand.Path) { "& '" + $MyInvocation.MyCommand.Path + "'" } else { "irm 'https://github.com/ChrisTitusTech/winutil/raw/main/windev.ps1' | iex"}
-    $powershellcmd = if (Get-Command pwsh -ErrorAction SilentlyContinue) { "pwsh" } else { "powershell" }
-    $processCmd = if (Get-Command wt.exe -ErrorAction SilentlyContinue) { "wt.exe" } else { $powershellcmd }
-
-    Start-Process $processCmd -ArgumentList "$powershellcmd -ExecutionPolicy Bypass -NoProfile -Command $script" -Verb RunAs
-
-    break
-}
-
 # Function to fetch the latest release tag from the GitHub API
 function Get-LatestRelease {
     try {
@@ -46,7 +34,20 @@ function RedirectToLatestPreRelease {
         Write-Host "Using latest Full Release"
         $url = "https://github.com/ChrisTitusTech/winutil/releases/latest/download/winutil.ps1"
     }
-    Invoke-RestMethod $url | Invoke-Expression
+
+    $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
+    }
 }
 
 # Call the redirect function

xaml/inputXML.xaml

@@ -9,7 +9,11 @@
         WindowStartupLocation="CenterScreen"
         UseLayoutRounding="True"
         WindowStyle="None"
-        Title="Chris Titus Tech's Windows Utility" Height="800" Width="1280">
+        Width="Auto"
+        Height="Auto"
+        MaxWidth="1280"
+        MaxHeight="800"
+        Title="Chris Titus Tech's Windows Utility">
     <WindowChrome.WindowChrome>
         <WindowChrome CaptionHeight="0" CornerRadius="10"/>
     </WindowChrome.WindowChrome>
@@ -213,7 +217,7 @@
                                 <Setter TargetName="BackgroundBorder" Property="Background" Value="{ButtonBackgroundMouseoverColor}"/>
                                 <Setter Property="Effect">
                                     <Setter.Value>
-                                        <DropShadowEffect Opacity="1" ShadowDepth="5" Color="Gold" Direction="-100" BlurRadius="45"/>
+                                        <DropShadowEffect Opacity="1" ShadowDepth="5" Color="{ButtonBackgroundMouseoverColor}" Direction="-100" BlurRadius="15"/>
                                     </Setter.Value>
                                 </Setter>
                                 <Setter Property="Panel.ZIndex" Value="2000"/>
@@ -224,7 +228,7 @@
                                 <Setter TargetName="BackgroundBorder" Property="Background" Value="{ButtonBackgroundSelectedColor}"/>
                                 <Setter Property="Effect">
                                     <Setter.Value>
-                                        <DropShadowEffect Opacity="1" ShadowDepth="2" Color="Gold" Direction="-111" BlurRadius="25"/>
+                                        <DropShadowEffect Opacity="1" ShadowDepth="2" Color="{ButtonBackgroundMouseoverColor}" Direction="-111" BlurRadius="10"/>
                                     </Setter.Value>
                                 </Setter>
                             </Trigger>
@@ -315,7 +319,7 @@
                                                 Margin="2"
                                                 SnapsToDevicePixels="True"/>
                                         <Path x:Name="CheckMark"
-                                              Stroke="{TemplateBinding Foreground}"
+                                              Stroke="{ToggleButtonOnColor}"
                                               StrokeThickness="2"
                                               Data="M 0 5 L 5 10 L 12 0"
                                               Visibility="Collapsed"/>
@@ -427,7 +431,11 @@
                                 Width="34" Height="17">
                             <Ellipse x:Name="Ellipse" Fill="{MainForegroundColor}" Stretch="Uniform"
                                     Margin="2,2,2,1"
-                                    HorizontalAlignment="Left" Width="12">
+                                    HorizontalAlignment="Left" Width="10.8"
+                                    RenderTransformOrigin="0.5, 0.5">
+                                <Ellipse.RenderTransform>
+                                    <ScaleTransform ScaleX="1" ScaleY="1" />
+                                </Ellipse.RenderTransform>
                             </Ellipse>
                         </Border>
                         </Grid>
@@ -438,12 +446,35 @@
                                 <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="{MainForegroundColor}" />
+                                <Setter TargetName="Border" Property="BorderBrush" Value="#707070" />
-                                <Setter TargetName="Ellipse" Property="Fill" Value="{MainForegroundColor}" />
+                                <Setter TargetName="Ellipse" Property="Fill" Value="#707070" />
-
                             </Trigger>
 
                             <Trigger Property="ToggleButton.IsChecked" Value="True">
@@ -662,10 +693,10 @@
             </ToggleButton>
             <Grid Background="{MainBackgroundColor}" ShowGridLines="False" Width="Auto" Height="Auto" HorizontalAlignment="Stretch">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="*"/> <!-- Main content area -->
-                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto"/> <!-- Space for options button -->
-                    <ColumnDefinition Width="50px"/>
+                    <ColumnDefinition Width="Auto"/> <!-- Space for close button -->
-                    <ColumnDefinition Width="50px"/>
+                    <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
 
                 <!--
@@ -695,7 +726,8 @@
                     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
@@ -707,7 +739,8 @@
                     VerticalAlignment="Center" HorizontalAlignment="Left"
                     Name="SearchBarClearButton"
                     Style="{StaticResource SearchBarClearButtonStyle}"
-                    Margin="210,0,0,0" Visibility="Collapsed"/>
+                    Margin="210,0,0,0" Visibility="Collapsed">
+                </Button>
 
                 <ProgressBar
                     Grid.Column="1"
@@ -746,7 +779,7 @@
                     FontSize="{SettingsIconFontSize}"
                     Width="{IconButtonSize}" Height="{IconButtonSize}"
                     HorizontalAlignment="Right" VerticalAlignment="Top"
-                    Margin="0,5,5,0"
+                    Margin="5,5,5,0"
                     FontFamily="Segoe MDL2 Assets"
                     Content="&#xE713;"/>
                 <Popup Grid.Column="2" Name="SettingsPopup"
@@ -755,8 +788,16 @@
                     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 FontSize="{ButtonFontSize}" Header="Import" Name="ImportMenuItem" Foreground="{MainForegroundColor}">
-                            <MenuItem FontSize="{ButtonFontSize}" Header="Export" Name="ExportMenuItem" 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>
                             <Separator/>
                             <MenuItem FontSize="{ButtonFontSize}" Header="About" Name="AboutMenuItem" Foreground="{MainForegroundColor}"/>
                             <MenuItem FontSize="{ButtonFontSize}" Header="Sponsors" Name="SponsorMenuItem" Foreground="{MainForegroundColor}"/>
@@ -787,11 +828,14 @@
                         <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" />
+                        <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="WPFclearWinget" Content=" Clear Selection" 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>
                     </StackPanel>
 
                     <ScrollViewer x:Name="scrollViewer" Grid.Row="1" Grid.Column="0" Margin="{TabContentMargin}" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"
@@ -824,7 +868,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="WPFclear" Content=" Clear " Margin="2"/>
+                                <Button Name="WPFClearTweaksSelection" Content=" Clear " Margin="2"/>
                                 <Button Name="WPFGetInstalledTweaks" Content=" Get Installed " Margin="2"/>
                             </StackPanel>
 
@@ -842,6 +886,12 @@
                             </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">
@@ -896,12 +946,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="{CheckBoxMargin}" />
+                            <CheckBox x:Name="WPFMicrowinDownloadFromGitHub" Content="Download oscdimg.exe from CTT Github repo" IsChecked="False" Margin="{MicrowinCheckBoxMargin}" />
                             <TextBlock Margin="5" Padding="1" TextWrapping="Wrap" Foreground="{ComboBoxForegroundColor}">
                                 Choose a Windows ISO file that you've downloaded <LineBreak/>
                                 Check the status in the console
                             </TextBlock>
-                            <CheckBox x:Name="WPFMicrowinISOScratchDir" Content="Use ISO directory for ScratchDir " IsChecked="False" Margin="{CheckBoxMargin}"
+                            <CheckBox x:Name="WPFMicrowinISOScratchDir" Content="Use ISO directory for ScratchDir " IsChecked="False" Margin="{MicrowinCheckBoxMargin}"
                                 ToolTip="Use ISO directory for ScratchDir " />
                             <Grid>
                             <Grid.ColumnDefinitions>
@@ -948,7 +998,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="-10,5,0,0" 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="{MicrowinCheckBoxMargin}" 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=""
@@ -957,9 +1007,9 @@
                                 Foreground="{LabelboxForegroundColor}"
                                 ToolTip="Path to unpacked drivers all sys and inf files for devices that need drivers"
                             />
-                            <CheckBox Name="MicrowinImportDrivers" Content="Import drivers from current system" Margin="{CheckBoxMargin}" IsChecked="False" ToolTip="Export all third-party drivers from your system and inject them to the MicroWin image"/>
+                            <CheckBox Name="MicrowinImportDrivers" Content="Import drivers from current system" Margin="{MicrowinCheckBoxMargin}" IsChecked="False" ToolTip="Export all third-party drivers from your system and inject them to the MicroWin image"/>
                             <Rectangle Fill="{MainForegroundColor}" Height="2" HorizontalAlignment="Stretch" Margin="0,10,0,10"/>
-                            <CheckBox Name="WPFMicrowinCopyToUsb" Content="Copy to Ventoy" Margin="{CheckBoxMargin}" IsChecked="False" ToolTip="Copy to USB disk with a label Ventoy"/>
+                            <CheckBox Name="WPFMicrowinCopyToUsb" Content="Copy to Ventoy" Margin="{MicrowinCheckBoxMargin}" 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>