Use here-strings for JSON in Compile.ps1 (#2816)

* Use here-strings for JSON in Compile.ps1

- Change Compile.ps1 to use here-strings with JSON, similar to my changes to Xaml being ingested using here-strings.

* Slight changes.

- Modifications, allowing for the removal of all .replace() functions in JSON handler.
- Changed formatting of here-string on line 91 -> 89 to prevent accidental double in winutil.ps1 (Doesn't cause an issue, but looks better.)
- Added here-string to 95 -> 93 (This allowed the removal of the final .replace())

* Added comment.

- Added comment to line 90.

.github/CONTRIBUTING.md

@@ -1,117 +0,0 @@
-# How to Contribute?
-
-## Testing
-
-* Test the latest changes to WinUtil by running the pre-release and reporting issues you are encountering to help us continually improve WinUtil!
-
-#### **Run the latest pre-release**
-   ```ps1
-   irm christitus.com/windev | iex
-   ```
-
-!!! bug "Keep in mind"
-
-     This is a pre-release and should be treated as such. It exists for developers to test the utility and report or fix bugs before they get added to the stable release. Don't use it in production!
-
-## Issues
-
-* If you encounter any challenges or problems with the script, I kindly request that you submit them via the "Issues" tab on the GitHub repository. By filling out the provided template, you can provide specific details about the issue, allowing me (and others in the community) to promptly address any bugs or consider feature requests.
-
-## Contribute Code
-
-* Pull requests are now handled directly on the **MAIN branch**. This was done since we can now select specific releases to launch via releases in GitHub.
-
-* If you're doing code changes, then you can submit a PR to `main` branch, but I am very selective about these.
-
-!!! warning "Important"
-
-     Do not use a code formatter, make massive amounts of line changes, or make multiple feature changes. EACH FEATURE CHANGE SHOULD BE IT'S OWN PULL REQUEST!
-
-* When creating pull requests, it is essential to thoroughly document all changes made. This includes, but is not limited to, documenting any additions made to the `tweaks` section and corresponding `undo tweak`, so users are able to remove the newly added tweaks if necessary, and comprehensive documentation is required for all code changes. Document your changes and briefly explain why you made your changes in your Pull Request Description. Failure to adhere to this format may result in the denial of the pull request. Additionally, any code lacking sufficient documentation may also be denied.
-
-* By following these guidelines, we can maintain a high standard of quality and ensure that the codebase remains organized and well-documented.
-
-!!! note
-
-     When creating a function, please include "WPF" or "WinUtil" in the file name so it can be loaded into the runspace.
-
-## Walk through
-
-* This is a guide for beginners. If you are still having issues, look at the following official GitHub documentation:
-    * [Commit through WEB](https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/about-commits)
-    * [Commit through GitHub Desktop](https://docs.github.com/en/desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project-in-github-desktop#about-commits)
-    * [Create a Pull Request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request)
-
-
-### Overview
-
-``` mermaid
-%%{init: {"flowchart": {"curve": "cardinal"}} }%%
-graph TD
-  A[Fork Project] --> B[Clone Repository];
-  B --> C[Create New Branch];
-  C --> D[Make Changes];
-  D --> G[Test Changes];
-  G --> H{Tests Passed?};
-  H -->|Yes| E[Commit Changes];
-  H -->|No| J[Fix Issues];
-  J --> G;
-  E --> F[Push Branch];
-  F --> K[Create Pull Request];
-  K --> L[Fill out PR template];
-  classDef default stroke:#333,stroke-width:4px,font-size:12pt;
-```
-!!! info
-
-     This is a diagram to guide you through the process. It may vary depending on the type of change you're making.
-
-### Fork the Repo
-* Fork the WinUtil Repository [here](https://github.com/ChrisTitusTech/winutil) to create a copy that will be available in your repository list.
-
-![Fork Image](assets/Fork-Button-Dark.png#only-dark)
-
-![Fork Image](assets/Fork-Button-Light.png#only-light)
-
-### Clone the Fork
-!!! tip
-
-     While you can make your changes directly through the Web, we recommend cloning the repo to your device using the application GitHub Desktop (available in WinUtil) to test your fork easily.
-
-* Install GitHub Desktop if it is not already installed.
-* Log in using the same GitHub account you used to fork WinUtil.
-* Choose the fork under "Your Repositories" and press "clone {repo name}"
-* Create a new branch and name it something relatable to your changes.
-
-* Now you can modify WinUtil to your liking using your preferred text editor.
-
-
-### Testing your changes
-
-* To test to see if your changes work as intended run following commands in a powershell teminal as admin:
-
-* Change the directory where you are running the commands to the forked project.
-* `cd {path to the folder with the compile.ps1}`
-* Run the following command to compile and run WinUtil:
-* `.\Compile.ps1 -run`
-
-![Compile](assets/Compile.png)
-
-* After seeing that your changes work properly, feel free to commit the changes to the repository and make a PR. For help on that, follow the documentation below.
-
-### Committing the changes
-* Before committing your changes, please discard changes made to the `winutil.ps1` file, like the following:
-
-![Push Commit Image](assets/Discard-GHD.png)
-
-* Now, commit your changes once you are happy with the result.
-
-![Commit Image](assets/Commit-GHD.png)
-
-* Push the changes to upload them to your fork on github.com.
-
-![Push Commit Image](assets/Push-Commit.png)
-
-### Making a PR
-* To make a PR on your repo under a new branch linking to the main branch, a button will show and say Preview and Create pull request. Click that button and fill in all the information that is provided on the template. Once all the information is filled in correctly, check your PR to make sure there is not a WinUtil.ps1 file attached to the PR. Once everything is good, make the PR and wait for Chris (the maintainer) to accept or deny your PR. Once it is accepted by Chris, you will be able to see your changes in the "/windev" build.
-* If you do not see your feature in the main "/win" build, that is fine. All new changes go into the /windev build to make sure everything is working OK before going fully public.
-* Congratulations! You just submitted your first PR. Thank you so much for contributing to WinUtil.

.github/mkdocs.yml

@@ -11,6 +11,9 @@ nav:
       - Known Issues: 'KnownIssues.md'
   - FAQ: 'faq.md'
 
+not_in_nav: |
+  dev/
+
 theme:
   name: material
   custom_dir: '../overrides'

.github/release-drafter.yml

@@ -19,10 +19,6 @@ template: |
 
   $CHANGES
 
-  ## Contributors
-
-  $CONTRIBUTORS
-
 change-title-escapes: '\<*_&"'''
 autolabeler:
   - label: 'documentation'

.github/workflows/close-issue-command.yaml

@@ -15,18 +15,33 @@ jobs:
       contents: read
 
     steps:
-      - name: Check for /close comment
-        id: check_comment
+      - run: echo "command=false" >> $GITHUB_ENV
+
+      - name: Check for /close command
+        id: check_close_command
         run: |
           if [[ "${{ contains(github.event.comment.body, '/close') }}" == "true" ]]; then
-            echo "comment=true" >> $GITHUB_ENV
+            echo "command=true" >> $GITHUB_ENV
+            echo "close_command=true" >> $GITHUB_ENV
+            echo "reopen_command=false" >> $GITHUB_ENV
           else
-            echo "comment=false" >> $GITHUB_ENV
+            echo "close_command=false" >> $GITHUB_ENV
+          fi
+
+      - name: Check for /open or /reopen command
+        id: check_reopen_command
+        run: |
+          if [[ "${{ contains(github.event.comment.body, '/open') }}" == "true" ]] || [[ "${{ contains(github.event.comment.body, '/reopen') }}" == "true" ]]; then
+            echo "command=true" >> $GITHUB_ENV
+            echo "reopen_command=true" >> $GITHUB_ENV
+            echo "close_command=false" >> $GITHUB_ENV
+          else
+            echo "reopen_command=false" >> $GITHUB_ENV
           fi
 
       - name: Check if the user is allowed
         id: check_user
-        if: env.comment == 'true'
+        if: env.command == 'true'
         run: |
           ALLOWED_USERS=("ChrisTitusTech" "og-mrk" "Marterich" "MyDrift-user" "Real-MullaC")
           if [[ " ${ALLOWED_USERS[@]} " =~ " ${{ github.event.comment.user.login }} " ]]; then
@@ -36,10 +51,23 @@ jobs:
           fi
 
       - name: Close issue if conditions are met
-        if: env.comment == 'true' && env.user == 'true'
+        if: env.close_command == 'true' && env.user == 'true'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           ISSUE_NUMBER: ${{ github.event.issue.number }}
         run: |
           echo Closing the issue...
-          gh issue close $ISSUE_NUMBER --repo ${{ github.repository }}
+          if [[ "${{ contains(github.event.comment.body, 'not planned') }}" == "true" ]]; then
+            gh issue close $ISSUE_NUMBER --repo ${{ github.repository }} --reason 'not planned'
+          else
+            gh issue close $ISSUE_NUMBER --repo ${{ github.repository }}
+          fi
+
+      - name: Reopen issue if conditions are met
+        if: env.reopen_command == 'true' && env.user == 'true'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ISSUE_NUMBER: ${{ github.event.issue.number }}
+        run: |
+          echo Reopening the issue...
+          gh issue reopen $ISSUE_NUMBER --repo ${{ github.repository }}

Compile.ps1

@@ -73,8 +73,8 @@ Get-ChildItem "functions" -Recurse -File | ForEach-Object {
     }
 Update-Progress "Adding: Config *.json" 40
 Get-ChildItem "config" | Where-Object {$psitem.extension -eq ".json"} | ForEach-Object {
-    $json = (Get-Content $psitem.FullName).replace("'","''")
-    $jsonAsObject = $json | convertfrom-json
+    $json = (Get-Content $psitem.FullName -Raw)
+    $jsonAsObject = $json | ConvertFrom-Json
 
     # Add 'WPFInstall' as a prefix to every entry-name in 'applications.json' file
     if ($psitem.Name -eq "applications.json") {
@@ -85,12 +85,13 @@ Get-ChildItem "config" | Where-Object {$psitem.extension -eq ".json"} | ForEach-
         }
     }
 
-    # The replace at the end is required, as without it the output of 'converto-json' will be somewhat weird for Multiline Strings
-    # Most Notably is the scripts in some json files, making it harder for users who want to review these scripts, which're found in the compiled script
-    $json = ($jsonAsObject | convertto-json -Depth 3).replace('\r\n',"`r`n")
+    # Line 90 requires no whitespace inside the here-strings, to keep formatting of the JSON in the final script.
+    $json = @"
+$($jsonAsObject | ConvertTo-Json -Depth 3)
+"@
 
-    $sync.configs.$($psitem.BaseName) = $json | convertfrom-json
-    $script_content.Add($(Write-output "`$sync.configs.$($psitem.BaseName) = '$json' `| convertfrom-json" ))
+    $sync.configs.$($psitem.BaseName) = $json | ConvertFrom-Json
+    $script_content.Add($(Write-Output "`$sync.configs.$($psitem.BaseName) = @'`n$json`n'@ `| ConvertFrom-Json" ))
 }
 
 # Read the entire XAML file as a single string, preserving line breaks

config/applications.json

@@ -2855,14 +2855,6 @@
         "link": "https://www.kicad.org/",
         "winget": "KiCad.KiCad"
     },
-    "FormatFactory": {
-        "category": "Utilities",
-        "choco": "formatfactory",
-        "content": "Format Factory",
-        "description":"FormatFactory is an ad-supported freeware multimedia converter that can convert video, audio, and picture files. It is also capable of ripping DVDs and CDs to other file formats, as well as creating .iso images. It can also join multiple video files together into one.",
-        "link": "http://www.pcfreetime.com/formatfactory/",
-        "winget": "na"
-    },
     "dropox": {
         "category": "Utilities",
         "choco": "na",

config/dns.json

@@ -46,5 +46,23 @@
         "Secondary": "94.140.15.16",
         "Primary6": "2a10:50c0::bad1:ff",
         "Secondary6": "2a10:50c0::bad2:ff"
+    },
+    "dns0.eu_Open":{
+        "Primary": "193.110.81.254",
+        "Secondary": "185.253.5.254",
+        "Primary6": "2a0f:fc80::ffff",
+        "Secondary6": "2a0f:fc81::ffff"
+    },
+    "dns0.eu_ZERO":{
+        "Primary": "193.110.81.9",
+        "Secondary": "185.253.5.9",
+        "Primary6": "2a0f:fc80::9",
+        "Secondary6": "2a0f:fc81::9"
+    },
+    "dns0.eu_KIDS":{
+        "Primary": "193.110.81.1",
+        "Secondary": "185.253.5.1",
+        "Primary6": "2a0f:fc80::1",
+        "Secondary6": "2a0f:fc81::1"
     }
 }

config/feature.json

@@ -313,5 +313,13 @@
     "Order": "a083_",
     "Type": "Button",
     "ButtonWidth": "300"
-  }
+  },
+  "WPFWinUtilSSHServer": {
+    "Content": "Enable OpenSSH Server",
+    "category": "Remote Access",
+    "panel": "2",
+    "Order": "a084_",
+    "Type": "Button",
+    "ButtonWidth": "300"
+  },
 }

config/themes.json

@@ -1,82 +1,44 @@
 {
-    "_default": {
+    "shared":{
         "CustomDialogFontSize":       "12",
         "CustomDialogFontSizeHeader": "14",
         "CustomDialogIconSize":       "25",
         "CustomDialogWidth":          "400",
         "CustomDialogHeight":         "200",
-
         "FontSize":         "12",
         "FontFamily":       "Arial",
         "FontSizeHeading":  "16",
         "HeaderFontFamily": "Consolas, Monaco",
-
         "CheckBoxBulletDecoratorSize": "14",
         "CheckBoxMargin": "15,0,0,2",
-
         "TabContentMargin":       "5",
         "TabButtonFontSize":      "14",
-        "TabButtonWidth":         "100",
-        "TabButtonHeight":        "25",
+        "TabButtonWidth":         "110",
+        "TabButtonHeight":        "26",
         "TabRowHeightInPixels":   "50",
         "IconFontSize":     "14",
         "IconButtonSize":   "35",
-        "WinUtilIconSize":        "Auto",
         "SettingsIconFontSize":   "18",
         "CloseIconFontSize":      "18",
-
         "MicroWinLogoSize": "10",
         "MicrowinCheckBoxMargin": "-10,5,0,0",
-
-        "ProgressBarForegroundColor": "#2e77ff",
-        "ProgressBarBackgroundColor": "Transparent",
-        "ProgressBarTextColor": "#232629",
-
-        "ComboBoxBackgroundColor":  "#F7F7F7",
-        "LabelboxForegroundColor":  "#232629",
-        "MainForegroundColor":  "#232629",
-        "MainBackgroundColor":  "#F7F7F7",
-        "LabelBackgroundColor":  "#F7F7F7",
-        "LinkForegroundColor":  "#232629",
-        "LinkHoverForegroundColor":  "#232629",
         "GroupBorderBackgroundColor":  "#232629",
-        "ComboBoxForegroundColor":  "#232629",
-
         "ButtonFontSize":   "12",
         "ButtonFontFamily": "Arial",
         "ButtonWidth":      "200",
         "ButtonHeight":     "25",
         "ConfigTabButtonFontSize":      "16",
-
         "SearchBarWidth":               "200",
-        "SearchBarHeight":              "25",
+        "SearchBarHeight":              "26",
         "SearchBarTextBoxFontSize":     "12",
         "SearchBarClearButtonFontSize": "14",
-
-        "ButtonInstallBackgroundColor":  "#F7F7F7",
-        "ButtonTweaksBackgroundColor":  "#F7F7F7",
-        "ButtonConfigBackgroundColor":  "#F7F7F7",
-        "ButtonUpdatesBackgroundColor":  "#F7F7F7",
-        "ButtonInstallForegroundColor":  "#232629",
-        "ButtonTweaksForegroundColor":  "#232629",
-        "ButtonConfigForegroundColor":  "#232629",
-        "ButtonUpdatesForegroundColor":  "#232629",
-        "ButtonBackgroundColor":  "#F5F5F5",
-        "ButtonBackgroundPressedColor":  "#1A1A1A",
         "CheckboxMouseOverColor": "#999999",
-        "ButtonBackgroundMouseoverColor":  "#C2C2C2",
-        "ButtonBackgroundSelectedColor":  "#F0F0F0",
-        "ButtonForegroundColor":  "#232629",
-        "ToggleButtonOnColor":  "#2e77ff",
-
         "ButtonBorderThickness":  "1",
         "ButtonMargin":  "1",
-        "ButtonCornerRadius": "2",
-        "BorderColor": "#232629",
-        "BorderOpacity": "0.2",
-        "ShadowPulse": "Forever"
+        "ButtonCornerRadius": "2"
     },
-    "Classic": {
+    "Light": {
+        "ComboBoxForegroundColor":  "#232629",
         "ComboBoxBackgroundColor":  "#F7F7F7",
         "LabelboxForegroundColor":  "#232629",
         "MainForegroundColor":  "#232629",
@@ -84,9 +46,13 @@
         "LabelBackgroundColor":  "#F7F7F7",
         "LinkForegroundColor":  "#232629",
         "LinkHoverForegroundColor":  "#232629",
-        "GroupBorderBackgroundColor":  "#232629",
-        "ComboBoxForegroundColor":  "#232629",
+        "ScrollBarBackgroundColor": "#4A4D52",
+        "ScrollBarHoverColor": "#5A5D62",
+        "ScrollBarDraggingColor": "#6A6D72",
 
+        "ProgressBarForegroundColor": "#2e77ff",
+        "ProgressBarBackgroundColor": "Transparent",
+        "ProgressBarTextColor": "#232629",
         "ButtonInstallBackgroundColor":  "#F7F7F7",
         "ButtonTweaksBackgroundColor":  "#F7F7F7",
         "ButtonConfigBackgroundColor":  "#F7F7F7",
@@ -97,26 +63,31 @@
         "ButtonUpdatesForegroundColor":  "#232629",
         "ButtonBackgroundColor":  "#F5F5F5",
         "ButtonBackgroundPressedColor":  "#1A1A1A",
-        "CheckboxMouseOverColor": "#999999",
         "ButtonBackgroundMouseoverColor":  "#C2C2C2",
         "ButtonBackgroundSelectedColor":  "#F0F0F0",
         "ButtonForegroundColor":  "#232629",
-        "ToggleButtonOnColor":  "#2e77ff"
+        "ToggleButtonOnColor":  "#2e77ff",
+        "ToggleButtonOffColor": "#707070",
+        "BorderColor": "#232629",
+        "BorderOpacity": "0.2"
+
     },
-    "Matrix": {
-        "ComboBoxBackgroundColor":  "#232629",
-        "LabelboxForegroundColor":  "#81a1c1",
+    "Dark": {
+        "ComboBoxForegroundColor":  "#F7F7F7",
+        "ComboBoxBackgroundColor":  "#1E3747",
+        "LabelboxForegroundColor":  "#0567ff",
         "MainForegroundColor":  "#F7F7F7",
         "MainBackgroundColor":  "#232629",
         "LabelBackgroundColor":  "#232629",
         "LinkForegroundColor":  "#add8e6",
         "LinkHoverForegroundColor":  "#F7F7F7",
-        "ComboBoxForegroundColor":  "#81a1c1",
+        "ScrollBarBackgroundColor": "#2E3135",
+        "ScrollBarHoverColor": "#3B4252",
+        "ScrollBarDraggingColor": "#5E81AC",
 
         "ProgressBarForegroundColor": "#222222",
         "ProgressBarBackgroundColor": "Transparent",
         "ProgressBarTextColor": "#cccccc",
-
         "ButtonInstallBackgroundColor":  "#222222",
         "ButtonTweaksBackgroundColor":  "#333333",
         "ButtonConfigBackgroundColor":  "#444444",
@@ -130,41 +101,9 @@
         "ButtonBackgroundMouseoverColor":  "#3B4252",
         "ButtonBackgroundSelectedColor":  "#5E81AC",
         "ButtonForegroundColor":  "#F7F7F7",
-        "ToggleButtonOnColor":  "#2e77ff",
-
-        "BorderColor": "#0060CC",
-        "BorderOpacity": "0.2",
-        "ShadowPulse": "0:0:3"
-    },
-    "Dark": {
-        "ComboBoxBackgroundColor":  "#232629",
-        "LabelboxForegroundColor":  "#81a1c1",
-        "MainForegroundColor":  "#F7F7F7",
-        "MainBackgroundColor":  "#232629",
-        "LabelBackgroundColor":  "#232629",
-        "LinkForegroundColor":  "#add8e6",
-        "LinkHoverForegroundColor":  "#F7F7F7",
-        "ComboBoxForegroundColor":  "#81a1c1",
-
-        "ProgressBarForegroundColor": "#222222",
-        "ProgressBarBackgroundColor": "Transparent",
-        "ProgressBarTextColor": "#cccccc",
-
-        "ButtonInstallBackgroundColor": "#222222",
-        "ButtonTweaksBackgroundColor":  "#333333",
-        "ButtonConfigBackgroundColor":  "#444444",
-        "ButtonUpdatesBackgroundColor": "#555555",
-        "ButtonInstallForegroundColor": "#F7F7F7",
-        "ButtonTweaksForegroundColor":  "#F7F7F7",
-        "ButtonConfigForegroundColor":  "#F7F7F7",
-        "ButtonUpdatesForegroundColor": "#F7F7F7",
-        "ButtonBackgroundColor":  "#1E3747",
-        "ButtonBackgroundPressedColor":   "#00CFFF",
-        "ButtonBackgroundMouseoverColor": "#5E81AC",
-        "ButtonBackgroundSelectedColor":  "#5E81AC",
-        "ButtonForegroundColor":  "#F7F7F7",
-        "ToggleButtonOnColor":    "#2e77ff",
-
-        "BorderColor": "#0b1215"
+        "ToggleButtonOnColor": "#2e77ff",
+        "ToggleButtonOffColor": "#707070",
+        "BorderColor": "#2F373D",
+        "BorderOpacity": "0.2"
     }
 }

config/tweaks.json

@@ -1600,13 +1600,6 @@
         "Value": "0",
         "OriginalValue": "1"
       },
-      {
-        "Path": "HKLM:\\SOFTWARE\\Policies\\Microsoft\\Edge",
-        "Name": "EdgeEnhanceImagesEnabled",
-        "Type": "DWord",
-        "Value": "0",
-        "OriginalValue": "1"
-      },
       {
         "Path": "HKLM:\\SOFTWARE\\Policies\\Microsoft\\Edge",
         "Name": "PersonalizationReportingEnabled",
@@ -1656,13 +1649,6 @@
         "Value": "0",
         "OriginalValue": "1"
       },
-      {
-        "Path": "HKLM:\\SOFTWARE\\Policies\\Microsoft\\Edge",
-        "Name": "EdgeFollowEnabled",
-        "Type": "DWord",
-        "Value": "0",
-        "OriginalValue": "1"
-      },
       {
         "Path": "HKLM:\\SOFTWARE\\Policies\\Microsoft\\Edge",
         "Name": "EdgeShoppingAssistantEnabled",
@@ -1726,13 +1712,6 @@
         "Value": "0",
         "OriginalValue": "1"
       },
-      {
-        "Path": "HKLM:\\SOFTWARE\\Policies\\Microsoft\\Edge",
-        "Name": "ConfigureDoNotTrack",
-        "Type": "DWord",
-        "Value": "1",
-        "OriginalValue": "0"
-      },
       {
         "Path": "HKLM:\\SOFTWARE\\Policies\\Microsoft\\Edge",
         "Name": "WalletDonationEnabled",
@@ -2430,12 +2409,6 @@
     "Order": "a001_",
     "InvokeScript": [
       "
-        # Check if the user has administrative privileges
-        if (-Not ([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)) {
-            Write-Host \"Please run this script as an administrator.\"
-            return
-        }
-
         # Check if System Restore is enabled for the main drive
         try {
             # Try getting restore points to check if System Restore is enabled
@@ -2690,72 +2663,72 @@
       }
       # Check if OneDrive got Uninstalled
       if (-not (Test-Path $regPath)) {
-      Write-Host \"Copy downloaded Files from the OneDrive Folder to Root UserProfile\"
-      Start-Process -FilePath powershell -ArgumentList \"robocopy '$($OneDrivePath)' '$($env:USERPROFILE.TrimEnd())\\' /mov /e /xj\" -NoNewWindow -Wait
+        Write-Host \"Copy downloaded Files from the OneDrive Folder to Root UserProfile\"
+        Start-Process -FilePath powershell -ArgumentList \"robocopy '$($OneDrivePath)' '$($env:USERPROFILE.TrimEnd())\\' /mov /e /xj\" -NoNewWindow -Wait
 
-      Write-Host \"Removing OneDrive leftovers\"
-      Remove-Item -Recurse -Force -ErrorAction SilentlyContinue \"$env:localappdata\\Microsoft\\OneDrive\"
-      Remove-Item -Recurse -Force -ErrorAction SilentlyContinue \"$env:localappdata\\OneDrive\"
-      Remove-Item -Recurse -Force -ErrorAction SilentlyContinue \"$env:programdata\\Microsoft OneDrive\"
-      Remove-Item -Recurse -Force -ErrorAction SilentlyContinue \"$env:systemdrive\\OneDriveTemp\"
-      reg delete \"HKEY_CURRENT_USER\\Software\\Microsoft\\OneDrive\" -f
-      # check if directory is empty before removing:
-      If ((Get-ChildItem \"$OneDrivePath\" -Recurse | Measure-Object).Count -eq 0) {
-          Remove-Item -Recurse -Force -ErrorAction SilentlyContinue \"$OneDrivePath\"
-      }
+        Write-Host \"Removing OneDrive leftovers\"
+        Remove-Item -Recurse -Force -ErrorAction SilentlyContinue \"$env:localappdata\\Microsoft\\OneDrive\"
+        Remove-Item -Recurse -Force -ErrorAction SilentlyContinue \"$env:localappdata\\OneDrive\"
+        Remove-Item -Recurse -Force -ErrorAction SilentlyContinue \"$env:programdata\\Microsoft OneDrive\"
+        Remove-Item -Recurse -Force -ErrorAction SilentlyContinue \"$env:systemdrive\\OneDriveTemp\"
+        reg delete \"HKEY_CURRENT_USER\\Software\\Microsoft\\OneDrive\" -f
+        # check if directory is empty before removing:
+        If ((Get-ChildItem \"$OneDrivePath\" -Recurse | Measure-Object).Count -eq 0) {
+            Remove-Item -Recurse -Force -ErrorAction SilentlyContinue \"$OneDrivePath\"
+        }
 
-      Write-Host \"Remove Onedrive from explorer sidebar\"
-      Set-ItemProperty -Path \"HKCR:\\CLSID\\{018D5C66-4533-4307-9B53-224DE2ED1FE6}\" -Name \"System.IsPinnedToNameSpaceTree\" -Value 0
-      Set-ItemProperty -Path \"HKCR:\\Wow6432Node\\CLSID\\{018D5C66-4533-4307-9B53-224DE2ED1FE6}\" -Name \"System.IsPinnedToNameSpaceTree\" -Value 0
+        Write-Host \"Remove Onedrive from explorer sidebar\"
+        Set-ItemProperty -Path \"HKCR:\\CLSID\\{018D5C66-4533-4307-9B53-224DE2ED1FE6}\" -Name \"System.IsPinnedToNameSpaceTree\" -Value 0
+        Set-ItemProperty -Path \"HKCR:\\Wow6432Node\\CLSID\\{018D5C66-4533-4307-9B53-224DE2ED1FE6}\" -Name \"System.IsPinnedToNameSpaceTree\" -Value 0
 
-      Write-Host \"Removing run hook for new users\"
-      reg load \"hku\\Default\" \"C:\\Users\\Default\\NTUSER.DAT\"
-      reg delete \"HKEY_USERS\\Default\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run\" /v \"OneDriveSetup\" /f
-      reg unload \"hku\\Default\"
+        Write-Host \"Removing run hook for new users\"
+        reg load \"hku\\Default\" \"C:\\Users\\Default\\NTUSER.DAT\"
+        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 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\"
+        Write-Host \"Removing startmenu entry\"
+        Remove-Item -Force -ErrorAction SilentlyContinue \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\Start Menu\\Programs\\OneDrive.lnk\"
 
-      Write-Host \"Removing scheduled task\"
-      Get-ScheduledTask -TaskPath '\\' -TaskName 'OneDrive*' -ea SilentlyContinue | Unregister-ScheduledTask -Confirm:$false
+        Write-Host \"Removing scheduled task\"
+        Get-ScheduledTask -TaskPath '\\' -TaskName 'OneDrive*' -ea SilentlyContinue | Unregister-ScheduledTask -Confirm:$false
 
-      # Add Shell folders restoring default locations
-      Write-Host \"Shell Fixing\"
-      Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"AppData\" -Value \"$env:userprofile\\AppData\\Roaming\" -Type ExpandString
-      Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Cache\" -Value \"$env:userprofile\\AppData\\Local\\Microsoft\\Windows\\INetCache\" -Type ExpandString
-      Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Cookies\" -Value \"$env:userprofile\\AppData\\Local\\Microsoft\\Windows\\INetCookies\" -Type ExpandString
-      Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Favorites\" -Value \"$env:userprofile\\Favorites\" -Type ExpandString
-      Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"History\" -Value \"$env:userprofile\\AppData\\Local\\Microsoft\\Windows\\History\" -Type ExpandString
-      Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Local AppData\" -Value \"$env:userprofile\\AppData\\Local\" -Type ExpandString
-      Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"My Music\" -Value \"$env:userprofile\\Music\" -Type ExpandString
-      Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"My Video\" -Value \"$env:userprofile\\Videos\" -Type ExpandString
-      Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"NetHood\" -Value \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\Network Shortcuts\" -Type ExpandString
-      Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"PrintHood\" -Value \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\Printer Shortcuts\" -Type ExpandString
-      Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Programs\" -Value \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\Start Menu\\Programs\" -Type ExpandString
-      Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Recent\" -Value \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\Recent\" -Type ExpandString
-      Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"SendTo\" -Value \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\SendTo\" -Type ExpandString
-      Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Start Menu\" -Value \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\Start Menu\" -Type ExpandString
-      Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Startup\" -Value \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\Start Menu\\Programs\\Startup\" -Type ExpandString
-      Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Templates\" -Value \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\Templates\" -Type ExpandString
-      Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"{374DE290-123F-4565-9164-39C4925E467B}\" -Value \"$env:userprofile\\Downloads\" -Type ExpandString
-      Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Desktop\" -Value \"$env:userprofile\\Desktop\" -Type ExpandString
-      Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"My Pictures\" -Value \"$env:userprofile\\Pictures\" -Type ExpandString
-      Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Personal\" -Value \"$env:userprofile\\Documents\" -Type ExpandString
-      Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"{F42EE2D3-909F-4907-8871-4C22FC0BF756}\" -Value \"$env:userprofile\\Documents\" -Type ExpandString
-      Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"{0DDD015D-B06C-45D5-8C4C-F59713854639}\" -Value \"$env:userprofile\\Pictures\" -Type ExpandString
-      Write-Host \"Restarting explorer\"
-      taskkill.exe /F /IM \"explorer.exe\"
-      Start-Process \"explorer.exe\"
+        # Add Shell folders restoring default locations
+        Write-Host \"Shell Fixing\"
+        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"AppData\" -Value \"$env:userprofile\\AppData\\Roaming\" -Type ExpandString
+        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Cache\" -Value \"$env:userprofile\\AppData\\Local\\Microsoft\\Windows\\INetCache\" -Type ExpandString
+        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Cookies\" -Value \"$env:userprofile\\AppData\\Local\\Microsoft\\Windows\\INetCookies\" -Type ExpandString
+        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Favorites\" -Value \"$env:userprofile\\Favorites\" -Type ExpandString
+        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"History\" -Value \"$env:userprofile\\AppData\\Local\\Microsoft\\Windows\\History\" -Type ExpandString
+        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Local AppData\" -Value \"$env:userprofile\\AppData\\Local\" -Type ExpandString
+        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"My Music\" -Value \"$env:userprofile\\Music\" -Type ExpandString
+        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"My Video\" -Value \"$env:userprofile\\Videos\" -Type ExpandString
+        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"NetHood\" -Value \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\Network Shortcuts\" -Type ExpandString
+        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"PrintHood\" -Value \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\Printer Shortcuts\" -Type ExpandString
+        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Programs\" -Value \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\Start Menu\\Programs\" -Type ExpandString
+        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Recent\" -Value \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\Recent\" -Type ExpandString
+        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"SendTo\" -Value \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\SendTo\" -Type ExpandString
+        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Start Menu\" -Value \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\Start Menu\" -Type ExpandString
+        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Startup\" -Value \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\Start Menu\\Programs\\Startup\" -Type ExpandString
+        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Templates\" -Value \"$env:userprofile\\AppData\\Roaming\\Microsoft\\Windows\\Templates\" -Type ExpandString
+        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"{374DE290-123F-4565-9164-39C4925E467B}\" -Value \"$env:userprofile\\Downloads\" -Type ExpandString
+        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Desktop\" -Value \"$env:userprofile\\Desktop\" -Type ExpandString
+        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"My Pictures\" -Value \"$env:userprofile\\Pictures\" -Type ExpandString
+        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"Personal\" -Value \"$env:userprofile\\Documents\" -Type ExpandString
+        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"{F42EE2D3-909F-4907-8871-4C22FC0BF756}\" -Value \"$env:userprofile\\Documents\" -Type ExpandString
+        Set-ItemProperty -Path \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\" -Name \"{0DDD015D-B06C-45D5-8C4C-F59713854639}\" -Value \"$env:userprofile\\Pictures\" -Type ExpandString
+        Write-Host \"Restarting explorer\"
+        taskkill.exe /F /IM \"explorer.exe\"
+        Start-Process \"explorer.exe\"
 
-      Write-Host \"Waiting for explorer to complete loading\"
-      Write-Host \"Please Note - The OneDrive folder at $OneDrivePath may still have items in it. You must manually delete it, but all the files should already be copied to the base user folder.\"
-      Write-Host \"If there are Files missing afterwards, please Login to Onedrive.com and Download them manually\" -ForegroundColor Yellow
-      Start-Sleep 5
+        Write-Host \"Waiting for explorer to complete loading\"
+        Write-Host \"Please Note - The OneDrive folder at $OneDrivePath may still have items in it. You must manually delete it, but all the files should already be copied to the base user folder.\"
+        Write-Host \"If there are Files missing afterwards, please Login to Onedrive.com and Download them manually\" -ForegroundColor Yellow
+        Start-Sleep 5
       } else {
-      Write-Host \"Something went Wrong during the Unistallation of OneDrive\" -ForegroundColor Red
+        Write-Host \"Something went Wrong during the Unistallation of OneDrive\" -ForegroundColor Red
       }
       "
     ],
@@ -2767,6 +2740,48 @@
     ],
     "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveOnedrive"
   },
+  "WPFTweaksRazerBlock": {
+    "Content": "Block Razer Software Installs",
+    "Description": "Blocks ALL Razer Software installations. The hardware works fine without any software.",
+    "category": "z__Advanced Tweaks - CAUTION",
+    "panel": "1",
+    "Order": "a031_",
+    "registry": [
+      {
+        "Path": "HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\DriverSearching",
+        "Name": "SearchOrderConfig",
+        "Value": "0",
+        "OriginalValue": "1",
+        "Type": "DWord"
+      },
+      {
+        "Path": "HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Device Installer",
+        "Name": "DisableCoInstallers",
+        "Value": "1",
+        "OriginalValue": "0",
+        "Type": "DWord"
+      }
+    ],
+    "InvokeScript": [
+      "
+          $RazerPath = \"C:\\Windows\\Installer\\Razer\"
+          Remove-Item $RazerPath -Recurse -Force
+          New-Item -Path \"C:\\Windows\\Installer\\\" -Name \"Razer\" -ItemType \"directory\"
+          $Acl = Get-Acl $RazerPath
+          $Ar = New-Object System.Security.AccessControl.FileSystemAccessRule(\"NT AUTHORITY\\SYSTEM\",\"Write\",\"ContainerInherit,ObjectInherit\",\"None\",\"Deny\")
+          $Acl.SetAccessRule($Ar)
+          Set-Acl $RazerPath $Acl
+      "
+    ],
+    "UndoScript": [
+      "
+          $RazerPath = \"C:\\Windows\\Installer\\Razer\"
+          Remove-Item $RazerPath -Recurse -Force
+          New-Item -Path \"C:\\Windows\\Installer\\\" -Name \"Razer\" -ItemType \"directory\"
+      "
+    ],
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/RazerBlock"
+  },
   "WPFTweaksDisableNotifications": {
     "Content": "Disable Notification Tray/Calendar",
     "Description": "Disables all Notifications INCLUDING Calendar",
@@ -3399,7 +3414,7 @@
     "panel": "1",
     "Order": "a040_",
     "Type": "Combobox",
-    "ComboItems": "Default DHCP Google Cloudflare Cloudflare_Malware Cloudflare_Malware_Adult Open_DNS Quad9 AdGuard_Ads_Trackers AdGuard_Ads_Trackers_Malware_Adult",
+    "ComboItems": "Default DHCP Google Cloudflare Cloudflare_Malware Cloudflare_Malware_Adult Open_DNS Quad9 AdGuard_Ads_Trackers AdGuard_Ads_Trackers_Malware_Adult dns0.eu_Open dns0.eu_ZERO dns0.eu_KIDS",
     "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/changedns"
   },
   "WPFAddUltPerf": {

docs/contribute.md

@@ -1,3 +1,117 @@
---8<-- ".github/CONTRIBUTING.md"
+# How to Contribute?
 
-<!-- The content is sourced from "CONTRIBUTING.md," located in the root directory of the project. -->
+## Testing
+
+* Test the latest changes to WinUtil by running the pre-release and reporting issues you are encountering to help us continually improve WinUtil!
+
+#### **Run the latest pre-release**
+   ```ps1
+   irm christitus.com/windev | iex
+   ```
+
+!!! bug "Keep in mind"
+
+     This is a pre-release and should be treated as such. It exists for developers to test the utility and report or fix bugs before they get added to the stable release. Don't use it in production!
+
+## Issues
+
+* If you encounter any challenges or problems with the script, I kindly request that you submit them via the "Issues" tab on the GitHub repository. By filling out the provided template, you can provide specific details about the issue, allowing me (and others in the community) to promptly address any bugs or consider feature requests.
+
+## Contribute Code
+
+* Pull requests are now handled directly on the **MAIN branch**. This was done since we can now select specific releases to launch via releases in GitHub.
+
+* If you're doing code changes, then you can submit a PR to `main` branch, but I am very selective about these.
+
+!!! warning "Important"
+
+     Do not use a code formatter, make massive amounts of line changes, or make multiple feature changes. EACH FEATURE CHANGE SHOULD BE IT'S OWN PULL REQUEST!
+
+* When creating pull requests, it is essential to thoroughly document all changes made. This includes, but is not limited to, documenting any additions made to the `tweaks` section and corresponding `undo tweak`, so users are able to remove the newly added tweaks if necessary, and comprehensive documentation is required for all code changes. Document your changes and briefly explain why you made your changes in your Pull Request Description. Failure to adhere to this format may result in the denial of the pull request. Additionally, any code lacking sufficient documentation may also be denied.
+
+* By following these guidelines, we can maintain a high standard of quality and ensure that the codebase remains organized and well-documented.
+
+!!! note
+
+     When creating a function, please include "WPF" or "WinUtil" in the file name so it can be loaded into the runspace.
+
+## Walk through
+
+* This is a guide for beginners. If you are still having issues, look at the following official GitHub documentation:
+    * [Commit through WEB](https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/about-commits)
+    * [Commit through GitHub Desktop](https://docs.github.com/en/desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project-in-github-desktop#about-commits)
+    * [Create a Pull Request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request)
+
+
+### Overview
+
+``` mermaid
+%%{init: {"flowchart": {"curve": "cardinal"}} }%%
+graph TD
+  A[Fork Project] --> B[Clone Repository];
+  B --> C[Create New Branch];
+  C --> D[Make Changes];
+  D --> G[Test Changes];
+  G --> H{Tests Passed?};
+  H -->|Yes| E[Commit Changes];
+  H -->|No| J[Fix Issues];
+  J --> G;
+  E --> F[Push Branch];
+  F --> K[Create Pull Request];
+  K --> L[Fill out PR template];
+  classDef default stroke:#333,stroke-width:4px,font-size:12pt;
+```
+!!! info
+
+     This is a diagram to guide you through the process. It may vary depending on the type of change you're making.
+
+### Fork the Repo
+* Fork the WinUtil Repository [here](https://github.com/ChrisTitusTech/winutil) to create a copy that will be available in your repository list.
+
+![Fork Image](assets/Fork-Button-Dark.png#only-dark#gh-dark-mode-only)
+
+![Fork Image](assets/Fork-Button-Light.png#only-light#gh-light-mode-only)
+
+### Clone the Fork
+!!! tip
+
+     While you can make your changes directly through the Web, we recommend cloning the repo to your device using the application GitHub Desktop (available in WinUtil) to test your fork easily.
+
+* Install GitHub Desktop if it is not already installed.
+* Log in using the same GitHub account you used to fork WinUtil.
+* Choose the fork under "Your Repositories" and press "clone {repo name}"
+* Create a new branch and name it something relatable to your changes.
+
+* Now you can modify WinUtil to your liking using your preferred text editor.
+
+
+### Testing your changes
+
+* To test to see if your changes work as intended run following commands in a powershell teminal as admin:
+
+* Change the directory where you are running the commands to the forked project.
+* `cd {path to the folder with the compile.ps1}`
+* Run the following command to compile and run WinUtil:
+* `.\Compile.ps1 -run`
+
+![Compile](assets/Compile.png)
+
+* After seeing that your changes work properly, feel free to commit the changes to the repository and make a PR. For help on that, follow the documentation below.
+
+### Committing the changes
+* Before committing your changes, please discard changes made to the `winutil.ps1` file, like the following:
+
+![Push Commit Image](assets/Discard-GHD.png)
+
+* Now, commit your changes once you are happy with the result.
+
+![Commit Image](assets/Commit-GHD.png)
+
+* Push the changes to upload them to your fork on github.com.
+
+![Push Commit Image](assets/Push-Commit.png)
+
+### Making a PR
+* To make a PR on your repo under a new branch linking to the main branch, a button will show and say Preview and Create pull request. Click that button and fill in all the information that is provided on the template. Once all the information is filled in correctly, check your PR to make sure there is not a WinUtil.ps1 file attached to the PR. Once everything is good, make the PR and wait for Chris (the maintainer) to accept or deny your PR. Once it is accepted by Chris, you will be able to see your changes in the "/windev" build.
+* If you do not see your feature in the main "/win" build, that is fine. All new changes go into the /windev build to make sure everything is working OK before going fully public.
+* Congratulations! You just submitted your first PR. Thank you so much for contributing to WinUtil.

docs/userguide.md

@@ -34,8 +34,9 @@
     * 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)
+![Install Image](assets/Install-Tab-Dark.png#only-dark#gh-dark-mode-only)
+![Install Image](assets/Install-Tab-Light.png#only-light#gh-light-mode-only)
+
 !!! tip
 
      If you have trouble finding an application, press `ctrl + f` and search the name of it. Applications will filter depending on your input.
@@ -43,8 +44,8 @@
 ## Tweaks
 ---
 
-![Tweaks Image](assets/Tweaks-Tab-Dark.png#only-dark)
-![Tweaks Image](assets/Tweaks-Tab-Light.png#only-light)
+![Tweaks Image](assets/Tweaks-Tab-Dark.png#only-dark#gh-dark-mode-only)
+![Tweaks Image](assets/Tweaks-Tab-Light.png#only-light#gh-light-mode-only)
 
 ### Run Tweaks
 * **Open Tweaks Tab**: Navigate to the 'Tweaks' tab in the application.
@@ -141,6 +142,10 @@ Open old-school Windows panels directly from WinUtil. Following Panels are avail
 * System Properties
 * User Accounts
 
+### Remote Access
+
+Enables OpenSSH server on your windows machine.
+
 ## Updates
 ---
 
@@ -175,8 +180,8 @@ The utility provides three distinct settings for managing Windows updates: Defau
 
 * **MicroWin** lets you customize your Windows 10 and 11 installation images by debloating them however you want.
 
-![Microwin](assets/Microwin-Dark.png#only-dark)
-![Microwin](assets/Microwin-Light.png#only-light)
+![Microwin](assets/Microwin-Dark.png#only-dark#gh-dark-mode-only)
+![Microwin](assets/Microwin-Light.png#only-light#gh-light-mode-only)
 
 #### Basic usage
 
@@ -234,12 +239,12 @@ With MicroWin, you can also configure your user before proceeding if you don't w
 * Some features are available through automation. This allows you to save your config file, pass it to WinUtil, walk away and come back to a finished system. Here is how you can set it up currently with Winutil >24.01.15
 
 * On the Install Tab, click "Get Installed", this will get all installed apps **supported by Winutil** on the system.
-![GetInstalled](assets/Get-Installed-Dark.png#only-dark)
-![GetInstalled](assets/Get-Installed-Light.png#only-light)
+![GetInstalled](assets/Get-Installed-Dark.png#only-dark#gh-dark-mode-only)
+![GetInstalled](assets/Get-Installed-Light.png#only-light#gh-light-mode-only)
 
 * Click on the Settings cog in the upper right corner and choose Export. Choose file file and location; this will export the setting file.
-![SettingsExport](assets/Settings-Export-Dark.png#only-dark)
-![SettingsExport](assets/Settings-Export-Light.png#only-light)
+![SettingsExport](assets/Settings-Export-Dark.png#only-dark#gh-dark-mode-only)
+![SettingsExport](assets/Settings-Export-Light.png#only-light#gh-light-mode-only)
 
 * Copy this file to a USB or somewhere you can use it after Windows installation.
 

functions/private/ConvertTo-Icon.ps1

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

functions/private/Get-WinUtilToggleStatus.ps1

@@ -16,136 +16,72 @@ Function Get-WinUtilToggleStatus {
     if($ToggleSwitch -eq "WPFToggleDarkMode") {
         $app = (Get-ItemProperty -path 'HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize').AppsUseLightTheme
         $system = (Get-ItemProperty -path 'HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize').SystemUsesLightTheme
-        if($app -eq 0 -and $system -eq 0) {
-            return $true
-        } else {
-            return $false
-        }
+        return $app -eq 0 -and $system -eq 0
     }
     if($ToggleSwitch -eq "WPFToggleBingSearch") {
         $bingsearch = (Get-ItemProperty -path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Search').BingSearchEnabled
-        if($bingsearch -eq 0) {
-            return $false
-        } else {
-            return $true
-        }
+        return $bingsearch -ne 0
     }
     if($ToggleSwitch -eq "WPFToggleNumLock") {
         $numlockvalue = (Get-ItemProperty -path 'HKCU:\Control Panel\Keyboard').InitialKeyboardIndicators
-        if($numlockvalue -eq 2) {
-            return $true
-        } else {
-            return $false
-        }
+        return $numlockvalue -eq 2
     }
     if($ToggleSwitch -eq "WPFToggleVerboseLogon") {
         $VerboseStatusvalue = (Get-ItemProperty -path 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System').VerboseStatus
-        if($VerboseStatusvalue -eq 1) {
-            return $true
-        } else {
-            return $false
-        }
+        return $VerboseStatusvalue -eq 1
     }
     if($ToggleSwitch -eq "WPFToggleShowExt") {
         $hideextvalue = (Get-ItemProperty -path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced').HideFileExt
-        if($hideextvalue -eq 0) {
-            return $true
-        } else {
-            return $false
-        }
+        return $hideextvalue -eq 0
     }
     if($ToggleSwitch -eq "WPFToggleSnapWindow") {
         $hidesnap = (Get-ItemProperty -path 'HKCU:\Control Panel\Desktop').WindowArrangementActive
-        if($hidesnap -eq 0) {
-            return $false
-        } else {
-            return $true
-        }
+        return $hidesnap -ne 0
     }
     if($ToggleSwitch -eq "WPFToggleSnapFlyout") {
         $hidesnap = (Get-ItemProperty -path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced').EnableSnapAssistFlyout
-        if($hidesnap -eq 0) {
-            return $false
-        } else {
-            return $true
-        }
+        return $hidesnap -ne 0
     }
     if($ToggleSwitch -eq "WPFToggleSnapSuggestion") {
         $hidesnap = (Get-ItemProperty -path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced').SnapAssist
-        if($hidesnap -eq 0) {
-            return $false
-        } else {
-            return $true
-        }
+        return $hidesnap -ne 0
     }
     if($ToggleSwitch -eq "WPFToggleMouseAcceleration") {
         $MouseSpeed = (Get-ItemProperty -path 'HKCU:\Control Panel\Mouse').MouseSpeed
         $MouseThreshold1 = (Get-ItemProperty -path 'HKCU:\Control Panel\Mouse').MouseThreshold1
         $MouseThreshold2 = (Get-ItemProperty -path 'HKCU:\Control Panel\Mouse').MouseThreshold2
 
-        if($MouseSpeed -eq 1 -and $MouseThreshold1 -eq 6 -and $MouseThreshold2 -eq 10) {
-            return $true
-        } else {
-            return $false
-        }
+        return $MouseSpeed -eq 1 -and $MouseThreshold1 -eq 6 -and $MouseThreshold2 -eq 10
     }
     if($ToggleSwitch -eq "WPFToggleTaskbarSearch") {
         $SearchButton = (Get-ItemProperty -path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Search").SearchboxTaskbarMode
-        if($SearchButton -eq 0) {
-            return $false
-        } else {
-            return $true
-        }
+        return $SearchButton -ne 0
     }
     if ($ToggleSwitch -eq "WPFToggleStickyKeys") {
         $StickyKeys = (Get-ItemProperty -path 'HKCU:\Control Panel\Accessibility\StickyKeys').Flags
-        if($StickyKeys -eq 58) {
-            return $false
-        } else {
-            return $true
-        }
+        return $StickyKeys -ne 58
     }
     if ($ToggleSwitch -eq "WPFToggleTaskView") {
         $TaskView = (Get-ItemProperty -path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced').ShowTaskViewButton
-        if($TaskView -eq 0) {
-            return $false
-        } else {
-            return $true
-        }
+        return $TaskView -ne 0
     }
 
     if ($ToggleSwitch -eq "WPFToggleHiddenFiles") {
         $HiddenFiles = (Get-ItemProperty -path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced').Hidden
-        if($HiddenFiles -eq 0) {
-            return $false
-        } else {
-            return $true
-        }
+        return $HiddenFiles -ne 0
     }
 
     if ($ToggleSwitch -eq "WPFToggleTaskbarWidgets") {
         $TaskbarWidgets = (Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced").TaskBarDa
-        if($TaskbarWidgets -eq 0) {
-            return $false
-        } else {
-            return $true
-        }
+        return $TaskbarWidgets -ne 0
     }
     if ($ToggleSwitch -eq "WPFToggleTaskbarAlignment") {
         $TaskbarAlignment = (Get-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced").TaskbarAl
-        if($TaskbarAlignment -eq 0) {
-            return $false
-        } else {
-            return $true
-        }
+        return $TaskbarAlignment -ne 0
     }
     if ($ToggleSwitch -eq "WPFToggleDetailedBSoD") {
         $DetailedBSoD1 = (Get-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\CrashControl').DisplayParameters
         $DetailedBSoD2 = (Get-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\CrashControl').DisableEmoticon
-        if (($DetailedBSoD1 -eq 0) -or ($DetailedBSoD2 -eq 0) -or !$DetailedBSoD1 -or !$DetailedBSoD2) {
-            return $false
-        } else {
-            return $true
-        }
+        return !(($DetailedBSoD1 -eq 0) -or ($DetailedBSoD2 -eq 0) -or !$DetailedBSoD1 -or !$DetailedBSoD2)
     }
 }

functions/private/Install-WinUtilChoco.ps1

@@ -13,10 +13,11 @@ function Install-WinUtilChoco {
         if((Test-WinUtilPackageManager -choco) -eq "installed") {
             return
         }
-
+        # Install logic taken from https://chocolatey.org/install#individual
         Write-Host "Seems Chocolatey is not installed, installing now."
-        Start-Process -FilePath "powershell" -ArgumentList "Set-ExecutionPolicy Bypass -Scope Process -Force; Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) -ErrorAction Stop" -Wait -NoNewWindow
-        Start-Process -FilePath "powershell" -ArgumentList "choco feature enable -n allowGlobalConfirmation" -Wait -NoNewWindow
+        Set-ExecutionPolicy Bypass -Scope Process -Force;
+        [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072;
+        Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
 
     } catch {
         Write-Host "===========================================" -Foregroundcolor Red

functions/private/Invoke-WinUtilAssets.ps1

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

functions/private/Invoke-WinUtilDarkMode.ps1

@@ -21,6 +21,11 @@ Function Invoke-WinUtilDarkMode {
         $Path = "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize"
         Set-ItemProperty -Path $Path -Name AppsUseLightTheme -Value $DarkMoveValue
         Set-ItemProperty -Path $Path -Name SystemUsesLightTheme -Value $DarkMoveValue
+        Invoke-WinUtilExplorerRefresh
+        # Update Winutil Theme if the Theme Button shows the Icon for Auto
+        if ($sync.ThemeButton.Content -eq [char]0xF08C) {
+            Invoke-WinutilThemeChange -theme "Auto"
+        }
     } catch [System.Security.SecurityException] {
         Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
     } catch [System.Management.Automation.ItemNotFoundException] {

functions/private/Invoke-WinUtilExplorerRefresh.ps1

@@ -0,0 +1,33 @@
+function Invoke-WinUtilExplorerRefresh {
+    <#
+    .SYNOPSIS
+        Refreshes the Windows Explorer
+    #>
+
+    Invoke-WPFRunspace -DebugPreference $DebugPreference -ScriptBlock {
+        # Send the WM_SETTINGCHANGE message to all windows
+        Add-Type -TypeDefinition @"
+using System;
+using System.Runtime.InteropServices;
+public class Win32 {
+    [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = false)]
+    public static extern IntPtr SendMessageTimeout(
+        IntPtr hWnd,
+        uint Msg,
+        IntPtr wParam,
+        string lParam,
+        uint fuFlags,
+        uint uTimeout,
+        out IntPtr lpdwResult);
+}
+"@
+
+        $HWND_BROADCAST = [IntPtr]0xffff
+        $WM_SETTINGCHANGE = 0x1A
+        $SMTO_ABORTIFHUNG = 0x2
+        $timeout = 100
+
+        # Send the broadcast message to all windows
+        [Win32]::SendMessageTimeout($HWND_BROADCAST, $WM_SETTINGCHANGE, [IntPtr]::Zero, "ImmersiveColorSet", $SMTO_ABORTIFHUNG, $timeout, [ref]([IntPtr]::Zero))
+    }
+}

functions/private/Invoke-WinUtilMicroWin-Helper.ps1

@@ -25,6 +25,56 @@ function Test-CompatibleImage() {
     }
 }
 
+function Get-FidoLangFromCulture {
+
+    param (
+        [Parameter(Mandatory, Position = 0)] [string]$langName
+    )
+
+    switch -Wildcard ($langName)
+    {
+        "ar*" { return "Arabic" }
+        "pt-BR" { return "Brazilian Portuguese" }
+        "bg*" { return "Bulgarian" }
+        {($_ -eq "zh-CH") -or ($_ -like "zh-Hans*") -or ($_ -eq "zh-SG") -or ($_ -eq "zh-CHS")} { return "Chinese (Simplified)" }
+        {($_ -eq "zh") -or ($_ -eq "zh-Hant") -or ($_ -eq "zh-HK") -or ($_ -eq "zh-MO") -or ($_ -eq "zh-TW") -or ($_ -eq "zh-CHT")} { return "Chinese (Traditional)" }
+        "hr*" { return "Croatian" }
+        "cs*" { return "Czech" }
+        "da*" { return "Danish" }
+        "nl*" { return "Dutch" }
+        "en-US" { return "English" }
+        {($_ -like "en*") -and ($_ -ne "en-US")} { return "English International" }
+        "et*" { return "Estonian" }
+        "fi*" { return "Finnish" }
+        {($_ -like "fr*") -and ($_ -ne "fr-CA")} { return "French" }
+        "fr-CA" { return "French Canadian" }
+        "de*" { return "German" }
+        "el*" { return "Greek" }
+        "he*" { return "Hebrew" }
+        "hu*" { return "Hungarian" }
+        "it*" { return "Italian" }
+        "ja*" { return "Japanese" }
+        "ko*" { return "Korean" }
+        "lv*" { return "Latvian" }
+        "lt*" { return "Lituanian" }
+        "nb*" { return "Norwegian" }
+        "pl*" { return "Polish" }
+        {($_ -like "pt*") -and ($_ -ne "pt-BR")} { return "Portuguese" }
+        "ro*" { return "Romanian" }
+        "ru*" { return "Russian" }
+        "sr-Latn*" { return "Serbian Latin" }
+        "sk*" { return "Slovak" }
+        "sl*" { return "Slovenian" }
+        {($_ -like "es*") -and ($_ -ne "es-MX")} { return "Spanish" }
+        "es-MX" { return "Spanish (Mexico)" }
+        "sv*" { return "Swedish" }
+        "th*" { return "Thai" }
+        "tr*" { return "Turkish" }
+        "uk*" { return "Ukrainian" }
+        default { return "English" }
+    }
+}
+
 function Remove-Features() {
     <#
         .SYNOPSIS
@@ -47,6 +97,7 @@ function Remove-Features() {
             $_.FeatureName -NotLike "*NetFx*" -AND
             $_.FeatureName -NotLike "*Media*" -AND
             $_.FeatureName -NotLike "*NFS*" -AND
+            $_.FeatureName -NotLike "*SearchEngine*" -AND
             $_.State -ne "Disabled"
         }
 
@@ -94,6 +145,7 @@ function Remove-Packages {
                 $_ -NotLike "*ParentalControls*" -AND
                 $_ -NotLike "*Win32WebViewHost*" -AND
                 $_ -NotLike "*InputApp*" -AND
+                $_ -NotLike "*DirectPlay*" -AND
                 $_ -NotLike "*AccountsControl*" -AND
                 $_ -NotLike "*AsyncTextService*" -AND
                 $_ -NotLike "*CapturePicker*" -AND
@@ -165,7 +217,8 @@ function Remove-ProvisionedPackages() {
                 $_.PackageName -NotLike "*Paint*" -and
                 $_.PackageName -NotLike "*Gaming*" -and
                 $_.PackageName -NotLike "*Extension*" -and
-                $_.PackageName -NotLike "*SecHealthUI*"
+                $_.PackageName -NotLike "*SecHealthUI*" -and
+                $_.PackageName -NotLike "*ScreenSketch*"
         }
 
         $counter = 0

functions/private/Invoke-WinUtilSSHServer.ps1

@@ -0,0 +1,81 @@
+function Invoke-WinUtilSSHServer {
+    <#
+    .SYNOPSIS
+        Enables OpenSSH server to remote into your windows device
+    #>
+
+    # Get the latest version of OpenSSH Server
+    $FeatureName = Get-WindowsCapability -Online | Where-Object { $_.Name -like "OpenSSH.Server*" }
+
+    # Install the OpenSSH Server feature if not already installed
+    if ($FeatureName.State -ne "Installed") {
+        Write-Host "Enabling OpenSSH Server"
+        Add-WindowsCapability -Online -Name $FeatureName.Name
+    }
+
+    # Sets up the OpenSSH Server service
+    Write-Host "Starting the services"
+    Start-Service -Name sshd
+    Set-Service -Name sshd -StartupType Automatic
+
+    # Sets up the ssh-agent service
+    Start-Service 'ssh-agent'
+    Set-Service -Name 'ssh-agent' -StartupType 'Automatic'
+
+    # Confirm the required services are running
+    $SSHDaemonService = Get-Service -Name sshd
+    $SSHAgentService = Get-Service -Name 'ssh-agent'
+
+    if ($SSHDaemonService.Status -eq 'Running') {
+        Write-Host "OpenSSH Server is running."
+    } else {
+        try {
+            Write-Host "OpenSSH Server is not running. Attempting to restart..."
+            Restart-Service -Name sshd -Force
+            Write-Host "OpenSSH Server has been restarted successfully."
+        } catch {
+            Write-Host "Failed to restart OpenSSH Server: $_"
+        }
+    }
+    if ($SSHAgentService.Status -eq 'Running') {
+        Write-Host "ssh-agent is running."
+    } else {
+        try {
+            Write-Host "ssh-agent is not running. Attempting to restart..."
+            Restart-Service -Name sshd -Force
+            Write-Host "ssh-agent has been restarted successfully."
+        } catch {
+            Write-Host "Failed to restart ssh-agent : $_"
+        }
+    }
+
+    #Adding Firewall rule for port 22
+    Write-Host "Setting up firewall rules"
+    $firewallRule = (Get-NetFirewallRule -Name 'sshd').Enabled
+    if ($firewallRule) {
+        Write-Host "Firewall rule for OpenSSH Server (sshd) already exists."
+    } else {
+        New-NetFirewallRule -Name sshd -DisplayName 'OpenSSH Server (sshd)' -Enabled True -Direction Inbound -Protocol TCP -Action Allow -LocalPort 22
+        Write-Host "Firewall rule for OpenSSH Server created and enabled."
+    }
+
+    # Check for the authorized_keys file
+    $sshFolderPath = "$env:HOMEDRIVE\$env:HOMEPATH\.ssh"
+    $authorizedKeysPath = "$sshFolderPath\authorized_keys"
+
+    if (-not (Test-Path -Path $sshFolderPath)) {
+        Write-Host "Creating ssh directory..."
+        New-Item -Path $sshFolderPath -ItemType Directory -Force
+    }
+
+    if (-not (Test-Path -Path $authorizedKeysPath)) {
+        Write-Host "Creating authorized_keys file..."
+        New-Item -Path $authorizedKeysPath -ItemType File -Force
+        Write-Host "authorized_keys file created at $authorizedKeysPath."
+    } else {
+        Write-Host "authorized_keys file already exists at $authorizedKeysPath."
+    }
+    Write-Host "OpenSSH server was successfully enabled."
+    Write-Host "The config file can be located at C:\ProgramData\ssh\sshd_config "
+    Write-Host "Add your public keys to this file -> $authorizedKeysPath"
+}

functions/private/Invoke-WinutilThemeChange.ps1

@@ -0,0 +1,180 @@
+function Invoke-WinutilThemeChange {
+    <#
+    .SYNOPSIS
+        Toggles between light and dark themes for a Windows utility application.
+
+    .DESCRIPTION
+        This function toggles the theme of the user interface between 'Light' and 'Dark' modes,
+        modifying various UI elements such as colors, margins, corner radii, font families, etc.
+        If the '-init' switch is used, it initializes the theme based on the system's current dark mode setting.
+
+    .PARAMETER init
+        A switch parameter. If set to $true, the function initializes the theme based on the system’s current dark mode setting.
+
+    .EXAMPLE
+        Invoke-WinutilThemeChange
+        # Toggles the theme between 'Light' and 'Dark'.
+
+    .EXAMPLE
+        Invoke-WinutilThemeChange -init
+        # Initializes the theme based on the system's dark mode and applies the shared theme.
+    #>
+    param (
+        [switch]$init = $false,
+        [string]$theme
+    )
+
+    function Set-WinutilTheme {
+        <#
+        .SYNOPSIS
+            Applies the specified theme to the application's user interface.
+
+        .DESCRIPTION
+            This internal function applies the given theme by setting the relevant properties
+            like colors, font families, corner radii, etc., in the UI. It uses the
+            'Set-ThemeResourceProperty' helper function to modify the application's resources.
+
+        .PARAMETER currentTheme
+            The name of the theme to be applied. Common values are "Light", "Dark", or "shared".
+        #>
+        param (
+            [string]$currentTheme
+        )
+
+        function Set-ThemeResourceProperty {
+            <#
+            .SYNOPSIS
+                Sets a specific UI property in the application's resources.
+
+            .DESCRIPTION
+                This helper function sets a property (e.g., color, margin, corner radius) in the
+                application's resources, based on the provided type and value. It includes
+                error handling to manage potential issues while setting a property.
+
+            .PARAMETER Name
+                The name of the resource property to modify (e.g., "MainBackgroundColor", "ButtonBackgroundMouseoverColor").
+
+            .PARAMETER Value
+                The value to assign to the resource property (e.g., "#FFFFFF" for a color).
+
+            .PARAMETER Type
+                The type of the resource, such as "ColorBrush", "CornerRadius", "GridLength", or "FontFamily".
+            #>
+            param($Name, $Value, $Type)
+            try {
+                # Set the resource property based on its type
+                $sync.Form.Resources[$Name] = switch ($Type) {
+                    "ColorBrush" { [Windows.Media.SolidColorBrush]::new($Value) }
+                    "Color" {
+                        # Convert hex string to RGB values
+                        $hexColor = $Value.TrimStart("#")
+                        $r = [Convert]::ToInt32($hexColor.Substring(0,2), 16)
+                        $g = [Convert]::ToInt32($hexColor.Substring(2,2), 16)
+                        $b = [Convert]::ToInt32($hexColor.Substring(4,2), 16)
+                        [Windows.Media.Color]::FromRgb($r, $g, $b)
+                    }
+                    "CornerRadius" { [System.Windows.CornerRadius]::new($Value) }
+                    "GridLength" { [System.Windows.GridLength]::new($Value) }
+                    "Thickness" {
+                        # Parse the Thickness value (supports 1, 2, or 4 inputs)
+                        $values = $Value -split ","
+                        switch ($values.Count) {
+                            1 { [System.Windows.Thickness]::new([double]$values[0]) }
+                            2 { [System.Windows.Thickness]::new([double]$values[0], [double]$values[1]) }
+                            4 { [System.Windows.Thickness]::new([double]$values[0], [double]$values[1], [double]$values[2], [double]$values[3]) }
+                        }
+                    }
+                    "FontFamily" { [Windows.Media.FontFamily]::new($Value) }
+                    "Double" { [double]$Value }
+                    default { $Value }
+                }
+            }
+            catch {
+                # Log a warning if there's an issue setting the property
+                Write-Warning "Failed to set property $($Name): $_"
+            }
+        }
+
+        # Retrieve all theme properties from the theme configuration
+        $themeProperties = $sync.configs.themes.$currentTheme.PSObject.Properties
+        foreach ($_ in $themeProperties) {
+            # Apply properties that deal with colors
+            if ($_.Name -like "*color*") {
+                Set-ThemeResourceProperty -Name $_.Name -Value $_.Value -Type "ColorBrush"
+                # For certain color properties, also set complementary values (e.g., BorderColor -> CBorderColor) This is required because e.g DropShadowEffect requires a <Color> and not a <SolidColorBrush> object
+                if ($_.Name -in @("BorderColor", "ButtonBackgroundMouseoverColor")) {
+                    Set-ThemeResourceProperty -Name "C$($_.Name)" -Value $_.Value -Type "Color"
+                }
+            }
+            # Apply corner radius properties
+            elseif ($_.Name -like "*Radius*") {
+                Set-ThemeResourceProperty -Name $_.Name -Value $_.Value -Type "CornerRadius"
+            }
+            # Apply row height properties
+            elseif ($_.Name -like "*RowHeight*") {
+                Set-ThemeResourceProperty -Name $_.Name -Value $_.Value -Type "GridLength"
+            }
+            # Apply thickness or margin properties
+            elseif (($_.Name -like "*Thickness*") -or ($_.Name -like "*margin")) {
+                Set-ThemeResourceProperty -Name $_.Name -Value $_.Value -Type "Thickness"
+            }
+            # Apply font family properties
+            elseif ($_.Name -like "*FontFamily*") {
+                Set-ThemeResourceProperty -Name $_.Name -Value $_.Value -Type "FontFamily"
+            }
+            # Apply any other properties as doubles (numerical values)
+            else {
+                Set-ThemeResourceProperty -Name $_.Name -Value $_.Value -Type "Double"
+            }
+        }
+    }
+
+    $LightPreferencePath = "$env:LOCALAPPDATA\winutil\LightTheme.ini"
+    $DarkPreferencePath = "$env:LOCALAPPDATA\winutil\DarkTheme.ini"
+
+    if ($init) {
+        Set-WinutilTheme -currentTheme "shared"
+        if (Test-Path $LightPreferencePath) {
+            $theme = "Light"
+        }
+        elseif (Test-Path $DarkPreferencePath) {
+            $theme = "Dark"
+        }
+        else {
+            $theme = "Auto"
+        }
+    }
+
+    switch ($theme) {
+        "Auto" {
+            $systemUsesDarkMode = Get-WinUtilToggleStatus WPFToggleDarkMode
+            if ($systemUsesDarkMode) {
+                Set-WinutilTheme  -currentTheme "Dark"
+            }
+            else{
+                Set-WinutilTheme  -currentTheme "Light"
+            }
+
+
+            $themeButtonIcon = [char]0xF08C
+            Remove-Item $LightPreferencePath -Force -ErrorAction SilentlyContinue
+            Remove-Item $DarkPreferencePath -Force -ErrorAction SilentlyContinue
+        }
+        "Dark" {
+            Set-WinutilTheme  -currentTheme $theme
+            $themeButtonIcon = [char]0xE708
+            $null = New-Item $DarkPreferencePath -Force
+            Remove-Item $LightPreferencePath -Force -ErrorAction SilentlyContinue
+           }
+        "Light" {
+            Set-WinutilTheme  -currentTheme $theme
+            $themeButtonIcon = [char]0xE706
+            $null = New-Item $LightPreferencePath -Force
+            Remove-Item $DarkPreferencePath -Force -ErrorAction SilentlyContinue
+        }
+    }
+
+    # Update the theme selector button with the appropriate icon
+    $ThemeButton = $sync.Form.FindName("ThemeButton")
+    $ThemeButton.Content = [string]$themeButtonIcon
+}

functions/private/Set-WinUtilRegistry.ps1

@@ -36,7 +36,12 @@ function Set-WinUtilRegistry {
         }
 
         Write-Host "Set $Path\$Name to $Value"
-        Set-ItemProperty -Path $Path -Name $Name -Type $Type -Value $Value -Force -ErrorAction Stop | Out-Null
+        if ($Value -ne "<RemoveEntry>"){
+            Set-ItemProperty -Path $Path -Name $Name -Type $Type -Value $Value -Force -ErrorAction Stop | Out-Null
+        }
+        else{
+            Remove-ItemProperty -Path $Path -Name $Name -Force -ErrorAction Stop | Out-Null
+        }
     } catch [System.Security.SecurityException] {
         Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
     } catch [System.Management.Automation.ItemNotFoundException] {

functions/private/Set-WinUtilTaskbarItem.ps1

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

functions/private/Set-WinUtilUITheme.ps1

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

functions/private/Show-CustomDialog.ps1

@@ -33,25 +33,25 @@ function Show-CustomDialog {
     #>
     param(
         [string]$Message,
-        [int]$Width = 300,
-        [int]$Height = 200,
-        [int]$FontSize = 10,
-        [int]$HeaderFontSize = 14,
-        [int]$IconSize = 25,
+        [int]$Width = $sync.Form.Resources.CustomDialogWidth,
+        [int]$Height = $sync.Form.Resources.CustomDialogHeight,
+        [int]$FontSize = $sync.Form.Resources.CustomDialogFontSize,
+        [int]$HeaderFontSize = $sync.Form.Resources.CustomDialogFontSizeHeader,
+        [int]$IconSize = $sync.Form.Resources.CustomDialogLogoSize,
         [bool]$EnableScroll = $false
     )
 
     Add-Type -AssemblyName PresentationFramework
 
     # Define theme colors
-    $foregroundColor = $sync.configs.themes.$ctttheme.MainForegroundColor
-    $backgroundColor = $sync.configs.themes.$ctttheme.MainBackgroundColor
+    $foregroundColor = $sync.Form.Resources.MainForegroundColor
+    $backgroundColor = $sync.Form.Resources.MainBackgroundColor
     $font = New-Object Windows.Media.FontFamily("Consolas")
-    $borderColor = $sync.configs.themes.$ctttheme.BorderColor # ButtonInstallBackgroundColor
-    $buttonBackgroundColor = $sync.configs.themes.$ctttheme.ButtonInstallBackgroundColor
-    $buttonForegroundColor = $sync.configs.themes.$ctttheme.ButtonInstallForegroundColor
+    $borderColor = $sync.Form.Resources.BorderColor # ButtonInstallBackgroundColor
+    $buttonBackgroundColor = $sync.Form.Resources.ButtonInstallBackgroundColor
+    $buttonForegroundColor = $sync.Form.Resources.ButtonInstallForegroundColor
     $shadowColor = [Windows.Media.ColorConverter]::ConvertFromString("#AAAAAAAA")
-    $logocolor = $sync.configs.themes.$ctttheme.ButtonBackgroundPressedColor
+    $logocolor = $sync.Form.Resources.LabelboxForegroundColor
 
     # Create a custom dialog window
     $dialog = New-Object Windows.Window
@@ -128,73 +128,15 @@ function Show-CustomDialog {
     $grid.Children.Add($stackPanel)
     [Windows.Controls.Grid]::SetRow($stackPanel, 0)  # Set the row to the second row (0-based index)
 
-    $viewbox = New-Object Windows.Controls.Viewbox
-    $viewbox.Width = $IconSize
-    $viewbox.Height = $IconSize
-
-    # Combine the paths into a single string
-#     $cttLogoPath = @"
-#     M174 1094 c-4 -14 -4 -55 -2 -92 3 -57 9 -75 41 -122 41 -60 45 -75 22 -84 -25 -9 -17 -21 30 -44 l45 -22 0 -103 c0 -91 3 -109 26 -155 30 -60 65 -87 204 -157 l95 -48 110 58 c184 96 205 127 205 293 l0 108 45 22 c47 23 55 36 30 46 -22 8 -18 30 9 63 13 16 34 48 46 71 20 37 21 52 15 116 l-6 73 -69 -23 c-38 -12 -137 -59 -220 -103 -82 -45 -160 -81 -171 -81 -12 0 -47 15 -78 34 -85 51 -239 127 -309 151 l-62 22 -6 -23z m500 -689 c20 -8 36 -19 36 -24 0 -18 -53 -51 -80 -51 -28 0 -80 33 -80 51 0 10 55 38 76 39 6 0 28 -7 48 -15z
-#     M177 711 c-19 -88 4 -242 49 -318 43 -74 107 -127 232 -191 176 -90 199 -84 28 7 -169 91 -214 129 -258 220 -29 58 -32 74 -37 190 -4 90 -8 116 -14 92z
-#     M1069 610 c-4 -131 -5 -137 -38 -198 -43 -79 -89 -119 -210 -181 -53 -27 -116 -61 -141 -76 -74 -43 -6 -20 115 40 221 109 296 217 294 425 -1 144 -16 137 -20 -10z
-# "@
-$cttLogoPath = @"
-           M 18.00,14.00
-           C 18.00,14.00 45.00,27.74 45.00,27.74
-             45.00,27.74 57.40,34.63 57.40,34.63
-             57.40,34.63 59.00,43.00 59.00,43.00
-             59.00,43.00 59.00,83.00 59.00,83.00
-             55.35,81.66 46.99,77.79 44.72,74.79
-             41.17,70.10 42.01,59.80 42.00,54.00
-             42.00,51.62 42.20,48.29 40.98,46.21
-             38.34,41.74 25.78,38.60 21.28,33.79
-             16.81,29.02 18.00,20.20 18.00,14.00 Z
-           M 107.00,14.00
-           C 109.01,19.06 108.93,30.37 104.66,34.21
-             100.47,37.98 86.38,43.10 84.60,47.21
-             83.94,48.74 84.01,51.32 84.00,53.00
-             83.97,57.04 84.46,68.90 83.26,72.00
-             81.06,77.70 72.54,81.42 67.00,83.00
-             67.00,83.00 67.00,43.00 67.00,43.00
-             67.00,43.00 67.99,35.63 67.99,35.63
-             67.99,35.63 80.00,28.26 80.00,28.26
-             80.00,28.26 107.00,14.00 107.00,14.00 Z
-           M 19.00,46.00
-           C 21.36,47.14 28.67,50.71 30.01,52.63
-             31.17,54.30 30.99,57.04 31.00,59.00
-             31.04,65.41 30.35,72.16 33.56,78.00
-             38.19,86.45 46.10,89.04 54.00,93.31
-             56.55,94.69 60.10,97.20 63.00,97.22
-             65.50,97.24 68.77,95.36 71.00,94.25
-             76.42,91.55 84.51,87.78 88.82,83.68
-             94.56,78.20 95.96,70.59 96.00,63.00
-             96.01,60.24 95.59,54.63 97.02,52.39
-             98.80,49.60 103.95,47.87 107.00,47.00
-             107.00,47.00 107.00,67.00 107.00,67.00
-             106.90,87.69 96.10,93.85 80.00,103.00
-             76.51,104.98 66.66,110.67 63.00,110.52
-             60.33,110.41 55.55,107.53 53.00,106.25
-             46.21,102.83 36.63,98.57 31.04,93.68
-             16.88,81.28 19.00,62.88 19.00,46.00 Z
-"@
-
-    # Add SVG path
-    $svgPath = New-Object Windows.Shapes.Path
-    $svgPath.Data = [Windows.Media.Geometry]::Parse($cttLogoPath)
-    $svgPath.Fill = $logocolor  # Set fill color to white
-
-    # Add SVG path to Viewbox
-    $viewbox.Child = $svgPath
-
     # Add SVG path to the stack panel
-    $stackPanel.Children.Add($viewbox)
+    $stackPanel.Children.Add((Invoke-WinUtilAssets -Type "logo" -Size 25))
 
     # Add "Winutil" text
     $winutilTextBlock = New-Object Windows.Controls.TextBlock
     $winutilTextBlock.Text = "Winutil"
     $winutilTextBlock.FontSize = $HeaderFontSize
     $winutilTextBlock.Foreground = $logocolor
-    $winutilTextBlock.Margin = New-Object Windows.Thickness(10, 5, 10, 5)  # Add margins around the text block
+    $winutilTextBlock.Margin = New-Object Windows.Thickness(10, 10, 10, 5)  # Add margins around the text block
     $stackPanel.Children.Add($winutilTextBlock)
     # Add TextBlock for information with text wrapping and margins
     $messageTextBlock = New-Object Windows.Controls.TextBlock
@@ -220,7 +162,7 @@ $cttLogoPath = @"
         $hyperlink.NavigateUri = New-Object System.Uri($match.Groups[1].Value)
         $hyperlink.Inlines.Add($match.Groups[2].Value)
         $hyperlink.TextDecorations = [Windows.TextDecorations]::None  # Remove underline
-        $hyperlink.Foreground = $sync.configs.themes.$ctttheme.LinkForegroundColor
+        $hyperlink.Foreground = $sync.Form.Resources.LinkForegroundColor
 
         $hyperlink.Add_Click({
             param($sender, $args)
@@ -228,11 +170,11 @@ $cttLogoPath = @"
         })
         $hyperlink.Add_MouseEnter({
             param($sender, $args)
-            $sender.Foreground = $sync.configs.themes.$ctttheme.LinkHoverForegroundColor
+            $sender.Foreground = $sync.Form.Resources.LinkHoverForegroundColor
         })
         $hyperlink.Add_MouseLeave({
             param($sender, $args)
-            $sender.Foreground = $sync.configs.themes.$ctttheme.LinkForegroundColor
+            $sender.Foreground = $sync.Form.Resources.LinkForegroundColor
         })
 
         $messageTextBlock.Inlines.Add($hyperlink)

functions/public/Invoke-WPFButton.ps1

@@ -19,7 +19,6 @@ function Invoke-WPFButton {
     }
 
     Switch -Wildcard ($Button) {
-
         "WPFTab?BT" {Invoke-WPFTab $Button}
         "WPFInstall" {Invoke-WPFInstall}
         "WPFUninstall" {Invoke-WPFUnInstall}
@@ -59,5 +58,6 @@ function Invoke-WPFButton {
         "WPFCloseButton" {Invoke-WPFCloseButton}
         "MicrowinScratchDirBT" {Invoke-ScratchDialog}
         "WPFWinUtilPSProfile" {Invoke-WinUtilpsProfile}
+        "WPFWinUtilSSHServer" {Invoke-WinUtilSSHServer}
     }
 }

functions/public/Invoke-WPFGetIso.ps1

@@ -62,17 +62,79 @@ function Invoke-WPFGetIso {
         }
     }
 
-    [System.Reflection.Assembly]::LoadWithPartialName("System.windows.forms") | Out-Null
-    $openFileDialog = New-Object System.Windows.Forms.OpenFileDialog
-    $openFileDialog.initialDirectory = $initialDirectory
-    $openFileDialog.filter = "ISO files (*.iso)| *.iso"
-    $openFileDialog.ShowDialog() | Out-Null
-    $filePath = $openFileDialog.FileName
+    if ($sync["ISOmanual"].IsChecked) {
+        # Open file dialog to let user choose the ISO file
+        [System.Reflection.Assembly]::LoadWithPartialName("System.windows.forms") | Out-Null
+        $openFileDialog = New-Object System.Windows.Forms.OpenFileDialog
+        $openFileDialog.initialDirectory = $initialDirectory
+        $openFileDialog.filter = "ISO files (*.iso)| *.iso"
+        $openFileDialog.ShowDialog() | Out-Null
+        $filePath = $openFileDialog.FileName
 
-    if ([string]::IsNullOrEmpty($filePath)) {
-        Write-Host "No ISO is chosen"
-        $sync.BusyMessage.Visibility="Hidden"
-        return
+        if ([string]::IsNullOrEmpty($filePath)) {
+            Write-Host "No ISO is chosen"
+            $sync.BusyMessage.Visibility="Hidden"
+            return
+        }
+    } elseif ($sync["ISOdownloader"].IsChecked) {
+        # Create folder browsers for user-specified locations
+        [System.Reflection.Assembly]::LoadWithPartialName("System.Windows.Forms") | Out-Null
+        $isoDownloaderFBD = New-Object System.Windows.Forms.FolderBrowserDialog
+        $isoDownloaderFBD.Description = "Please specify the path to download the ISO file to:"
+        $isoDownloaderFBD.ShowNewFolderButton = $true
+        if ($isoDownloaderFBD.ShowDialog() -ne [System.Windows.Forms.DialogResult]::OK)
+        {
+            return
+        }
+
+        # Grab the location of the selected path
+        $targetFolder = $isoDownloaderFBD.SelectedPath
+
+        # Auto download newest ISO
+        # Credit: https://github.com/pbatard/Fido
+        $fidopath = "$env:temp\Fido.ps1"
+        $originalLocation = $PSScriptRoot
+
+        Invoke-WebRequest "https://github.com/pbatard/Fido/raw/master/Fido.ps1" -OutFile $fidopath
+
+        Set-Location -Path $env:temp
+        # Detect if the first option ("System language") has been selected and get a Fido-approved language from the current culture
+        $lang = if ($sync["ISOLanguage"].SelectedIndex -eq 0) {
+            Get-FidoLangFromCulture -langName (Get-Culture).Name
+        } else {
+            $sync["ISOLanguage"].SelectedItem
+        }
+
+        & $fidopath -Win 'Windows 11' -Rel $sync["ISORelease"].SelectedItem -Arch "x64" -Lang $lang -Ed "Windows 11 Home/Pro/Edu"
+        if (-not $?)
+        {
+            Write-Host "Could not download the ISO file. Look at the output of the console for more information."
+            $msg = "The ISO file could not be downloaded"
+            [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Error)
+            return
+        }
+        Set-Location $originalLocation
+        # Use the FullName property to only grab the file names. Using this property is necessary as, without it, you're passing the usual output of Get-ChildItem
+        # to the variable, and let's be honest, that does NOT exist in the file system
+        $filePath = (Get-ChildItem -Path "$env:temp" -Filter "Win11*.iso").FullName | Sort-Object LastWriteTime -Descending | Select-Object -First 1
+        $fileName = [IO.Path]::GetFileName("$filePath")
+
+        if (($targetFolder -ne "") -and (Test-Path "$targetFolder"))
+        {
+            try
+            {
+                # "Let it download to $env:TEMP and then we **move** it to the file path." - CodingWonders
+                $destinationFilePath = "$targetFolder\$fileName"
+                Write-Host "Moving ISO file. Please wait..."
+                Move-Item -Path "$filePath" -Destination "$destinationFilePath" -Force
+                $filePath = $destinationFilePath
+            }
+            catch
+            {
+                Write-Host "Unable to move the ISO file to the location you specified. The downloaded ISO is in the `"$env:TEMP`" folder"
+                Write-Host "Error information: $($_.Exception.Message)" -ForegroundColor Yellow
+            }
+        }
     }
 
     Write-Host "File path $($filePath)"

functions/public/Invoke-WPFImpex.ps1

@@ -19,45 +19,59 @@ function Invoke-WPFImpex {
         $Config = $null
     )
 
-    if ($type -eq "export") {
-        $FileBrowser = New-Object System.Windows.Forms.SaveFileDialog
-    }
-    if ($type -eq "import") {
-        $FileBrowser = New-Object System.Windows.Forms.OpenFileDialog
-    }
+    function ConfigDialog {
+        if (!$Config) {
+            switch ($type) {
+                "export" { $FileBrowser = New-Object System.Windows.Forms.SaveFileDialog }
+                "import" { $FileBrowser = New-Object System.Windows.Forms.OpenFileDialog }
+            }
+            $FileBrowser.InitialDirectory = [Environment]::GetFolderPath('Desktop')
+            $FileBrowser.Filter = "JSON Files (*.json)|*.json"
+            $FileBrowser.ShowDialog() | Out-Null
 
-    if (-not $Config) {
-        $FileBrowser.InitialDirectory = [Environment]::GetFolderPath('Desktop')
-        $FileBrowser.Filter = "JSON Files (*.json)|*.json"
-        $FileBrowser.ShowDialog() | Out-Null
-
-        if($FileBrowser.FileName -eq "") {
-            return
+            if ($FileBrowser.FileName -eq "") {
+                return $null
+            } else {
+                return $FileBrowser.FileName
+            }
         } else {
-            $Config = $FileBrowser.FileName
+            return $Config
         }
     }
 
-    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
-
-        $flattenedJson = @()
-        $jsonFile.PSObject.Properties | ForEach-Object {
-            $category = $_.Name
-            foreach ($checkboxName in $_.Value) {
-                if ($category -ne "Install") {
-                    $flattenedJson += $checkboxName
+    switch ($type) {
+        "export" {
+            try {
+                $Config = ConfigDialog
+                if ($Config) {
+                    $jsonFile = Get-WinUtilCheckBoxes -unCheck $false | ConvertTo-Json
+                    $jsonFile | Out-File $Config -Force
+                    "iex ""& { `$(irm christitus.com/win) } -Config '$Config'""" | Set-Clipboard
                 }
+            } catch {
+                Write-Error "An error occurred while exporting: $_"
+            }
+        }
+        "import" {
+            try {
+                $Config = ConfigDialog
+                if ($Config) {
+                    try {
+                        if ($Config -match '^https?://') {
+                            $jsonFile = (Invoke-WebRequest "$Config").Content | ConvertFrom-Json
+                        } else {
+                            $jsonFile = Get-Content $Config | ConvertFrom-Json
+                        }
+                    } catch {
+                        Write-Error "Failed to load the JSON file from the specified path or URL: $_"
+                        return
+                    }
+                    $flattenedJson = $jsonFile.PSObject.Properties.Where({ $_.Name -ne "Install" }).ForEach({ $_.Value })
+                    Invoke-WPFPresets -preset $flattenedJson -imported $true
+                }
+            } catch {
+                Write-Error "An error occurred while importing: $_"
             }
         }
-
-        $flattenedJson = [string]$flattenedJson
-        Invoke-WPFPresets -preset $flattenedJson -imported $true
     }
 }

functions/public/Invoke-WPFInstall.ps1

@@ -20,7 +20,7 @@ function Invoke-WPFInstall {
         return
     }
     $ChocoPreference = $($sync.WPFpreferChocolatey.IsChecked)
-    Invoke-WPFRunspace -ArgumentList $PackagesToInstall,$ChocoPreference -DebugPreference $DebugPreference -ScriptBlock {
+    $installHandle = Invoke-WPFRunspace -ParameterList @(("PackagesToInstall", $PackagesToInstall),("ChocoPreference", $ChocoPreference)) -DebugPreference $DebugPreference -ScriptBlock {
         param($PackagesToInstall, $ChocoPreference, $DebugPreference)
         if ($PackagesToInstall.count -eq 1) {
             $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })

functions/public/Invoke-WPFPresets.ps1

@@ -17,7 +17,7 @@ function Invoke-WPFPresets {
 
     param (
         [Parameter(position=0)]
-        [string]$preset = "",
+        [Array]$preset = "",
 
         [Parameter(position=1)]
         [bool]$imported = $false,
@@ -51,7 +51,7 @@ function Invoke-WPFPresets {
         }
 
         # Check if the checkbox name exists in the flattened JSON hashtable
-        if ($CheckBoxesToCheck.Contains($checkboxName)) {
+        if ($CheckBoxesToCheck -contains $checkboxName) {
             # If it exists, set IsChecked to true
             $sync.$checkboxName.IsChecked = $true
             Write-Debug "$checkboxName is checked"

functions/public/Invoke-WPFRunspace.ps1

@@ -11,17 +11,23 @@ function Invoke-WPFRunspace {
     .PARAMETER ArgumentList
         A list of arguments to pass to the runspace
 
+    .PARAMETER ParameterList
+        A list of named parameters that should be provided.
     .EXAMPLE
         Invoke-WPFRunspace `
             -ScriptBlock $sync.ScriptsInstallPrograms `
             -ArgumentList "Installadvancedip,Installbitwarden" `
 
+        Invoke-WPFRunspace`
+            -ScriptBlock $sync.ScriptsInstallPrograms `
+            -ParameterList @(("PackagesToInstall", @("Installadvancedip,Installbitwarden")),("ChocoPreference", $true))
     #>
 
     [CmdletBinding()]
     Param (
         $ScriptBlock,
         $ArgumentList,
+        $ParameterList,
         $DebugPreference
     )
 
@@ -30,8 +36,10 @@ function Invoke-WPFRunspace {
 
     # Add Scriptblock and Arguments to runspace
     $script:powershell.AddScript($ScriptBlock)
-    foreach ($Argument in $ArgumentList) {
-        $script:powershell.AddArgument($Argument)
+    $script:powershell.AddArgument($ArgumentList)
+
+    foreach ($parameter in $ParameterList) {
+        $script:powershell.AddParameter($parameter[0], $parameter[1])
     }
     $script:powershell.AddArgument($DebugPreference)  # Pass DebugPreference to the script block
     $script:powershell.RunspacePool = $sync.runspace
@@ -47,4 +55,6 @@ function Invoke-WPFRunspace {
         $sync.runspace.Close()
         [System.GC]::Collect()
     }
+    # Return the handle
+    return $handle
 }

functions/public/Invoke-WPFShortcut.ps1

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

functions/public/Invoke-WPFUIElements.ps1

@@ -27,7 +27,7 @@ function Invoke-WPFUIElements {
 
     $window = $sync["Form"]
 
-    $theme = $sync.configs.themes.$ctttheme
+    $theme = $sync.Form.Resources
     $borderstyle = $window.FindResource("BorderStyle")
     $HoverTextBlockStyle = $window.FindResource("HoverTextBlockStyle")
     $ColorfulToggleSwitchStyle = $window.FindResource("ColorfulToggleSwitchStyle")
@@ -186,7 +186,7 @@ function Invoke-WPFUIElements {
                         $label.ToolTip = $entryInfo.Description
                         $label.HorizontalAlignment = "Left"
                         $label.FontSize = $theme.FontSize
-                        $label.Foreground = $theme.MainForegroundColor
+                        $label.SetResourceReference([Windows.Controls.Control]::ForegroundProperty, "MainForegroundColor")
                         $dockPanel.Children.Add($label) | Out-Null
                         $stackPanel.Children.Add($dockPanel) | Out-Null
 
@@ -207,14 +207,14 @@ function Invoke-WPFUIElements {
                         $toggleButton.HorizontalAlignment = "Left"
                         $toggleButton.Height = $theme.TabButtonHeight
                         $toggleButton.Width = $theme.TabButtonWidth
-                        $toggleButton.Background = $theme.ButtonInstallBackgroundColor
-                        $toggleButton.Foreground = [Windows.Media.Brushes]::White
+                        $toggleButton.SetResourceReference([Windows.Controls.Control]::BackgroundProperty, "ButtonInstallBackgroundColor")
+                        $toggleButton.SetResourceReference([Windows.Controls.Control]::ForegroundProperty, "MainForegroundColor")
                         $toggleButton.FontWeight = [Windows.FontWeights]::Bold
 
                         $textBlock = New-Object Windows.Controls.TextBlock
                         $textBlock.FontSize = $theme.TabButtonFontSize
                         $textBlock.Background = [Windows.Media.Brushes]::Transparent
-                        $textBlock.Foreground = $theme.ButtonInstallForegroundColor
+                        $textBlock.SetResourceReference([Windows.Controls.Control]::ForegroundProperty, "ButtonInstallForegroundColor")
 
                         $underline = New-Object Windows.Documents.Underline
                         $underline.Inlines.Add($entryInfo.name -replace "(.).*", "`$1")
@@ -292,7 +292,7 @@ function Invoke-WPFUIElements {
                         $checkBox.FontSize = $theme.FontSize
                         $checkBox.ToolTip = $entryInfo.Description
                         $checkBox.Margin = $theme.CheckBoxMargin
-                        if ($entryInfo.Checked) {
+                        if ($entryInfo.Checked -eq $true) {
                             $checkBox.IsChecked = $entryInfo.Checked
                         }
                         $horizontalStackPanel.Children.Add($checkBox) | Out-Null

functions/public/Invoke-WPFUltimatePerformance.ps1

@@ -50,14 +50,14 @@ Function Invoke-WPFUltimatePerformance {
 
         } elseif ($State -eq "Disable") {
             # Check if the Ultimate Performance plan is installed by GUID
-            $installedPlan = powercfg -list | Select-String -Pattern $ultimateGUID
+            $installedPlan = (powercfg -list | Select-String -Pattern "ChrisTitus - Ultimate Power Plan").Line.Split()[3]
 
             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]
+                $balancedPlanGUID = 381b4222-f694-41f0-9685-ff5bb260df2e
                 powercfg -setactive $balancedPlanGUID
 
                 # Delete the Ultimate Performance plan by GUID

functions/public/Invoke-WPFUnInstall.ps1

@@ -30,7 +30,7 @@ function Invoke-WPFUnInstall {
     if($confirm -eq "No") {return}
     $ChocoPreference = $($sync.WPFpreferChocolatey.IsChecked)
 
-    Invoke-WPFRunspace -ArgumentList $PackagesToInstall, $ChocoPreference -DebugPreference $DebugPreference -ScriptBlock {
+    Invoke-WPFRunspace -ArgumentList @(("PackagesToInstall", $PackagesToInstall),("ChocoPreference", $ChocoPreference)) -DebugPreference $DebugPreference -ScriptBlock {
         param($PackagesToInstall, $ChocoPreference, $DebugPreference)
         if ($PackagesToInstall.count -eq 1) {
             $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })

functions/public/Invoke-WPFtweaksbutton.ps1

@@ -24,8 +24,12 @@ function Invoke-WPFtweaksbutton {
 
   Write-Debug "Number of tweaks to process: $($Tweaks.Count)"
 
-  Invoke-WPFRunspace -ArgumentList $Tweaks -DebugPreference $DebugPreference -ScriptBlock {
-    param($Tweaks, $DebugPreference)
+  # The leading "," in the ParameterList is nessecary because we only provide one argument and powershell cannot be convinced that we want a nested loop with only one argument otherwise
+  $tweaksHandle = Invoke-WPFRunspace -ParameterList @(,("tweaks",$tweaks)) -DebugPreference $DebugPreference -ScriptBlock {
+    param(
+      $tweaks,
+      $DebugPreference
+      )
     Write-Debug "Inside Number of tweaks to process: $($Tweaks.Count)"
 
     $sync.ProcessRunning = $true
@@ -38,8 +42,9 @@ function Invoke-WPFtweaksbutton {
     # Execute other selected tweaks
 
     for ($i = 0; $i -lt $Tweaks.Count; $i++) {
-      Set-WinUtilProgressBar -Label "Applying $($tweaks[$i])" -Percent ($i / $Tweaks.Count * 100)
-      Invoke-WinUtilTweaks $tweaks[$i]$sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -value ($i/$Tweaks.Count) })
+      Set-WinUtilProgressBar -Label "Applying $($tweaks[$i])" -Percent ($i / $tweaks.Count * 100)
+      Invoke-WinUtilTweaks $tweaks[$i]
+      $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -value ($i/$Tweaks.Count) })
     }
     Set-WinUtilProgressBar -Label "Tweaks finished" -Percent 100
     $sync.ProcessRunning = $false

scripts/main.ps1

@@ -52,29 +52,6 @@ $sync.runspace.Open()
 
 $inputXML = $inputXML -replace 'mc:Ignorable="d"', '' -replace "x:N", 'N' -replace '^<Win.*', '<Window'
 
-$defaulttheme = '_default'
-if ((Get-WinUtilToggleStatus WPFToggleDarkMode) -eq $True) {
-    if (Invoke-WinUtilGPU -eq $True) {
-        $ctttheme = 'Matrix'
-    } else {
-        $ctttheme = 'Dark'
-    }
-} else {
-    $ctttheme = 'Classic'
-}
-
-$returnVal = Set-WinUtilUITheme -inputXML $inputXML -customThemeName $ctttheme -defaultThemeName $defaulttheme
-if ($returnVal[0] -eq "") {
-    Write-Host "Failed to statically apply theming to xaml content using Set-WinUtilTheme, please check previous Error/Warning messages." -ForegroundColor Red
-    Write-Host "Quitting winutil..." -ForegroundColor Red
-    $sync.runspace.Dispose()
-    $sync.runspace.Close()
-    [System.GC]::Collect()
-    exit 1
-}
-$inputXML = $returnVal[0]
-$ctttheme = $returnVal[1]
-
 [void][System.Reflection.Assembly]::LoadWithPartialName('presentationframework')
 [xml]$XAML = $inputXML
 
@@ -104,6 +81,35 @@ if (-NOT ($readerOperationSuccessful)) {
     exit 1
 }
 
+# Setup the Window to follow listen for windows Theme Change events and update the winutil theme
+# throttle logic needed, because windows seems to send more than one theme change event per change
+$lastThemeChangeTime = [datetime]::MinValue
+$debounceInterval = [timespan]::FromSeconds(2)
+$sync.Form.Add_Loaded({
+    $interopHelper = New-Object System.Windows.Interop.WindowInteropHelper $sync.Form
+    $hwndSource = [System.Windows.Interop.HwndSource]::FromHwnd($interopHelper.Handle)
+    $hwndSource.AddHook({
+        param (
+            [System.IntPtr]$hwnd,
+            [int]$msg,
+            [System.IntPtr]$wParam,
+            [System.IntPtr]$lParam,
+            [ref]$handled
+        )
+        # Check for the Event WM_SETTINGCHANGE (0x1001A) and validate that Button shows the icon for "Auto" => [char]0xF08C
+        if (($msg -eq 0x001A) -and $sync.ThemeButton.Content -eq [char]0xF08C) {
+            $currentTime = [datetime]::Now
+            if ($currentTime - $lastThemeChangeTime -gt $debounceInterval) {
+                Invoke-WinutilThemeChange -theme "Auto"
+                $script:lastThemeChangeTime = $currentTime
+                $handled = $true
+            }
+        }
+        return 0
+    })
+})
+
+Invoke-WinutilThemeChange -init $true
 # Load the configuration files
 #Invoke-WPFUIElements -configVariable $sync.configs.nav -targetGridName "WPFMainGrid"
 Invoke-WPFUIElements -configVariable $sync.configs.applications -targetGridName "appspanel" -columncount 5
@@ -248,24 +254,34 @@ $commonKeyEvents = {
 $sync["Form"].Add_PreViewKeyDown($commonKeyEvents)
 
 $sync["Form"].Add_MouseLeftButtonDown({
-    if ($sync["SettingsPopup"].IsOpen) {
-        $sync["SettingsPopup"].IsOpen = $false
-    }
+    # Hide Settings and Theme Popup on click anywhere else
+    if ($sync.SettingsButton.IsOpen -or
+        $sync.ThemePopup.IsOpen) {
+            $sync.SettingsPopup.IsOpen = $false
+            $sync.ThemePopup.IsOpen = $false
+        }
     $sync["Form"].DragMove()
 })
 
 $sync["Form"].Add_MouseDoubleClick({
-    if ($sync["Form"].WindowState -eq [Windows.WindowState]::Normal) {
-        $sync["Form"].WindowState = [Windows.WindowState]::Maximized;
-    } else {
-        $sync["Form"].WindowState = [Windows.WindowState]::Normal;
+    if ($_.OriginalSource -is [System.Windows.Controls.Grid] -or
+        $_.OriginalSource -is [System.Windows.Controls.StackPanel]) {
+            if ($sync["Form"].WindowState -eq [Windows.WindowState]::Normal) {
+                $sync["Form"].WindowState = [Windows.WindowState]::Maximized
+            }
+            else{
+                $sync["Form"].WindowState = [Windows.WindowState]::Normal
+            }
     }
 })
 
 $sync["Form"].Add_Deactivated({
     Write-Debug "WinUtil lost focus"
-    if ($sync["SettingsPopup"].IsOpen) {
-        $sync["SettingsPopup"].IsOpen = $false
+    # Hide Settings and Theme Popup on Winutil Focus Loss
+    if ($sync.SettingsButton.IsOpen -or
+        $sync.ThemePopup.IsOpen) {
+            $sync.SettingsPopup.IsOpen = $false
+            $sync.ThemePopup.IsOpen = $false
     }
 })
 
@@ -383,6 +399,35 @@ Add-Type @"
 
 })
 
+# Add event handlers for the RadioButtons
+$sync["ISOdownloader"].add_Checked({
+    $sync["ISORelease"].Visibility = [System.Windows.Visibility]::Visible
+    $sync["ISOLanguage"].Visibility = [System.Windows.Visibility]::Visible
+})
+
+$sync["ISOmanual"].add_Checked({
+    $sync["ISORelease"].Visibility = [System.Windows.Visibility]::Collapsed
+    $sync["ISOLanguage"].Visibility = [System.Windows.Visibility]::Collapsed
+})
+
+$sync["ISORelease"].Items.Add("23H2") | Out-Null
+$sync["ISORelease"].Items.Add("22H2") | Out-Null
+$sync["ISORelease"].Items.Add("21H2") | Out-Null
+$sync["ISORelease"].SelectedItem = "23H2"
+
+$sync["ISOLanguage"].Items.Add("System Language ($(Get-FidoLangFromCulture -langName $((Get-Culture).Name)))") | Out-Null
+if ($currentCulture -ne "English International") {
+    $sync["ISOLanguage"].Items.Add("English International") | Out-Null
+}
+if ($currentCulture -ne "English") {
+    $sync["ISOLanguage"].Items.Add("English") | Out-Null
+}
+if ($sync["ISOLanguage"].Items.Count -eq 1) {
+    $sync["ISOLanguage"].IsEnabled = $false
+}
+$sync["ISOLanguage"].SelectedIndex = 0
+
+
 # Load Checkboxes and Labels outside of the Filter function only once on startup for performance reasons
 $filter = Get-WinUtilVariables -Type CheckBox
 $CheckBoxes = ($sync.GetEnumerator()).where{ $psitem.Key -in $filter }
@@ -405,8 +450,8 @@ $sync["SearchBar"].Add_TextChanged({
     $textToSearch = $sync.SearchBar.Text.ToLower()
 
     foreach ($CheckBox in $CheckBoxes) {
-        # Check if the checkbox is null or if it doesn't have content
-        if ($CheckBox -eq $null -or $CheckBox.Value -eq $null -or $CheckBox.Value.Content -eq $null) {
+        # Skip if the checkbox is null, it doesn't have content or it is the prefer Choco checkbox
+        if ($CheckBox -eq $null -or $CheckBox.Value -eq $null -or $CheckBox.Value.Content -eq $null -or $CheckBox.Name -eq "WPFpreferChocolatey") {
             continue
         }
 
@@ -453,47 +498,72 @@ $sync["Form"].Add_Loaded({
     $sync["Form"].MaxHeight = [Double]::PositiveInfinity
 })
 
+$NavLogoPanel = $sync["Form"].FindName("NavLogoPanel")
+$NavLogoPanel.Children.Add((Invoke-WinUtilAssets -Type "logo" -Size 25)) | Out-Null
+
 # Initialize the hashtable
 $winutildir = @{}
 
 # Set the path for the winutil directory
 $winutildir["path"] = "$env:LOCALAPPDATA\winutil\"
-[System.IO.Directory]::CreateDirectory("$winutildir") | Out-Null
+[System.IO.Directory]::CreateDirectory($winutildir["path"]) | Out-Null
 
-# Set the path for the logo and checkmark images
-$winutildir["logo.png"] = $winutildir["path"] + "cttlogo.png"
 $winutildir["logo.ico"] = $winutildir["path"] + "cttlogo.ico"
-if (-NOT (Test-Path -Path $winutildir["logo.png"])) {
-    Invoke-WebRequest -Uri "https://christitus.com/images/logo-full.png" -OutFile $winutildir["logo.png"]
-}
-if (-NOT (Test-Path -Path $winutildir["logo.ico"])) {
-    ConvertTo-Icon -bitmapPath $winutildir["logo.png"] -iconPath $winutildir["logo.ico"]
-}
 
-$winutildir["checkmark.png"] = $winutildir["path"] + "checkmark.png"
-$winutildir["warning.png"] = $winutildir["path"] + "warning.png"
-if (-NOT (Test-Path -Path $winutildir["checkmark.png"])) {
-    Invoke-WebRequest -Uri "https://christitus.com/images/checkmark.png" -OutFile $winutildir["checkmark.png"]
+if (Test-Path $winutildir["logo.ico"]) {
+    $sync["logorender"] = $winutildir["logo.ico"]
+} else {
+    $sync["logorender"] = (Invoke-WinUtilAssets -Type "Logo" -Size 90 -Render)
 }
-if (-NOT (Test-Path -Path $winutildir["warning.png"])) {
-    Invoke-WebRequest -Uri "https://christitus.com/images/warning.png" -OutFile $winutildir["warning.png"]
-}
-
+$sync["checkmarkrender"] = (Invoke-WinUtilAssets -Type "checkmark" -Size 512 -Render)
+$sync["warningrender"] = (Invoke-WinUtilAssets -Type "warning" -Size 512 -Render)
 
 Set-WinUtilTaskbaritem -overlay "logo"
 
 $sync["Form"].Add_Activated({
     Set-WinUtilTaskbaritem -overlay "logo"
 })
+# Define event handler for ThemeButton click
+$sync["ThemeButton"].Add_Click({
+    if ($sync.ThemePopup.IsOpen) {
+        $sync.ThemePopup.IsOpen = $false
+    }
+    else{
+        $sync.ThemePopup.IsOpen = $true
+    }
+    $sync.SettingsPopup.IsOpen = $false
+})
+
+# Define event handlers for menu items
+$sync["AutoThemeMenuItem"].Add_Click({
+    $sync.ThemePopup.IsOpen = $false
+    Invoke-WinutilThemeChange -theme "Auto"
+    $_.Handled = $false
+  })
+  # Define event handlers for menu items
+$sync["DarkThemeMenuItem"].Add_Click({
+    $sync.ThemePopup.IsOpen = $false
+    Invoke-WinutilThemeChange -theme "Dark"
+    $_.Handled = $false
+  })
+# Define event handlers for menu items
+$sync["LightThemeMenuItem"].Add_Click({
+    $sync.ThemePopup.IsOpen = $false
+    Invoke-WinutilThemeChange -theme "Light"
+    $_.Handled = $false
+  })
+
 
 # Define event handler for button click
 $sync["SettingsButton"].Add_Click({
     Write-Debug "SettingsButton clicked"
-    if ($sync["SettingsPopup"].IsOpen) {
-        $sync["SettingsPopup"].IsOpen = $false
-    } else {
-        $sync["SettingsPopup"].IsOpen = $true
+    if ($sync.SettingsPopup.IsOpen) {
+        $sync.SettingsPopup.IsOpen = $false
     }
+    else{
+        $sync.SettingsPopup.IsOpen = $true
+    }
+    $sync.ThemePopup.IsOpen = $false
     $_.Handled = $false
 })
 
@@ -525,12 +595,8 @@ MicroWin : <a href="https://github.com/KonTy">@KonTy</a>
 GitHub   : <a href="https://github.com/ChrisTitusTech/winutil">ChrisTitusTech/winutil</a>
 Version  : <a href="https://github.com/ChrisTitusTech/winutil/releases/tag/$($sync.version)">$($sync.version)</a>
 "@
-    $FontSize = $sync.configs.themes.$ctttheme.CustomDialogFontSize
-    $HeaderFontSize = $sync.configs.themes.$ctttheme.CustomDialogFontSizeHeader
-    $IconSize = $sync.configs.themes.$ctttheme.CustomDialogIconSize
-    $Width = $sync.configs.themes.$ctttheme.CustomDialogWidth
-    $Height = $sync.configs.themes.$ctttheme.CustomDialogHeight
-    Show-CustomDialog -Message $authorInfo -Width $Width -Height $Height -FontSize $FontSize -HeaderFontSize $HeaderFontSize -IconSize $IconSize
+
+    Show-CustomDialog -Message $authorInfo -LogoSize $LogoSize
 })
 
 $sync["SponsorMenuItem"].Add_Click({
@@ -551,12 +617,8 @@ $sync["SponsorMenuItem"].Add_Click({
         $authorInfo += "An error occurred while fetching or processing the sponsors: $_`n"
     }
 
-    $FontSize = $sync.configs.themes.$ctttheme.CustomDialogFontSize
-    $HeaderFontSize = $sync.configs.themes.$ctttheme.CustomDialogFontSizeHeader
-    $IconSize = $sync.configs.themes.$ctttheme.CustomDialogIconSize
-    $Width = $sync.configs.themes.$ctttheme.CustomDialogWidth
-    $Height = $sync.configs.themes.$ctttheme.CustomDialogHeight
-    Show-CustomDialog -Message $authorInfo -Width $Width -Height $Height -FontSize $FontSize -HeaderFontSize $HeaderFontSize -IconSize $IconSize -EnableScroll $true
+    Show-CustomDialog -Message $authorInfo -EnableScroll $true
 })
+
 $sync["Form"].ShowDialog() | out-null
 Stop-Transcript

tools/Invoke-Preprocessing.ps1

@@ -72,80 +72,45 @@ function Invoke-Preprocessing {
         throw "[Invoke-Preprocessing] Invalid Paramter Value for 'WorkingDir', passed value: '$WorkingDir'. Either the path is a File or Non-Existing/Invlid, please double check your code."
     }
 
-    $count = $ExcludedFiles.Count
-
-    # Make sure there's a * at the end of folders in ExcludedFiles list
-    for ($i = 0; $i -lt $count; $i++) {
-        $excludedFile = $ExcludedFiles[$i]
-        $isFolder = ($excludedFile) -match '\\$'
-        if ($isFolder) { $ExcludedFiles[$i] = $excludedFile + '*' }
+    $InternalExcludedFiles = [System.Collections.Generic.List[string]]::new($ExcludedFiles.Count)
+    ForEach ($excludedFile in $ExcludedFiles) {
+        $InternalExcludedFiles.Add($excludedFile) | Out-Null
     }
 
-    # 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]
+    # Validate the ExcludedItems List before continuing on,
+    # that's if there's a list in the first place, and '-SkipInternalExcludedFilesValidation' was not provided.
+    if ($ExcludedFiles.Count -gt 0) {
+        ForEach ($excludedFile in $ExcludedFiles) {
             $filePath = "$(($WorkingDir -replace ('\\$', '')) + '\' + ($excludedFile -replace ('\.\\', '')))"
-
-            # Handle paths with wildcards in a different implementation
-            $matches = ($filePath) -match '^.*?\*'
-
-            if ($matches) {
-                if (-NOT (Get-ChildItem -Recurse -Path "$filePath" -File -Force)) {
-                    $failedFilesList += "'$filePath', "
+            $files = Get-ChildItem -Recurse -Path "$filePath" -File -Force
+            if ($files.Count -gt 0) {
+                ForEach ($file in $files) {
+                    $InternalExcludedFiles.Add("$($file.FullName)") | Out-Null
                 }
-            } else {
-                if (-NOT (Test-Path -Path "$filePath")) {
-                    $failedFilesList += "'$filePath', "
-                }
-            }
+            } else { $failedFilesList += "'$filePath', " }
         }
         $failedFilesList = $failedFilesList -replace (',\s*$', '')
-        if (-NOT $failedFilesList -eq "") {
+        if ((-not $failedFilesList -eq "") -and (-not $SkipExcludedFilesValidation)) {
             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"
         }
     }
 
     # Get Files List
-    [System.Collections.ArrayList]$files = Get-ChildItem $WorkingDir -Recurse -Exclude $ExcludedFiles -File -Force
-    $numOfFiles = $files.Count
+    [System.Collections.ArrayList]$files = Get-ChildItem -LiteralPath $WorkingDir -Recurse -Exclude $InternalExcludedFiles -File -Force
 
     # Only keep the 'FullName' Property for every entry in the list
-    for ($i = 0; $i -lt $numOfFiles; $i++) {
+    for ($i = 0; $i -lt $files.Count; $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) }
-        }
+    ForEach ($excludedFile in $InternalExcludedFiles) {
+        $index = $files.IndexOf("$excludedFile")
+        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) {