Update pre-release.yaml

- removed run & undo button entrys from json
- added buttons back in form of fixed position.

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/feature_request.md

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

.github/PULL_REQUEST_TEMPLATE.md

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

.github/SECURITY.md

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

.github/release-drafter.yml

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

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

@@ -22,8 +22,8 @@ jobs:
         exempt-issue-labels: "Keep Issue Open"
         # Split it into two weeks, after one week the issue will be marked as stale,
         # after another week have pasted without any update.. the issue will then be closed.
-        days-before-issue-stale: 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,52 @@ jobs:
           name: winutil
           path: ./winutil.ps1
 
+      - name: Get latest release tag
+        id: get_latest_release
+        run: |
+          git fetch --tags --force
+          $latestTag = git for-each-ref --sort=-creatordate --format '%(refname:short)' refs/tags --count 1
+          if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrEmpty($latestTag)) {
+            Write-Error "Failed to get latest tag. Error code: $LASTEXITCODE"
+            exit 1
+          }
+          Write-Host "Latest tag: $latestTag"
+          echo "LATEST_TAG=$latestTag" >> $env:GITHUB_ENV
+        shell: pwsh
+
+      - name: Generate Release Notes
+        id: generate_notes
+        uses: release-drafter/release-drafter@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          config-name: release-drafter.yml
+          version: ${{ env.version }}
+          tag: ${{ env.LATEST_TAG }}
+
+      - name: Prepare Release Body
+        id: prepare_body
+        run: |
+          $newChanges = @'
+          ${{ steps.generate_notes.outputs.body }}
+          '@
+          $formattedChanges = "Changes since ${{ env.LATEST_TAG }}:`n`n$newChanges"
+          $encodedChanges = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($formattedChanges))
+          echo "body=$encodedChanges" >> $env:GITHUB_OUTPUT
+        shell: pwsh
+
       - name: Create and Upload Release
         id: create_release
         uses: softprops/action-gh-release@v2
         with:
-          tag_name: ${{ env.VERSION }}
+          tag_name: ${{ env.version }}
-          name: Pre-Release ${{ 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: |
+            ${{ '{{' }} fromJson(format('"{0}"', steps.prepare_body.outputs.body)) | base64decode {{ '}}' }}
+            
+            ![GitHub Downloads (specific asset, specific tag)](https://img.shields.io/github/downloads/ChrisTitusTech/winutil/${{ env.VERSION }}/winutil.ps1)
           append_body: false
           files: ./winutil.ps1
           prerelease: true
-          generate_release_notes: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Compile.ps1

@@ -65,35 +65,7 @@ Get-ChildItem "$workingdir\functions" -Recurse -File | ForEach-Object {
 Update-Progress "Adding: Config *.json" 40
 Get-ChildItem "$workingdir\config" | Where-Object {$psitem.extension -eq ".json"} | ForEach-Object {
     $json = (Get-Content $psitem.FullName).replace("'","''")
-
+    $jsonAsObject = $json | convertfrom-json
-    # Replace every XML Special Character so it'll render correctly in final build
-    # Only do so if json files has content to be displayed (for example the applications, tweaks, features json files)
-    # Make an Array List containing every name at first level of Json File
-    [PSCustomObject]$jsonAsObject = $json | convertfrom-json
-
-    # Remove properties like $schema and such from the json object (we don't need it at this point)
-    @(
-        "`$schema"
-    ) | ForEach-Object {
-        $jsonAsObject.PSObject.Properties.Remove($_) | Out-Null
-    }
-    
-    $firstLevelJsonList = [System.Collections.ArrayList]::new()
-    $jsonAsObject.PSObject.Properties.Name | ForEach-Object {$null = $firstLevelJsonList.Add($_)}
-    # Note:
-    #  Avoid using HTML Entity Codes, for example '”' (stands for "Right Double Quotation Mark"),
-    #  Use **HTML decimal/hex codes instead**, as using HTML Entity Codes will result in XML parse Error when running the compiled script.
-    for ($i = 0; $i -lt $firstLevelJsonList.Count; $i += 1) {
-        $firstLevelName = $firstLevelJsonList[$i]
-        if ($jsonAsObject.$firstLevelName.content -ne $null) {
-            $jsonAsObject.$firstLevelName.content = $jsonAsObject.$firstLevelName.content.replace('&','&#38;').replace('“','&#8220;').replace('”','&#8221;').replace("'",'&#39;').replace('<','&#60;').replace('>','&#62;').replace('—','&#8212;')
-            $jsonAsObject.$firstLevelName.content = $jsonAsObject.$firstLevelName.content.replace('&#39;&#39;',"&#39;") # resolves the Double Apostrophe caused by the first replace function in the main loop
-        }
-        if ($jsonAsObject.$firstLevelName.description -ne $null) {
-            $jsonAsObject.$firstLevelName.description = $jsonAsObject.$firstLevelName.description.replace('&','&#38;').replace('“','&#8220;').replace('”','&#8221;').replace("'",'&#39;').replace('<','&#60;').replace('>','&#62;').replace('—','&#8212;')
-            $jsonAsObject.$firstLevelName.description = $jsonAsObject.$firstLevelName.description.replace('&#39;&#39;',"&#39;") # resolves the Double Apostrophe caused by the first replace function in the main loop
-        }
-    }
 
     # Add 'WPFInstall' as a prefix to every entry-name in 'applications.json' file
     if ($psitem.Name -eq "applications.json") {

config/applications.json

@@ -1,5 +1,4 @@
 {
-    "$schema": "../schemas/config/applications.json",
     "1password": {
         "category": "Utilities",
         "choco": "1password",
@@ -88,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",
@@ -512,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",

config/dns.json

@@ -1,5 +1,4 @@
 {
-    "$schema": "../schemas/config/dns.json",
     "Google":{
         "Primary": "8.8.8.8",
         "Secondary": "8.8.4.4",

config/feature.json

@@ -1,5 +1,4 @@
 {
-  "$schema": "../schemas/config/feature.json",
   "WPFFeaturesdotnet": {
     "Content": "All .Net Framework (2,3,4)",
     "Description": ".NET and .NET Framework is a developer platform made up of tools, programming languages, and libraries for building many different types of applications.",

config/preset.json

@@ -1,5 +1,4 @@
 {
-  "$schema": "../schemas/config/preset.json",
   "Standard": [
     "WPFTweaksAH",
     "WPFTweaksConsumerFeatures",

config/themes.json

@@ -1,5 +1,4 @@
 {
-  "$schema": "../schemas/config/themes.json",
     "_default": {
         "CustomDialogFontSize":       "12",
         "CustomDialogFontSizeHeader": "14",

config/tweaks.json

@@ -1,5 +1,4 @@
 {
-  "$schema": "../schemas/config/tweaks.json",
   "WPFTweaksAH": {
     "Content": "Disable Activity History",
     "Description": "This erases recent docs, clipboard, and run history.",
@@ -2714,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\"
 
@@ -3400,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",

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) {
@@ -18,4 +20,4 @@ function Invoke-WinUtilGPU {
         }
     }
     return $true
-}
+}

functions/private/Invoke-WinUtilMicroWin-Helper.ps1

@@ -248,7 +248,7 @@ 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
     )
 

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"}

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-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
 

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)
                     }

schemas/config/applications.json

@@ -1,55 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "type": "object",
-  "definitions": {
-    "url": {
-      "type": "string",
-      "format": "uri"
-    }
-  },
-  "patternProperties": {
-    "^[a-zA-Z_][a-zA-Z0-9_]*$": {
-      "type": "object",
-      "properties": {
-        "content": {
-          "type": "string"
-        },
-        "description": {
-          "type": "string"
-        },
-        "category": {
-          "type": "string",
-          "enum": [
-            "Utilities",
-            "Document",
-            "Pro Tools",
-            "Multimedia Tools",
-            "Development",
-            "Games",
-            "Microsoft Tools",
-            "Browsers",
-            "Communications"
-          ]
-        },
-        "choco": {
-          "type": "string"
-        },
-        "winget": {
-          "type": "string"
-        },
-        "link": {
-          "$ref": "#/definitions/url"
-        }
-      },
-      "required": [
-        "content",
-        "description",
-        "category",
-        "link",
-        "choco",
-        "winget"
-      ],
-      "additionalProperties": false
-    }
-  }
-}

schemas/config/dns.json

@@ -1,29 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "type": "object",
-  "patternProperties": {
-    "^[a-zA-Z_][a-zA-Z0-9_]*$": {
-      "type": "object",
-      "properties": {
-        "Primary": {
-          "type": "string",
-          "format": "ipv4"
-        },
-        "Secondary": {
-          "type": "string",
-          "format": "ipv4"
-        },
-        "Primary6": {
-          "type": "string",
-          "format": "ipv6"
-        },
-        "Secondary6": {
-          "type": "string",
-          "format": "ipv6"
-        }
-      },
-      "required": ["Primary", "Secondary", "Primary6", "Secondary6"],
-      "additionalProperties": false
-    }
-  }
-}

schemas/config/feature.json

@@ -1,57 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "type": "object",
-  "patternProperties": {
-    "^[a-zA-Z_][a-zA-Z0-9_]*$": {
-      "type": "object",
-      "properties": {
-        "Content": {
-          "type": "string"
-        },
-        "Description": {
-          "type": "string"
-        },
-        "category": {
-          "type": "string",
-          "enum": ["Features", "Fixes", "Legacy Windows Panels"]
-        },
-        "panel": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "Order": {
-          "type": "string",
-          "pattern": "^[0-9a-f]+_$"
-        },
-        "feature": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "InvokeScript": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "UndoScript": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "Type": {
-          "type": "string",
-          "enum": ["Button"]
-        },
-        "ButtonWidth": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        }
-      },
-      "required": ["Content", "category", "panel"],
-      "additionalProperties": false
-    }
-  }
-}

schemas/config/preset.json

@@ -1,12 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "type": "object",
-  "patternProperties": {
-    "^[a-zA-Z_][a-zA-Z0-9_]*$": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      }
-    }
-  }
-}

schemas/config/themes.json

@@ -1,297 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "color": {
-      "type": "string",
-      "pattern": "^Transparent|(#[0-9A-Fa-f]{6})$"
-    },
-    "decimal": {
-      "type": "string",
-      "pattern": "^\\d+(\\.\\d+)?$"
-    }
-  },
-  "type": "object",
-  "patternProperties": {
-    "^[a-zA-Z_][a-zA-Z0-9_]*$": {
-      "type": "object",
-      "properties": {
-        "CustomDialogFontSize": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "CustomDialogFontSizeHeader": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "CustomDialogIconSize": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "CustomDialogWidth": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "CustomDialogHeight": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "FontSize": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "FontFamily": {
-          "type": "string"
-        },
-        "FontSizeHeading": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "HeaderFontFamily": {
-          "type": "string"
-        },
-        "CheckBoxBulletDecoratorFontSize": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "CheckBoxMargin": {
-          "type": "string"
-        },
-        "TabButtonFontSize": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "TabButtonWidth": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "TabButtonHeight": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "TabRowHeightInPixels": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "IconFontSize": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "IconButtonSize": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "WinUtilIconSize": {
-          "type": "string"
-        },
-        "SettingsIconFontSize": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "MicroWinLogoSize": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "ProgressBarForegroundColor": {
-          "$ref": "#/definitions/color"
-        },
-        "ProgressBarBackgroundColor": {
-          "$ref": "#/definitions/color"
-        },
-        "ProgressBarTextColor": {
-          "$ref": "#/definitions/color"
-        },
-        "ComboBoxBackgroundColor": {
-          "$ref": "#/definitions/color"
-        },
-        "LabelboxForegroundColor": {
-          "$ref": "#/definitions/color"
-        },
-        "MainForegroundColor": {
-          "$ref": "#/definitions/color"
-        },
-        "MainBackgroundColor": {
-          "$ref": "#/definitions/color"
-        },
-        "LabelBackgroundColor": {
-          "$ref": "#/definitions/color"
-        },
-        "LinkForegroundColor": {
-          "$ref": "#/definitions/color"
-        },
-        "LinkHoverForegroundColor": {
-          "$ref": "#/definitions/color"
-        },
-        "GroupBorderBackgroundColor": {
-          "$ref": "#/definitions/color"
-        },
-        "ComboBoxForegroundColor": {
-          "$ref": "#/definitions/color"
-        },
-        "ButtonFontSize": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "ButtonFontFamily": {
-          "type": "string"
-        },
-        "ButtonWidth": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "ButtonHeight": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "ConfigTabButtonFontSize": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "SearchBarWidth": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "SearchBarHeight": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "SearchBarTextBoxFontSize": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "SearchBarClearButtonFontSize": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "ButtonInstallBackgroundColor": {
-          "$ref": "#/definitions/color"
-        },
-        "ButtonTweaksBackgroundColor": {
-          "$ref": "#/definitions/color"
-        },
-        "ButtonConfigBackgroundColor": {
-          "$ref": "#/definitions/color"
-        },
-        "ButtonUpdatesBackgroundColor": {
-          "$ref": "#/definitions/color"
-        },
-        "ButtonInstallForegroundColor": {
-          "$ref": "#/definitions/color"
-        },
-        "ButtonTweaksForegroundColor": {
-          "$ref": "#/definitions/color"
-        },
-        "ButtonConfigForegroundColor": {
-          "$ref": "#/definitions/color"
-        },
-        "ButtonUpdatesForegroundColor": {
-          "$ref": "#/definitions/color"
-        },
-        "ButtonBackgroundColor": {
-          "$ref": "#/definitions/color"
-        },
-        "ButtonBackgroundPressedColor": {
-          "$ref": "#/definitions/color"
-        },
-        "CheckboxMouseOverColor": {
-          "$ref": "#/definitions/color"
-        },
-        "ButtonBackgroundMouseoverColor": {
-          "$ref": "#/definitions/color"
-        },
-        "ButtonBackgroundSelectedColor": {
-          "$ref": "#/definitions/color"
-        },
-        "ButtonForegroundColor": {
-          "$ref": "#/definitions/color"
-        },
-        "ToggleButtonOnColor": {
-          "$ref": "#/definitions/color"
-        },
-        "ButtonBorderThickness": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "ButtonMargin": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "ButtonCornerRadius": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "BorderColor": {
-          "$ref": "#/definitions/color"
-        },
-        "BorderOpacity": {
-          "$ref": "#/definitions/decimal"
-        },
-        "ShadowPulse": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "CustomDialogFontSize",
-        "CustomDialogFontSizeHeader",
-        "CustomDialogIconSize",
-        "CustomDialogWidth",
-        "CustomDialogHeight",
-        "FontSize",
-        "FontFamily",
-        "FontSizeHeading",
-        "HeaderFontFamily",
-        "CheckBoxBulletDecoratorFontSize",
-        "CheckBoxMargin",
-        "TabButtonFontSize",
-        "TabButtonWidth",
-        "TabButtonHeight",
-        "TabRowHeightInPixels",
-        "IconFontSize",
-        "IconButtonSize",
-        "WinUtilIconSize",
-        "SettingsIconFontSize",
-        "MicroWinLogoSize",
-        "ProgressBarForegroundColor",
-        "ProgressBarBackgroundColor",
-        "ProgressBarTextColor",
-        "ComboBoxBackgroundColor",
-        "LabelboxForegroundColor",
-        "MainForegroundColor",
-        "MainBackgroundColor",
-        "LabelBackgroundColor",
-        "LinkForegroundColor",
-        "LinkHoverForegroundColor",
-        "ComboBoxForegroundColor",
-        "ButtonFontSize",
-        "ButtonFontFamily",
-        "ButtonWidth",
-        "ButtonHeight",
-        "ConfigTabButtonFontSize",
-        "SearchBarWidth",
-        "SearchBarHeight",
-        "SearchBarTextBoxFontSize",
-        "SearchBarClearButtonFontSize",
-        "ButtonInstallBackgroundColor",
-        "ButtonTweaksBackgroundColor",
-        "ButtonConfigBackgroundColor",
-        "ButtonUpdatesBackgroundColor",
-        "ButtonInstallForegroundColor",
-        "ButtonTweaksForegroundColor",
-        "ButtonConfigForegroundColor",
-        "ButtonUpdatesForegroundColor",
-        "ButtonBackgroundColor",
-        "ButtonBackgroundPressedColor",
-        "ButtonBackgroundMouseoverColor",
-        "ButtonBackgroundSelectedColor",
-        "ButtonForegroundColor",
-        "ToggleButtonOnColor",
-        "ButtonBorderThickness",
-        "ButtonMargin",
-        "ButtonCornerRadius",
-        "BorderColor",
-        "BorderOpacity",
-        "ShadowPulse"
-      ],
-      "additionalProperties": false
-    }
-  }
-}

schemas/config/tweaks.json

@@ -1,121 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "type": "object",
-  "definitions": {
-    "toggle-state": {
-      "type": "string",
-      "enum": ["Enabled", "Disabled"]
-    }
-  },
-  "patternProperties": {
-    "^[a-zA-Z_][a-zA-Z0-9_]*$": {
-      "type": "object",
-      "properties": {
-        "Content": {
-          "type": "string"
-        },
-        "Description": {
-          "type": "string"
-        },
-        "category": {
-          "type": "string",
-          "enum": [
-            "Essential Tweaks",
-            "Performance Plans",
-            "Customize Preferences",
-            "z__Advanced Tweaks - CAUTION",
-            "Shortcuts"
-          ]
-        },
-        "panel": {
-          "type": "string",
-          "pattern": "^\\d+$"
-        },
-        "Order": {
-          "type": "string",
-          "pattern": "^[0-9a-f]+_$"
-        },
-        "registry": {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "properties": {
-              "Path": {
-                "type": "string"
-              },
-              "Name": {
-                "type": "string"
-              },
-              "Type": {
-                "type": "string"
-              },
-              "Value": {
-                "type": "string"
-              },
-              "OriginalValue": {
-                "type": "string"
-              }
-            },
-            "required": ["Path", "Name", "Type", "Value", "OriginalValue"]
-          }
-        },
-        "service": {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "properties": {
-              "Name": {
-                "type": "string"
-              },
-              "StartupType": {
-                "type": "string"
-              },
-              "OriginalType": {
-                "type": "string"
-              }
-            },
-            "required": ["Name", "StartupType", "OriginalType"]
-          }
-        },
-        "appx": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "ScheduledTask": {
-          "type":"array",
-          "items": {
-            "type": "object",
-            "properties": {
-              "Name": {
-                "type": "string"
-              },
-              "State": {
-                "$ref": "#/definitions/toggle-state"
-              },
-              "OriginalState": {
-                "$ref": "#/definitions/toggle-state"
-              }
-            },
-            "required": ["Name", "State", "OriginalState"]
-          }
-        },
-        "InvokeScript": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "UndoScript": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        }
-      },
-      "required": ["Content", "Description", "category", "panel", "Order"],
-      "additionalProperties": false
-    }
-  }
-}

scripts/main.ps1

@@ -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,6 +104,12 @@ 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
 #===========================================================================

scripts/start.ps1

@@ -27,11 +27,11 @@ if ($Run) {
     $PARAM_RUN = $true
 }
 
-if (!(Test-Path -Path $ENV:TEMP)) {
+$dateTime = Get-Date -Format "yyyy-MM-dd_HH-mm-ss"
-    New-Item -ItemType Directory -Force -Path $ENV:TEMP
-}
 
-Start-Transcript $ENV:TEMP\Winutil.log -Append
+$logdir = "$env:localappdata\winutil\logs"
+[System.IO.Directory]::CreateDirectory("$logdir")
+Start-Transcript -Path "$logdir\winutil_$dateTime.log" -Append
 
 # Load DLLs
 Add-Type -AssemblyName PresentationFramework

xaml/inputXML.xaml

@@ -315,7 +315,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 +427,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 +442,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">
@@ -787,11 +814,11 @@
                         <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"/>
                     </StackPanel>
 
                     <ScrollViewer x:Name="scrollViewer" Grid.Row="1" Grid.Column="0" Margin="{TabContentMargin}" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"
@@ -842,6 +869,20 @@
                             </Border>
                         </Grid>
                     </ScrollViewer>
+                    <Border Grid.Row="1" Background="{MainBackgroundColor}" BorderBrush="{BorderColor}" BorderThickness="1" CornerRadius="5" HorizontalAlignment="Stretch" Padding="10">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="1*" />
+                                <ColumnDefinition Width="1*" />
+                            </Grid.ColumnDefinitions>
+
+                            <!-- Buttons on the left half -->
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Grid.Column="0">
+                                <Button Name="WPFTweaksbutton" Content="Run Tweaks" Margin="5"/>
+                                <Button Name="WPFUndoall" Content="Undo Selected Tweaks" Margin="5"/>
+                            </StackPanel>
+                        </Grid>
+                    </Border>
                 </Grid>
             </TabItem>
             <TabItem Header="Config" Visibility="Collapsed" Name="WPFTab3">