Fix problem with unpacking script when old Config files exist

- Moved all config files to a dedicated `Config` folder. This includes `Features.json`, `DefaultSettings,json`, `Apps.json`, `LastUsedSettings.json` and `CustomAppsList`
- Updated CONTRIBUTING.md file
- Replaced support button with a `Report a bug` button when script encounters an error when applying changes
- Fixed error with importing modules when launching the script from PowerShell 7 (#510)
- Add option to hide the 'All Apps' section from the start menu (#513)

.github/CONTRIBUTING.md

@@ -0,0 +1,347 @@
+# How to Contribute?
+
+We welcome contributions from the community. You can contribute to Win11Debloat by:
+- Reporting issues and bugs [here](https://github.com/Raphire/Win11Debloat/issues/new?template=bug_report.yml)
+- Submitting feature requests [here](https://github.com/Raphire/Win11Debloat/issues/new?template=feature_request.yml)
+- Testing Win11Debloat
+- Creating a pull request
+- Improving the documentation
+
+# Testing Win11Debloat
+
+You can help us test the latest changes and additions to the script. If you encounter any issues, please report them [here](https://github.com/Raphire/Win11Debloat/issues/new?template=bug_report.yml).
+
+> [!WARNING]
+> The prerelease version of Win11Debloat is meant for developers to test the script. Don't use this in production environments!
+
+You can launch the prerelease version of Win11Debloat by running this command:
+```ps1
+& ([scriptblock]::Create((irm "https://debloat.raphi.re/dev")))
+```
+
+# Contributing Code
+
+## Getting Started
+
+### Fork and Clone the Repository
+
+1. **Fork the project** on GitHub by clicking the "Fork" button at the top right of the repository page.
+
+2. **Clone the repository** to your local machine:
+   ```powershell
+   git clone https://github.com/YOUR-USERNAME/Win11Debloat.git
+   cd Win11Debloat
+   ```
+
+3. **Create a new branch** for your contribution:
+   ```powershell
+   git checkout -b feature/your-feature-name
+   ```
+
+### Running the Script Locally
+
+1. Open PowerShell as an administrator
+2. Enable script execution if necessary:
+   ```powershell
+   Set-ExecutionPolicy Unrestricted -Scope Process -Force
+   ```
+3. Navigate to your Win11Debloat directory
+4. Run the script:
+   ```powershell
+   .\Win11Debloat.ps1
+   ```
+
+## Implementation Guidelines
+
+### Project Structure
+
+Understanding the project structure is essential for contributing effectively:
+
+```
+Win11Debloat/
+├── Win11Debloat.ps1             # Main PowerShell script
+├── Scripts/                     # Additional PowerShell scripts and functions
+│    └── Get.ps1                 # Script used for the quick launch method to automatically download and run Win11debloat
+├── Config/
+│   ├── Apps.json                # List of supported apps for removal
+│   ├── DefaultSettings.json     # Default configuration preset
+│   ├── Features.json            # All features with metadata
+│   └── LastUsedSettings.json    # Last used configuration (generated during use)
+├── Regfiles/                    # Registry files for each feature
+└── Schemas/                     # XAML Schemas for GUI elements
+```
+
+### Best Practices
+
+1. **Test Thoroughly**: Always test your changes on a Windows test environment before submitting. This includes undoing tweaks and running script as another user and in Sysprep mode.
+2. **Document Changes**: Update the `README.md` and other relevant documentation. Wiki documentation will be generated/updated based on the `Features.json` and `Apps.json` files.
+3. **Follow Existing Patterns**: Look at existing implementations for guidance.
+4. **Use Clear Naming**: Choose descriptive names for features, IDs, and registry files.
+5. **Minimal Changes**: Registry files should only modify what's necessary.
+6. **Comment Your Code**: Add comments explaining your reasoning for complex logic in PowerShell scripts.
+7. **Version Constraints**: Use `MinVersion` and `MaxVersion` if a feature only applies to specific Windows versions.
+8. **Limit pull requests to 1 feature**: Keep pull requests limited to just one feature, this makes it easier to review your changes.
+
+### Code Style
+
+- Use **4 spaces** for indentation in PowerShell scripts
+- Use **2 spaces** for indentation in JSON files
+- Follow existing naming conventions
+- Keep lines reasonable in length
+- Use descriptive variable names
+- Try to limit your indentation to a max of 4-5 levels, if possible.
+- Use [Segoe Fluent Icon Assets](https://learn.microsoft.com/en-us/windows/apps/design/iconography/segoe-fluent-icons-font) for icons.
+
+### Common Pitfalls
+
+Avoid these common mistakes when contributing:
+
+1. **Forgetting Get.ps1**: When adding a new command-line parameter, contributors often remember to add it to `Win11Debloat.ps1` but forget to add the same parameter to `Scripts/Get.ps1`. Both files **must** have matching parameters.
+
+2. **Missing Registry Files**: Always create an `Undo` registry file for reversibility, aswell as a `Sysprep` registry file for Sysprep mode.
+
+3. **Incorrect Registry Hives for Sysprep**: Sysprep registry files apply changes to Windows' default user, registry keys in the `HKEY_CURRENT_USER` hive must use `hkey_users\default` instead. Ensure you update **all** registry keys in the file.
+
+4. **Wrong Registry File Location**:
+   - Main action files go in `Regfiles/`
+   - Undo files go in `Regfiles/Undo/`
+   - Sysprep files go in `Regfiles/Sysprep/`
+
+   Placing files in the wrong directory will cause the script to fail when trying to apply or undo changes.
+
+6. **Not Testing Undo Functionality**: Always test that your undo registry file properly reverts all changes. A feature that can't be undone will frustrate users.
+
+7. **Not Testing User/Sysprep Functionality**: Always test that your feature works when applied to another user or to the Windows default user with Sysprep. Sysprep changes can be tested by creating new users after running the script.
+
+7. **Missing Category**: Features without a `Category` field (set to `null`) won't appear in the GUI. This is intentional for command-line-only features, make sure this is what you want before submitting.
+
+8. **Hardcoded Paths**: When writing PowerShell logic, use `$PSScriptRoot` and script variables instead of hardcoded paths. This ensures the script works regardless of where it's installed.
+
+## Implementing New Features
+
+### Adding Support for a New App
+
+> [!NOTE]
+> The script automatically generates the app options for the GUI from the app information in the Apps.json file.
+
+To add a new app that can be removed via Win11Debloat:
+
+1. **Find the AppId**: To find the correct AppId for an app:
+   ```powershell
+   Get-AppxPackage | Select-Object Name, PackageFullName
+   ```
+
+2. **Edit `Config/Apps.json`**: Add a new entry to the `"Apps"` array:
+   ```json
+   {
+     "FriendlyName": "Display Name",
+     "AppId": "AppPackageIdentifier",
+     "Description": "Brief description of the app",
+     "SelectedByDefault": true|false
+   }
+   ```
+
+3. **Follow the Guidelines**:
+- Use clear, user-friendly names for `FriendlyName`
+- Set `SelectedByDefault` to `true` only for apps that are largely considered bloatware, otherwise set to `false`
+- Provide a concise description explaining what the app does
+
+### Adding a New Feature
+
+Features are defined in `Config/Features.json` and can modify Windows settings via registry files or PowerShell commands.
+
+> [!NOTE]
+> For simple features that just include a registry change, no actual coding is required in the main script except for adding the corresponding command-line parameters. The GUI is automatically built using the information in the Features.json file.
+
+#### 1a. Create the Registry File(s)
+
+Create new registry files in the `Regfiles/` directory:
+
+- **Disable file**: `Disable_YourFeature.reg`
+- **Enable file**: `Undo/Enable_YourFeature.reg` (for reverting)
+- **Sysprep file**: `Sysprep/Disable_YourFeature.reg` (for Sysprep mode)
+
+Example registry file structure:
+```reg
+Windows Registry Editor Version 5.00
+
+[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\YourPath]
+"SettingName"=dword:00000000
+```
+
+A Sysprep registry file should apply the same changes as the normal action. Replace the hive of registry keys that start with `HKEY_CURRENT_USER` with `hkey_users\default`. For example:
+```reg
+Windows Registry Editor Version 5.00
+
+[hkey_users\default\Software\Microsoft\Windows\CurrentVersion\YourPath]
+"SettingName"=dword:00000000
+```
+
+#### 1b. Implement the Feature Logic
+
+If your feature requires more than just applying a registry file, add custom logic to the main script in the appropriate section. In most cases this will involve creating a new entry in the `ExecuteParameter` function for your new feature.
+
+#### 2. Add Feature to Features.json
+
+Add your feature to the `"Features"` array in `Config/Features.json`:
+
+```json
+{
+  "FeatureId": "YourFeatureId",
+  "Label": "Short label describing the feature",
+  "ToolTip": "Detailed explanation of what this feature does and its impact.",
+  "Category": "Privacy & Suggested Content",
+  "Priority": 1,
+  "Action": "Disable",
+  "RegistryKey": "Disable_YourFeature.reg",
+  "ApplyText": "Disabling your feature...",
+  "UndoAction": "Enable",
+  "RegistryUndoKey": "Enable_YourFeature.reg",
+  "RequiresReboot": false,
+  "MinVersion": null,
+  "MaxVersion": null
+}
+```
+
+**Field Descriptions**:
+- `FeatureId`: Unique identifier (must match parameter name in Win11Debloat.ps1 and Get.ps1)
+- `Label`: Short description shown in the UI, written in a way to fit with the Action or UndoAction prefixed
+- `ToolTip`: Detailed explanation of what the feature does, used for tooltips in the GUI
+- `Category`: One of the predefined categories (see Categories array in Features.json), features without a category won't be loaded into the GUI.
+- `Priority`: Optional. The priority value (int) is used to sort features within a category. If this field is omitted the feature will be sorted based on the order in the Features.json file.
+- `Action`: Action word for the feature (e.g., "Disable", "Enable", "Hide", "Show")
+- `RegistryKey`: Filename of the registry file to apply (in Regfiles/ directory) or null if feature does not require registry changes
+- `ApplyText`: Message shown when applying the feature
+- `UndoAction`: Action word for reverting (e.g., "Enable", "Show")
+- `RegistryUndoKey`: Filename of the registry file to revert changes or null if feature does not require registry changes
+- `RequiresReboot`: Optional boolean. Set to `true` if the feature requires a system reboot to take effect
+- `MinVersion`: Minimum Windows build version (e.g., "22000") or null
+- `MaxVersion`: Maximum Windows version or null
+
+#### 3. Add Command-Line Parameter
+
+Add a corresponding parameter to both `Win11Debloat.ps1` AND `Scripts/Get.ps1`, the parameter name should match the FeatureId you have defined in `Features.json`. In most cases this will be a switch parameter, example:
+```powershell
+[switch]$YourFeatureId,
+```
+
+### Adding a Feature to the Default Preset
+
+> [!IMPORTANT]
+> The default preset is intentionally conservative. Features added to it should be thoroughly tested and widely beneficial. When in doubt, leave the feature out of the default preset.
+
+The default preset (`Config/DefaultSettings.json`) defines which features are automatically applied when users run Win11Debloat in "Default Mode" or with the `-RunDefaults` parameter. This preset should include features that are widely considered to improve the Windows experience without breaking functionality.
+
+**When to add a feature to the default preset:**
+- The feature removes obvious bloatware or distractions
+- The feature enhances privacy without breaking core functionality
+- The feature is generally non-controversial and beneficial to most users
+- The change can be easily reverted if needed
+
+**When NOT to add a feature to the default preset:**
+- The feature significantly changes core Windows behavior
+- The feature might break applications or workflows for some users
+- The feature is highly opinionated or preference-based
+- The feature is experimental or not thoroughly tested
+
+To add your feature to the default preset, edit `Config/DefaultSettings.json` and add a new entry to the `"Settings"` array:
+
+```json
+{
+  "Name": "YourFeatureId",
+  "Value": true
+}
+```
+
+**Field Descriptions**:
+- `Name`: Must exactly match the `FeatureId` from Features.json
+- `Value`: Set to `true` to enable the feature in default mode
+
+**Example:**
+```json
+{
+  "Version": "1.0",
+  "Settings": [
+    {
+      "Name": "CreateRestorePoint",
+      "Value": true
+    },
+    {
+      "Name": "DisableTelemetry",
+      "Value": true
+    },
+    {
+      "Name": "YourFeatureId",
+      "Value": true
+    }
+  ]
+}
+```
+
+### Adding a Category
+
+To add a new category for organizing features:
+
+- Add a new category entry to the `"Categories"` array in `Config/Features.json`:
+   ```json
+   {
+     "Name": "Your Category Name",
+     "Icon": "&#xE#### ;"
+   }
+   ```
+
+> [!TIP]
+> Use [Segoe Fluent Icon Assets](https://learn.microsoft.com/en-us/windows/apps/design/iconography/segoe-fluent-icons-font) for icon codes.
+
+### Adding UI Groups
+
+UI Groups allow features to be grouped together in the GUI with a combobox (dropdown) selection:
+
+```json
+{
+  "GroupId": "UniqueGroupId",
+  "Label": "Display label for the group",
+  "ToolTip": "Explanation of what this group controls",
+  "Category": "Category Name",
+  "Priority": 1,
+  "Values": [
+    {
+      "Label": "Option 1",
+      "FeatureIds": ["FeatureId1"]
+    },
+    {
+      "Label": "Option 2",
+      "FeatureIds": ["FeatureId2"]
+    }
+  ]
+}
+```
+
+## Submitting a Pull Request
+
+1. **Commit your changes** with clear, descriptive commit messages:
+   ```powershell
+   git add .
+   git commit -m "Add feature: Description of your changes"
+   ```
+
+2. **Push to your fork**:
+   ```powershell
+   git push origin feature/your-feature-name
+   ```
+
+3. **Create a Pull Request** on GitHub:
+   - Go to the original Win11Debloat repository
+   - Click "New Pull Request"
+   - Select your fork and branch
+   - Provide a clear description of your changes, include references to the registry keys used
+   - Reference any related issues
+
+4. **Respond to feedback**: Be prepared to make adjustments based on code review feedback.
+
+# Questions?
+
+If you have questions about contributing, feel free to:
+- Open a [discussion](https://github.com/Raphire/Win11Debloat/discussions)
+- Comment on an existing issue
+- Ask in your pull request

.gitignore

@@ -2,4 +2,5 @@ LastSettings
 SavedSettings
 LastUsedSettings.json
 CustomAppsList
+Logs/*
 Win11Debloat.log

Config/Apps.json

@@ -73,6 +73,18 @@
       "Description": "AI assistant integrated into Windows",
       "SelectedByDefault": true
     },
+    {
+      "FriendlyName": "Copilot+ AI Hub",
+      "AppId": "Microsoft.Windows.AIHub",
+      "Description": "Copilot+ AI Hub app (Windows 11 24H2+)",
+      "SelectedByDefault": true
+    },
+    {
+      "FriendlyName": "Microsoft PC Manager",
+      "AppId": "Microsoft.PCManager",
+      "Description": "Microsoft PC Manager system cleanup and optimization tool (often preinstalled)",
+      "SelectedByDefault": true
+    },
     {
       "FriendlyName": "Get Started",
       "AppId": "Microsoft.Getstarted",
@@ -236,15 +248,15 @@
       "SelectedByDefault": true
     },
     {
-      "FriendlyName": "MS Teams (Old)",
+      "FriendlyName": "Microsoft Teams (Old)",
       "AppId": "MicrosoftTeams",
-      "Description": "Old MS Teams personal (MS Store version)",
+      "Description": "Old Microsoft Teams personal (MS Store version)",
       "SelectedByDefault": true
     },
     {
-      "FriendlyName": "MS Teams (New)",
+      "FriendlyName": "Microsoft Teams (New)",
       "AppId": "MSTeams",
-      "Description": "New MS Teams app (Work/School or Personal)",
+      "Description": "New Microsoft Teams app (Work/School or Personal)",
       "SelectedByDefault": true
     },
     {
@@ -544,7 +556,7 @@
     {
       "FriendlyName": "Microsoft Edge",
       "AppId": "Microsoft.Edge",
-      "Description": "Edge browser (Can only be uninstalled in European Economic Area)",
+      "Description": "Windows' default browser. WARNING: Removing this app also removes the only browser from Windows Sandbox and could affect other apps.",
       "SelectedByDefault": false
     },
     {
@@ -664,7 +676,7 @@
     {
       "FriendlyName": "Xbox TCUI Framework",
       "AppId": "Microsoft.Xbox.TCUI",
-      "Description": "UI framework, seems to be required for MS store, photos and certain games",
+      "Description": "UI framework, seems to be required for Microsoft Store, photos and certain games",
       "SelectedByDefault": false
     },
     {
@@ -828,6 +840,36 @@
       "AppId": "AD2F1837.myHP",
       "Description": "HP OEM central hub app for device info, support, and services",
       "SelectedByDefault": false
+    },
+    {
+      "FriendlyName": "Lenovo Vantage",
+      "AppId": "E046963F.LenovoCompanion",
+      "Description": "Lenovo OEM hub app for device settings, updates, and support",
+      "SelectedByDefault": false
+    },
+    {
+      "FriendlyName": "Lenovo Vantage Service",
+      "AppId": "LenovoCompanyLimited.LenovoVantageService",
+      "Description": "Background service component for Lenovo Vantage",
+      "SelectedByDefault": false
+    },
+    {
+      "FriendlyName": "Dell SupportAssist",
+      "AppId": "DellInc.DellSupportAssistforPCs",
+      "Description": "Dell OEM support, diagnostic, and update tool",
+      "SelectedByDefault": false
+    },
+    {
+      "FriendlyName": "Dell Digital Delivery Services",
+      "AppId": "DellInc.DellDigitalDelivery",
+      "Description": "Dell OEM software for delivering pre-purchased software",
+      "SelectedByDefault": false
+    },
+    {
+      "FriendlyName": "Dell Mobile Connect",
+      "AppId": "DellInc.DellMobileConnect",
+      "Description": "Dell OEM app for linking Android/iOS phone to PC (superseded by Phone Link)",
+      "SelectedByDefault": false
     }
   ]
 }

Config/DefaultSettings.json

@@ -25,6 +25,14 @@
             "Name": "DisableBing",
             "Value": true
         },
+        {
+            "Name": "DisableStoreSearchSuggestions",
+            "Value": true
+        },
+        {
+            "Name": "DisableSearchHighlights",
+            "Value": true
+        },
         {
             "Name": "DisableCopilot",
             "Value": true
@@ -37,6 +45,10 @@
             "Name": "DisableClickToDo",
             "Value": true
         },
+        {
+            "Name": "DisableAISvcAutoStart",
+            "Value": true
+        },
         {
             "Name": "DisableWidgets",
             "Value": true

README.md

@@ -4,9 +4,9 @@
 [![Join the Discussion](https://img.shields.io/badge/Join-the%20Discussion-2D9F2D?style=for-the-badge&logo=github&logoColor=white)](https://github.com/Raphire/Win11Debloat/discussions)
 [![Static Badge](https://img.shields.io/badge/Documentation-_?style=for-the-badge&logo=bookstack&color=grey)](https://github.com/Raphire/Win11Debloat/wiki/)
 
- Win11Debloat is a lightweight, easy to use PowerShell script that allows you to quickly declutter and improve your Windows experience. It can remove pre-installed bloatware apps, disable telemetry, remove intrusive interface elements and much more. No need to painstakingly go through all the settings yourself or remove apps one by one. Win11Debloat makes the process quick and easy!
+ Win11Debloat is a lightweight, easy to use PowerShell script that allows you to quickly declutter and customize your Windows experience. It can remove pre-installed bloatware apps, disable telemetry, remove intrusive interface elements and much more. No need to painstakingly go through all the settings yourself or remove apps one by one. Win11Debloat makes the process quick and easy!
 
-The script also includes many features that system administrators and power users will enjoy. Such as support for Windows Audit mode, the option to make changes to other Windows users and the ability to access all of Win11Debloat's features right from the command-line. Please refer to our [wiki](https://github.com/Raphire/Win11Debloat/wiki/) for more details.
+The script also includes many features that system administrators and power users will enjoy. Such as a powerful command-line interface, support for Windows Audit mode and the option to make changes to other Windows users. Please refer to our [wiki](https://github.com/Raphire/Win11Debloat/wiki/) for more details.
 
 ![Win11Debloat Menu](/Assets/Images/menu.png)
 
@@ -33,7 +33,7 @@ Download & run the script automatically via PowerShell.
 3. Wait for the script to automatically download Win11Debloat.
 4. Carefully read through and follow the on-screen instructions.
 
-This method supports command-line parameters to customize the behaviour of the script. Please click [here](https://github.com/Raphire/Win11Debloat/wiki/How-To-Use#parameters) for more information.
+This method supports command-line parameters to customize the behaviour of the script. Please click [here](https://github.com/Raphire/Win11Debloat/wiki/Command%E2%80%90line-Interface#parameters) for more information.
 
 ### Traditional method
 
@@ -69,7 +69,7 @@ This method supports command-line parameters to customize the behaviour of the s
 
   6. Carefully read through and follow the on-screen instructions.
 
-  This method supports command-line parameters to customize the behaviour of the script. Please click [here](https://github.com/Raphire/Win11Debloat/wiki/How-To-Use#parameters) for more information.
+  This method supports command-line parameters to customize the behaviour of the script. Please click [here](https://github.com/Raphire/Win11Debloat/wiki/Command%E2%80%90line-Interface#parameters) for more information.
 </details>
 
 ## Features
@@ -87,6 +87,8 @@ Below is an overview of the key features and functionality offered by Win11Deblo
 
 - Disable telemetry, diagnostic data, activity history, app-launch tracking & targeted ads.
 - Disable tips, tricks, suggestions & ads across Windows.
+- Disable Windows location services & app location access.
+- Disable Find My Device location tracking.
 - Disable 'Windows Spotlight' and tips & tricks on the lock screen.
 - Disable 'Windows Spotlight' desktop background option.
 - Disable ads, suggestions and the MSN news feed in Microsoft Edge.
@@ -97,6 +99,7 @@ Below is an overview of the key features and functionality offered by Win11Deblo
 - Disable & remove Microsoft Copilot.
 - Disable Windows Recall. (W11 only)
 - Disable Click to Do, AI text & image analysis tool. (W11 only)
+- Prevent AI service (WSAIFabricSvc) from starting automatically. (W11 only)
 - Disable AI Features in Edge. (W11 only)
 - Disable AI Features in Paint. (W11 only)
 - Disable AI Features in Notepad. (W11 only)
@@ -107,6 +110,7 @@ Below is an overview of the key features and functionality offered by Win11Deblo
 - Restore the old Windows 10 style context menu. (W11 only)
 - Turn off Enhance Pointer Precision, also known as mouse acceleration.
 - Disable the Sticky Keys keyboard shortcut. (W11 only)
+- Disable Storage Sense automatic disk cleanup.
 - Disable fast start-up to ensure a full shutdown.
 - Disable BitLocker automatic device encryption.
 - Disable network connectivity during Modern Standby to reduce battery drain. (W11 only)
@@ -123,12 +127,16 @@ Below is an overview of the key features and functionality offered by Win11Deblo
 - Disable transparency effects
 - Disable animations and visual effects.
 
-#### Start Menu
+#### Start Menu & Search
 
-- Remove or replace all pinned apps from start for the current user, or for all existing & new users. (W11 only)
-- Disable the recommended section in the start menu. (W11 only)
-- Disable Bing web search & Copilot integration in Windows search.
+- Remove or replace all pinned apps from the start menu. (W11 only)
+- Hide the recommended section in the start menu. (W11 only)
+- Hide the 'All Apps' section in the start menu. (W11 only)
 - Disable the Phone Link mobile devices integration in the start menu. (W11 only)
+- Disable Bing web search & Copilot integration in Windows search.
+- Disable Microsoft Store app suggestions in Windows search. (W11 only)
+- Disable Search Highlights (dynamic/branded content) in the taskbar search box. (W11 only)
+- Disable local Windows search history.
 
 #### Taskbar
 
@@ -160,6 +168,11 @@ Below is an overview of the key features and functionality offered by Win11Deblo
 - Disable Snap Layout suggestions when dragging windows to the top of screen and when hovering on the maximize button. (W11 only)
 - Change if tabs are shown when snapping or pressing Alt+Tab. (W11 only)
 
+#### Optional Windows Features
+
+- Enable Windows Sandbox, a lightweight desktop environment for safely running applications in isolation. (W11 only)
+- Enable Windows Subsystem for Linux which allows you to run a Linux environment directly on Windows. (W11 only)
+
 #### Other
 
 - Disable Xbox Game Bar integration & game/screen recording. This also disables `ms-gamingoverlay`/`ms-gamebar` popups if you uninstall the Xbox Game Bar.
@@ -170,6 +183,10 @@ Below is an overview of the key features and functionality offered by Win11Deblo
 - Option to [apply changes to a different user](https://github.com/Raphire/Win11Debloat/wiki/Advanced-Features#running-as-another-user), instead of the currently logged in user.
 - [Sysprep mode](https://github.com/Raphire/Win11Debloat/wiki/Advanced-Features#sysprep-mode) to apply changes to the Windows Default user profile. Which ensures, all new users will have the changes automatically applied to them.
 
+## Contributing
+
+We welcome contributions of all kinds! Please see our [Contributing Guidelines](/.github/CONTRIBUTING.md) for detailed instructions on how to get started and best practices for contributing.
+
 ## License
 
 Win11Debloat is licensed under the MIT license. See the LICENSE file for more information.

Regfiles/Disable_AI_Service_Auto_Start.reg

@@ -0,0 +1,4 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WSAIFabricSvc]
+"Start"=dword:00000003

Regfiles/Disable_Find_My_Device.reg

@@ -0,0 +1,5 @@
+Windows Registry Editor Version 5.00
+
+; Disable Find My Device location tracking
+[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\FindMyDevice]
+"AllowFindMyDevice"=dword:00000000

Regfiles/Disable_Location_Services.reg

@@ -0,0 +1,4 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\LocationAndSensors]
+"DisableLocation"=dword:00000001

Regfiles/Disable_Search_Highlights.reg

@@ -0,0 +1,5 @@
+Windows Registry Editor Version 5.00
+
+; Disable Search Highlights (dynamic/branded content in Windows search box)
+[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\SearchSettings]
+"IsDynamicSearchBoxEnabled"=dword:00000000

Regfiles/Disable_Search_History.reg

@@ -0,0 +1,5 @@
+Windows Registry Editor Version 5.00
+
+; Disable Windows search history
+[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\SearchSettings]
+"IsDeviceSearchHistoryEnabled"=dword:00000000

Regfiles/Disable_Start_All_Apps.reg

@@ -0,0 +1,4 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Policies\Explorer]
+"NoStartMenuMorePrograms"=dword:00000001

Regfiles/Disable_Storage_Sense.reg

@@ -0,0 +1,5 @@
+Windows Registry Editor Version 5.00
+
+; Disable Storage Sense
+[HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\StorageSense\Parameters\StoragePolicy]
+"01"=dword:00000000

Regfiles/Sysprep/Disable_AI_Service_Auto_Start.reg

@@ -0,0 +1,4 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WSAIFabricSvc]
+"Start"=dword:00000003

Regfiles/Sysprep/Disable_Find_My_Device.reg

@@ -0,0 +1,5 @@
+Windows Registry Editor Version 5.00
+
+; Disable Find My Device location tracking
+[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\FindMyDevice]
+"AllowFindMyDevice"=dword:00000000

Regfiles/Sysprep/Disable_Location_Services.reg

@@ -0,0 +1,4 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\LocationAndSensors]
+"DisableLocation"=dword:00000001

Regfiles/Sysprep/Disable_Search_Highlights.reg

@@ -0,0 +1,5 @@
+Windows Registry Editor Version 5.00
+
+; Disable Search Highlights (dynamic/branded content in Windows search box)
+[hkey_users\default\Software\Microsoft\Windows\CurrentVersion\SearchSettings]
+"IsDynamicSearchBoxEnabled"=dword:00000000

Regfiles/Sysprep/Disable_Search_History.reg

@@ -0,0 +1,5 @@
+Windows Registry Editor Version 5.00
+
+; Disable Windows search history
+[hkey_users\default\Software\Microsoft\Windows\CurrentVersion\SearchSettings]
+"IsDeviceSearchHistoryEnabled"=dword:00000000

Regfiles/Sysprep/Disable_Start_All_Apps.reg

@@ -0,0 +1,4 @@
+Windows Registry Editor Version 5.00
+
+[hkey_users\default\Software\Microsoft\Windows\CurrentVersion\Policies\Explorer]
+"NoStartMenuMorePrograms"=dword:00000001

Regfiles/Sysprep/Disable_Storage_Sense.reg

@@ -0,0 +1,6 @@
+Windows Registry Editor Version 5.00
+
+; Disable Storage Sense
+[HKEY_USERS\Default\SOFTWARE\Microsoft\Windows\CurrentVersion\StorageSense\Parameters\StoragePolicy]
+"01"=dword:00000000
+

Regfiles/Undo/Enable_AI_Service_Auto_Start.reg

@@ -0,0 +1,4 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WSAIFabricSvc]
+"Start"=dword:00000002

Regfiles/Undo/Enable_Find_My_Device.reg

@@ -0,0 +1,5 @@
+Windows Registry Editor Version 5.00
+
+; Restore Find My Device to Windows default
+[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\FindMyDevice]
+"AllowFindMyDevice"=-

Regfiles/Undo/Enable_Location_Services.reg

@@ -0,0 +1,4 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\LocationAndSensors]
+"DisableLocation"=-

Regfiles/Undo/Enable_Search_Highlights.reg

@@ -0,0 +1,5 @@
+Windows Registry Editor Version 5.00
+
+; Re-enable Search Highlights (dynamic/branded content in Windows search box)
+[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\SearchSettings]
+"IsDynamicSearchBoxEnabled"=dword:00000001

Regfiles/Undo/Enable_Search_History.reg

@@ -0,0 +1,5 @@
+Windows Registry Editor Version 5.00
+
+; Disable Windows search history
+[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\SearchSettings]
+"IsDeviceSearchHistoryEnabled"=dword:00000001

Regfiles/Undo/Enable_Start_All_Apps.reg

@@ -0,0 +1,7 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Policies\Explorer]
+"NoStartMenuMorePrograms"=-
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer]
+"NoStartMenuMorePrograms"=-

Regfiles/Undo/Enable_Storage_Sense.reg

@@ -0,0 +1,6 @@
+Windows Registry Editor Version 5.00
+
+; Enable Storage Sense
+[HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\StorageSense\Parameters\StoragePolicy]
+"01"=dword:00000001
+

Run.bat

@@ -4,7 +4,10 @@ setlocal EnableDelayedExpansion
 :: Set Windows Terminal installation paths. (Default and Scoop installation)
 set "wtDefaultPath=%LOCALAPPDATA%\Microsoft\WindowsApps\wt.exe"
 set "wtScoopPath=%USERPROFILE%\scoop\apps\windows-terminal\current\wt.exe"
-set "logFile=%~dp0Win11Debloat.log"
+set "logFile=%~dp0Logs\Win11Debloat-Run.log"
+
+:: Ensure Logs folder exists
+if not exist "%~dp0Logs" mkdir "%~dp0Logs"
 
 :: Determine which terminal exists
 if exist "%wtDefaultPath%" (

Schemas/AboutWindow.xaml

@@ -0,0 +1,170 @@
+<Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="About Win11Debloat" 
+        Width="500"
+        SizeToContent="Height"
+        ResizeMode="NoResize"
+        WindowStartupLocation="CenterOwner"
+        WindowStyle="None"
+        AllowsTransparency="True"
+        Background="Transparent"
+        Topmost="True"
+        ShowInTaskbar="False">
+
+    <Border BorderBrush="{DynamicResource BorderColor}" 
+            BorderThickness="1" 
+            CornerRadius="8"
+            Background="{DynamicResource CardBgColor}"
+            Margin="25">
+        <Border.Effect>
+            <DropShadowEffect Color="Black" 
+                            Opacity="0.15" 
+                            BlurRadius="20" 
+                            ShadowDepth="0" 
+                            Direction="0"/>
+        </Border.Effect>
+        
+        <Grid Margin="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+
+            <!-- Title Bar -->
+            <Grid Grid.Row="0" x:Name="TitleBar" Height="48" Background="Transparent">
+                <TextBlock Text="About Win11Debloat" 
+                           Foreground="{DynamicResource FgColor}"
+                           FontSize="18"
+                           FontWeight="SemiBold"
+                           VerticalAlignment="Center" 
+                           Margin="20,0,0,0"/>
+            </Grid>
+
+            <!-- Message Content -->
+            <Grid Grid.Row="1">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+
+                <!-- Message Text -->
+                <Grid Grid.Row="0" Margin="24,12,24,20">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                    </Grid.RowDefinitions>
+                    
+                    <!-- Version -->
+                    <TextBlock Grid.Row="0" Grid.Column="0"
+                            Text="Version:" 
+                            FontSize="14"
+                            Foreground="{DynamicResource FgColor}"
+                            FontWeight="SemiBold"
+                            Margin="0,0,16,8"/>
+                    <TextBlock x:Name="VersionText"
+                            Grid.Row="0" Grid.Column="1"
+                            Text="0.0.0" 
+                            FontSize="14"
+                            Foreground="{DynamicResource FgColor}"
+                            Margin="0,0,0,8"/>
+                    
+                    <!-- Author -->
+                    <TextBlock Grid.Row="1" Grid.Column="0"
+                            Text="Author:" 
+                            FontSize="14"
+                            Foreground="{DynamicResource FgColor}"
+                            FontWeight="SemiBold"
+                            Margin="0,0,16,8"/>
+                    <TextBlock Grid.Row="1" Grid.Column="1"
+                            Text="Raphire" 
+                            FontSize="14"
+                            Foreground="{DynamicResource FgColor}"
+                            Margin="0,0,0,8"/>
+                    
+                    <!-- Project Link -->
+                    <TextBlock Grid.Row="2" Grid.Column="0"
+                            Text="Project:" 
+                            FontSize="14"
+                            Foreground="{DynamicResource FgColor}"
+                            FontWeight="SemiBold"
+                            Margin="0,0,16,0"/>
+                    <TextBlock x:Name="ProjectLink"
+                            Grid.Row="2" Grid.Column="1"
+                            Text="https://github.com/Raphire/Win11Debloat" 
+                            FontSize="14"
+                            Style="{DynamicResource HyperlinkStyle}"
+                            Margin="0,0,0,0"/>
+                </Grid>
+
+                <!-- Separator -->
+                <Border Grid.Row="1" 
+                        Height="1" 
+                        Background="{DynamicResource BorderColor}"
+                        Margin="10,0"/>
+
+                <!-- Content -->
+                <StackPanel Grid.Row="2" Margin="24,20">
+                    <!-- Donation Message -->
+                    <TextBlock Text="Win11Debloat is a passion project that I maintain in my free time. If you've found this tool useful, please consider making a small donation to support its development. I really appreciate it!"
+                            FontSize="14"
+                            Foreground="{DynamicResource FgColor}"
+                            TextWrapping="Wrap"
+                            Margin="0,0,0,15"/>
+
+                    <!-- Ko-fi Link -->
+                    <Grid HorizontalAlignment="Left">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock x:Name="KofiLinkIcon"
+                                Grid.Column="0"
+                                FontSize="16"
+                                Style="{DynamicResource HyperlinkStyle}"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontWeight="SemiBold"
+                                FontFamily="Segoe Fluent Icons"
+                                Text="&#xEB52;" 
+                                Foreground="{DynamicResource CloseHover}"
+                                Margin="0,0,8,0"/>
+                        
+                        <TextBlock x:Name="KofiLink"
+                                Grid.Column="1"
+                                FontSize="16"
+                                Style="{DynamicResource HyperlinkStyle}"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontWeight="SemiBold"
+                                Text="Support me on Ko-fi"/>
+                    </Grid>
+                </StackPanel>
+            </Grid>
+
+            <!-- Button Panel -->
+            <Border Grid.Row="2" 
+                    Background="{DynamicResource BgColor}"
+                    BorderBrush="{DynamicResource BorderColor}"
+                    BorderThickness="0,1,0,0"
+                    Padding="16,12"
+                    CornerRadius="0,0,8,8">
+                <StackPanel x:Name="ButtonPanel"
+                            Orientation="Horizontal"
+                            HorizontalAlignment="Right">
+                    <Button x:Name="CloseButton" 
+                            Content="Close" 
+                            Height="32" MinWidth="80" Margin="4,0"
+                            Style="{DynamicResource SecondaryButtonStyle}"/>
+                </StackPanel>
+            </Border>
+        </Grid>
+    </Border>
+</Window>

Schemas/AppSelectionWindow.xaml

@@ -9,43 +9,6 @@
         Background="Transparent"
         Foreground="{DynamicResource FgColor}">
     <Window.Resources>
-        <!-- ScrollBar Style -->
-        <Style TargetType="{x:Type ScrollBar}">
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="Width" Value="8"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type ScrollBar}">
-                        <Grid>
-                            <Track Name="PART_Track" IsDirectionReversed="true">
-                                <Track.Thumb>
-                                    <Thumb>
-                                        <Thumb.Style>
-                                            <Style TargetType="Thumb">
-                                                <Setter Property="Background" Value="{DynamicResource ScrollBarThumbColor}"/>
-                                                <Setter Property="Template">
-                                                    <Setter.Value>
-                                                        <ControlTemplate TargetType="Thumb">
-                                                            <Border Background="{TemplateBinding Background}" CornerRadius="4"/>
-                                                        </ControlTemplate>
-                                                    </Setter.Value>
-                                                </Setter>
-                                                <Style.Triggers>
-                                                    <Trigger Property="IsMouseOver" Value="True">
-                                                        <Setter Property="Background" Value="{DynamicResource ScrollBarThumbHoverColor}"/>
-                                                    </Trigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </Thumb.Style>
-                                    </Thumb>
-                                </Track.Thumb>
-                            </Track>
-                        </Grid>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
         <!-- CheckBox Style -->
         <Style TargetType="CheckBox">
             <Setter Property="Foreground" Value="{DynamicResource FgColor}"/>
@@ -94,84 +57,6 @@
         <Style x:Key="AppsPanelCheckBoxStyle" TargetType="CheckBox" BasedOn="{StaticResource {x:Type CheckBox}}">
             <Setter Property="Margin" Value="2,3,2,3"/>
         </Style>
-
-        <!-- Button Style -->
-        <Style x:Key="Win11Button" TargetType="Button">
-            <Setter Property="Background" Value="{DynamicResource ButtonBg}"/>
-            <Setter Property="Foreground" Value="white"/>
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonBg}"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Padding" Value="0"/>
-            <Setter Property="FontSize" Value="14"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border Background="{TemplateBinding Background}" 
-                                BorderBrush="{TemplateBinding BorderBrush}" 
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="4"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                        </Border>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-            <Style.Triggers>
-                <Trigger Property="IsEnabled" Value="False">
-                    <Setter Property="Background" Value="{DynamicResource ButtonDisabled}"/>
-                    <Setter Property="BorderBrush" Value="{DynamicResource ButtonDisabled}"/>
-                    <Setter Property="Foreground" Value="{DynamicResource ButtonTextDisabled}"/>
-                </Trigger>
-                <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ButtonHover}"/>
-                    <Setter Property="BorderBrush" Value="{DynamicResource ButtonHover}"/>
-                </Trigger>
-                <Trigger Property="IsPressed" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ButtonPressed}"/>
-                    <Setter Property="BorderBrush" Value="{DynamicResource ButtonPressed}"/>
-                </Trigger>
-            </Style.Triggers>
-        </Style>
-
-        <!-- Secondary Button Style -->
-        <Style x:Key="Win11ButtonSecondary" TargetType="Button">
-            <Setter Property="Background" Value="{DynamicResource SecondaryButtonBg}"/>
-            <Setter Property="Foreground" Value="{DynamicResource FgColor}"/>
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderColor}"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Padding" Value="0"/>
-            <Setter Property="FontSize" Value="14"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border Background="{TemplateBinding Background}" 
-                                BorderBrush="{TemplateBinding BorderBrush}" 
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="4"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,0,1"/>
-                        </Border>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-            <Style.Triggers>
-                <Trigger Property="IsEnabled" Value="False">
-                    <Setter Property="Background" Value="{DynamicResource SecondaryButtonDisabled}"/>
-                    <Setter Property="BorderBrush" Value="{DynamicResource BorderColor}"/>
-                    <Setter Property="Foreground" Value="{DynamicResource SecondaryButtonTextDisabled}"/>
-                </Trigger>
-                <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource SecondaryButtonHover}"/>
-                    <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderColor}"/>
-                </Trigger>
-                <Trigger Property="IsPressed" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource SecondaryButtonPressed}"/>
-                    <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderColor}"/>
-                </Trigger>
-            </Style.Triggers>
-        </Style>
         
         <!-- Title Bar Button Style -->
         <Style x:Key="TitleBarButton" TargetType="Button">
@@ -205,7 +90,15 @@
     <Border BorderBrush="{DynamicResource BorderColor}" 
             BorderThickness="1" 
             CornerRadius="8" 
-            Background="{DynamicResource BgColor}">
+            Background="{DynamicResource BgColor}"
+            Margin="25">
+        <Border.Effect>
+            <DropShadowEffect Color="Black" 
+                            Opacity="0.15" 
+                            BlurRadius="20" 
+                            ShadowDepth="0" 
+                            Direction="0"/>
+        </Border.Effect>
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="32"/>
@@ -268,11 +161,21 @@
                         <Grid Margin="0,8,10,10">
                             <CheckBox x:Name="OnlyInstalledBox" Content="Only show installed apps" Foreground="{DynamicResource FgColor}" AutomationProperties.Name="Only show installed apps"/>
                         </Grid>
-                        <Button x:Name="ConfirmBtn" Width="80" Height="32" Margin="0,0,10,0" Content="Confirm" Style="{StaticResource Win11Button}" AutomationProperties.Name="Confirm"/>
-                        <Button x:Name="CancelBtn" Width="80" Height="32" Content="Cancel" Style="{StaticResource Win11ButtonSecondary}" IsCancel="True" AutomationProperties.Name="Cancel"/>
+                        <Button x:Name="ConfirmBtn" Width="80" Height="32" Margin="0,0,10,0" Content="Confirm" Style="{DynamicResource PrimaryButtonStyle}" AutomationProperties.Name="Confirm"/>
+                        <Button x:Name="CancelBtn" Width="80" Height="32" Content="Cancel" Style="{DynamicResource SecondaryButtonStyle}" IsCancel="True" AutomationProperties.Name="Cancel"/>
                     </StackPanel>
                 </Grid>
             </Grid>
+            
+            <!-- Modal Overlay for MessageBoxes -->
+            <Rectangle x:Name="ModalOverlay" 
+                       Grid.RowSpan="2" 
+                       Fill="#80000000" 
+                       Visibility="Collapsed" 
+                       Panel.ZIndex="1000"
+                       RadiusX="8"
+                       RadiusY="8"
+                       Margin="-1"/>
         </Grid>
     </Border>
 </Window>

Schemas/ApplyChangesWindow.xaml

@@ -0,0 +1,203 @@
+<Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="Apply Changes" 
+        Width="500"
+        SizeToContent="Height"
+        ResizeMode="NoResize"
+        WindowStartupLocation="CenterOwner"
+        WindowStyle="None"
+        AllowsTransparency="True"
+        Background="Transparent"
+        Topmost="True"
+        ShowInTaskbar="False">
+
+    <Border BorderBrush="{DynamicResource BorderColor}" 
+            BorderThickness="1" 
+            CornerRadius="8"
+            Background="{DynamicResource CardBgColor}"
+            Margin="25">
+        <Border.Effect>
+            <DropShadowEffect Color="Black" 
+                            Opacity="0.15" 
+                            BlurRadius="20" 
+                            ShadowDepth="0" 
+                            Direction="0"/>
+        </Border.Effect>
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
+
+            <!-- Close/Cancel button (top right) -->
+            <Button x:Name="ApplyCancelBtn" Grid.Row="0"
+                    HorizontalAlignment="Right" VerticalAlignment="Top"
+                    Width="36" Height="32"
+                    BorderThickness="0"
+                    Cursor="Hand"
+                    ToolTip="Cancel"
+                    AutomationProperties.Name="Cancel">
+                <Button.Template>
+                    <ControlTemplate TargetType="Button">
+                        <Border Background="{TemplateBinding Background}" BorderThickness="0" CornerRadius="0,8,0,0">
+                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        </Border>
+                    </ControlTemplate>
+                </Button.Template>
+                <Button.Style>
+                    <Style TargetType="Button">
+                        <Setter Property="Background" Value="Transparent"/>
+                        <Setter Property="Foreground" Value="{DynamicResource FgColor}"/>
+                        <Style.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter Property="Background" Value="{DynamicResource CloseHover}"/>
+                            </Trigger>
+                        </Style.Triggers>
+                    </Style>
+                </Button.Style>
+                <TextBlock Text="&#xE8BB;" FontFamily="Segoe Fluent Icons" FontSize="10"/>
+            </Button>
+
+            <StackPanel Grid.Row="0" Grid.RowSpan="2">
+            <!-- In-progress content -->
+            <StackPanel x:Name="ApplyInProgressPanel">
+                <StackPanel Margin="32,24">
+                    <!-- Loading icon (spinning) -->
+                    <TextBlock x:Name="ApplySpinnerIcon"
+                            Text="&#xE895;" 
+                            FontFamily="Segoe Fluent Icons" 
+                            FontSize="36" 
+                            Foreground="{DynamicResource ButtonBg}" 
+                            HorizontalAlignment="Center" 
+                            Margin="0,0,0,16"
+                            RenderTransformOrigin="0.5,0.5">
+                        <TextBlock.RenderTransform>
+                            <RotateTransform x:Name="SpinnerRotation" Angle="0"/>
+                        </TextBlock.RenderTransform>
+                        <TextBlock.Triggers>
+                            <EventTrigger RoutedEvent="Loaded">
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="SpinnerRotation"
+                                                        Storyboard.TargetProperty="Angle"
+                                                        From="0" To="360"
+                                                        Duration="0:0:1.5"
+                                                        RepeatBehavior="Forever"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </EventTrigger>
+                        </TextBlock.Triggers>
+                    </TextBlock>
+                    
+                    <TextBlock Text="Applying Changes" 
+                            Style="{DynamicResource ModalTitleStyle}"/>
+
+                    <!-- Current step name -->
+                    <TextBlock x:Name="ApplyStepName" 
+                                Text="Preparing..." 
+                                Style="{DynamicResource ModalSubtextStyle}"
+                                TextTrimming="CharacterEllipsis"
+                                MaxWidth="430"/>
+                </StackPanel>
+                
+                <Border Background="{DynamicResource BgColor}"
+                        BorderBrush="{DynamicResource BorderColor}"
+                        BorderThickness="0,1,0,0"
+                        Padding="16,12"
+                        CornerRadius="0,0,8,8">
+                    <StackPanel>
+                    
+                    <!-- Progress bar -->
+                    <ProgressBar x:Name="ApplyProgressBar" 
+                                    Style="{DynamicResource ApplyProgressBarStyle}"
+                                    Minimum="0" Maximum="100" Value="0" 
+                                    Margin="0,2,0,8"/>
+                    
+                    <!-- Step counter -->
+                    <TextBlock x:Name="ApplyStepCounter" 
+                            Text="Step 0 of 0" 
+                            FontSize="12" 
+                            Foreground="{DynamicResource FgColor}" 
+                            HorizontalAlignment="Right" 
+                            Opacity="0.8"/>
+                    </StackPanel>
+                </Border>
+            </StackPanel>
+            
+            <!-- Completion content -->
+            <StackPanel x:Name="ApplyCompletionPanel" Visibility="Collapsed">
+                <StackPanel Margin="32,24">
+                    <!-- Success icon -->
+                    <TextBlock x:Name="ApplyCompletionIcon" 
+                            Text="&#xE73E;" 
+                            FontFamily="Segoe Fluent Icons" 
+                            FontSize="40"
+                            Foreground="{DynamicResource ButtonBg}" 
+                            HorizontalAlignment="Center" 
+                            Margin="0,0,0,12"/>
+                    
+                    <TextBlock x:Name="ApplyCompletionTitle" 
+                            Text="Changes Applied" 
+                            Style="{DynamicResource ModalTitleStyle}"/>
+                    
+                    <TextBlock x:Name="ApplyCompletionMessage" 
+                            Text="Please note that some changes will only take effect after a reboot. Thanks for using Win11Debloat!"
+                            TextWrapping="Wrap"
+                            Style="{DynamicResource ModalSubtextStyle}"/>
+                </StackPanel>
+
+                <!-- Reboot required section -->
+                <Border x:Name="ApplyRebootPanel"
+                        Visibility="Collapsed"
+                        BorderBrush="{DynamicResource BorderColor}"
+                        HorizontalAlignment="Center"
+                        BorderThickness="0,1,0,1"
+                        Padding="24,12,24,14">
+                    <StackPanel>
+                        <StackPanel Orientation="Horizontal" Margin="0,0,0,6">
+                            <TextBlock Text="&#xE7BA;"
+                                       FontFamily="Segoe Fluent Icons"
+                                       FontSize="14"
+                                       Foreground="#e8912d"
+                                       VerticalAlignment="Center"
+                                       Margin="0,0,8,0"/>
+                            <TextBlock Text="A reboot is required for these changes to take effect:"
+                                       FontSize="13"
+                                       FontWeight="SemiBold"
+                                       Foreground="{DynamicResource FgColor}"
+                                       VerticalAlignment="Center"/>
+                        </StackPanel>
+                        <StackPanel x:Name="ApplyRebootList" Margin="22,0,0,0"/>
+                    </StackPanel>
+                </Border>
+
+                <!-- Button Panel -->
+                <Border Background="{DynamicResource BgColor}"
+                        BorderBrush="{DynamicResource BorderColor}"
+                        BorderThickness="0,1,0,0"
+                        Padding="16,12"
+                        CornerRadius="0,0,8,8">
+                    <StackPanel x:Name="ButtonPanel"
+                                Orientation="Horizontal"
+                                HorizontalAlignment="Center">
+                        <Button x:Name="ApplyKofiBtn" Width="210" Height="32" 
+                                Style="{DynamicResource SecondaryButtonStyle}" 
+                                Margin="0,0,12,0"
+                                AutomationProperties.Name="Support the creator">
+                            <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                                <TextBlock Text="&#xEB52;" FontFamily="Segoe Fluent Icons" FontSize="14" VerticalAlignment="Center" Margin="0,0,8,-1"/>
+                                <TextBlock Text="Support the creator" VerticalAlignment="Center" FontSize="14" Margin="0,0,0,1"/>
+                            </StackPanel>
+                        </Button>
+                        <Button x:Name="ApplyCloseBtn" Width="100" Height="32" 
+                                Style="{DynamicResource PrimaryButtonStyle}"
+                                AutomationProperties.Name="Close">
+                            <TextBlock Text="Close" VerticalAlignment="Center" FontSize="14" Margin="0,0,0,1"/>
+                        </Button>
+                    </StackPanel>
+                </Border>
+            </StackPanel>
+        </StackPanel>
+        </Grid>
+    </Border>
+</Window>

Schemas/MainWindow.xaml

@@ -1,8 +1,8 @@
 <Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="Win11Debloat" 
-        MinWidth="1024" MinHeight="600"
-        MaxWidth="1280"
+        MinWidth="1130" MinHeight="600"
+        MaxWidth="1400"
         ResizeMode="CanResize" 
         SnapsToDevicePixels="True"
         WindowStartupLocation="CenterScreen"
@@ -11,43 +11,6 @@
         Background="Transparent"
         Foreground="{DynamicResource FgColor}">
     <Window.Resources>
-        <!-- ScrollBar Style -->
-        <Style TargetType="{x:Type ScrollBar}">
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="Width" Value="8"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type ScrollBar}">
-                        <Grid>
-                            <Track Name="PART_Track" IsDirectionReversed="true">
-                                <Track.Thumb>
-                                    <Thumb>
-                                        <Thumb.Style>
-                                            <Style TargetType="Thumb">
-                                                <Setter Property="Background" Value="{DynamicResource ScrollBarThumbColor}"/>
-                                                <Setter Property="Template">
-                                                    <Setter.Value>
-                                                        <ControlTemplate TargetType="Thumb">
-                                                            <Border Background="{TemplateBinding Background}" CornerRadius="4"/>
-                                                        </ControlTemplate>
-                                                    </Setter.Value>
-                                                </Setter>
-                                                <Style.Triggers>
-                                                    <Trigger Property="IsMouseOver" Value="True">
-                                                        <Setter Property="Background" Value="{DynamicResource ScrollBarThumbHoverColor}"/>
-                                                    </Trigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </Thumb.Style>
-                                    </Thumb>
-                                </Track.Thumb>
-                            </Track>
-                        </Grid>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
         <!-- ComboBox Style -->
         <Style TargetType="ComboBox">
             <Setter Property="Background" Value="{DynamicResource ComboBgColor}"/>
@@ -71,7 +34,7 @@
                                                     <Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="4">
                                                         <TextBlock x:Name="Arrow"
                                                                 Text="&#xE70D;"
-                                                                FontFamily="Segoe MDL2 Assets"
+                                                                FontFamily="Segoe Fluent Icons"
                                                                 FontSize="10"
                                                                 HorizontalAlignment="Right"
                                                                 VerticalAlignment="Center"
@@ -246,17 +209,26 @@
         <Style x:Key="CategoryHeaderTextBlock" TargetType="TextBlock">
             <Setter Property="FontWeight" Value="Bold"/>
             <Setter Property="FontSize" Value="16"/>
-            <Setter Property="Margin" Value="0,0,0,10"/>
+            <Setter Property="Margin" Value="0,0,0,13"/>
             <Setter Property="Foreground" Value="{DynamicResource FgColor}"/>
         </Style>
 
+        <!-- Category header icon style -->
+        <Style x:Key="CategoryHeaderIcon" TargetType="TextBlock">
+            <Setter Property="FontFamily" Value="Segoe Fluent Icons"/>
+            <Setter Property="FontSize" Value="19"/>
+            <Setter Property="Foreground" Value="{DynamicResource FgColor}"/>
+            <Setter Property="Margin" Value="0,0,8,12"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+        </Style>
+
         <!-- Category help link button/text styles -->
         <Style x:Key="CategoryHelpLinkButtonStyle" TargetType="Button">
             <Setter Property="Background" Value="Transparent"/>
             <Setter Property="BorderBrush" Value="Transparent"/>
             <Setter Property="BorderThickness" Value="0"/>
             <Setter Property="Padding" Value="0"/>
-            <Setter Property="Margin" Value="6,1,0,10"/>
+            <Setter Property="Margin" Value="6,1,0,13"/>
             <Setter Property="VerticalAlignment" Value="Center"/>
             <Setter Property="Focusable" Value="False"/>
             <Setter Property="IsTabStop" Value="False"/>
@@ -366,7 +338,7 @@
                                     <ColumnDefinition Width="*"/>
                                 </Grid.ColumnDefinitions>
                                 <Border x:Name="CheckBoxBorder" Grid.Column="0" Width="18" Height="18" Background="{DynamicResource CheckBoxBgColor}" BorderBrush="{DynamicResource CheckBoxBorderColor}" BorderThickness="1" CornerRadius="4" Margin="0,0,8,0">
-                                    <TextBlock x:Name="CheckMark" Text="&#xE73E;" FontFamily="Segoe MDL2 Assets" FontSize="12" Foreground="{DynamicResource ButtonBg}" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="Collapsed"/>
+                                    <TextBlock x:Name="CheckMark" Text="&#xE73E;" FontFamily="Segoe Fluent Icons" FontSize="12" Foreground="{DynamicResource ButtonBg}" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="Collapsed"/>
                                 </Border>
                                 <ContentPresenter Grid.Column="1" VerticalAlignment="Center" Margin="0,0,0,2"/>
                             </Grid>
@@ -411,86 +383,35 @@
         <!-- CheckBox style for apps panels -->
         <Style x:Key="AppsPanelCheckBoxStyle" TargetType="CheckBox" BasedOn="{StaticResource {x:Type CheckBox}}">
             <Setter Property="Margin" Value="2,3,2,3"/>
+            <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
         </Style>
 
-        <!-- Button Style -->
-        <Style x:Key="Win11Button" TargetType="Button">
-            <Setter Property="Background" Value="{DynamicResource ButtonBg}"/>
-            <Setter Property="Foreground" Value="white"/>
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonBg}"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Padding" Value="0"/>
-            <Setter Property="FontSize" Value="14"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border Background="{TemplateBinding Background}" 
-                                BorderBrush="{TemplateBinding BorderBrush}" 
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="4"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                        </Border>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-            <Style.Triggers>
-                <Trigger Property="IsEnabled" Value="False">
-                    <Setter Property="Background" Value="{DynamicResource ButtonDisabled}"/>
-                    <Setter Property="BorderBrush" Value="{DynamicResource ButtonDisabled}"/>
-                    <Setter Property="Foreground" Value="{DynamicResource ButtonTextDisabled}"/>
-                </Trigger>
-                <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ButtonHover}"/>
-                    <Setter Property="BorderBrush" Value="{DynamicResource ButtonHover}"/>
-                </Trigger>
-                <Trigger Property="IsPressed" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ButtonPressed}"/>
-                    <Setter Property="BorderBrush" Value="{DynamicResource ButtonPressed}"/>
-                </Trigger>
-            </Style.Triggers>
+        <!-- TextBlock style for App ID column in apps table -->
+        <Style x:Key="AppIdTextStyle" TargetType="TextBlock">
+            <Setter Property="Foreground" Value="{DynamicResource AppIdColor}"/>
+            <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
         </Style>
 
-        <!-- Secondary Button Style -->
-        <Style x:Key="Win11ButtonSecondary" TargetType="Button">
-            <Setter Property="Background" Value="{DynamicResource SecondaryButtonBg}"/>
-            <Setter Property="Foreground" Value="{DynamicResource FgColor}"/>
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderColor}"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Padding" Value="0"/>
-            <Setter Property="FontSize" Value="14"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border Background="{TemplateBinding Background}" 
-                                BorderBrush="{TemplateBinding BorderBrush}" 
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="4"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,0,1"/>
-                        </Border>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-            <Style.Triggers>
-                <Trigger Property="IsEnabled" Value="False">
-                    <Setter Property="Background" Value="{DynamicResource SecondaryButtonDisabled}"/>
-                    <Setter Property="BorderBrush" Value="{DynamicResource BorderColor}"/>
-                    <Setter Property="Foreground" Value="{DynamicResource SecondaryButtonTextDisabled}"/>
-                </Trigger>
-                <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource SecondaryButtonHover}"/>
-                    <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderColor}"/>
-                </Trigger>
-                <Trigger Property="IsPressed" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource SecondaryButtonPressed}"/>
-                    <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderColor}"/>
-                </Trigger>
-            </Style.Triggers>
+        <!-- TextBlock style for App Name column in apps table -->
+        <Style x:Key="AppNameTextStyle" TargetType="TextBlock">
+            <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
         </Style>
 
+        <!-- TextBlock style for Description column in apps table -->
+        <Style x:Key="AppDescTextStyle" TargetType="TextBlock">
+            <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="Margin" Value="8,0,8,0"/>
+        </Style>
+
+        <!-- Column widths for the apps table row grid -->
+        <GridLength x:Key="AppTableCol0Width">160</GridLength>
+        <GridLength x:Key="AppTableCol1Width">1*</GridLength>
+        <GridLength x:Key="AppTableCol2Width">286</GridLength>
+
         <!-- Title Bar Button Style -->
         <Style x:Key="TitleBarButton" TargetType="Button">
             <Setter Property="Background" Value="Transparent"/>
@@ -498,7 +419,7 @@
             <Setter Property="BorderThickness" Value="0"/>
             <Setter Property="Width" Value="46"/>
             <Setter Property="Height" Value="32"/>
-            <Setter Property="FontFamily" Value="Segoe MDL2 Assets"/>
+            <Setter Property="FontFamily" Value="Segoe Fluent Icons"/>
             <Setter Property="FontSize" Value="10"/>
             <Setter Property="Template">
                 <Setter.Value>
@@ -517,22 +438,22 @@
                 </Trigger>
             </Style.Triggers>
         </Style>
-        <Style x:Key="HelpButton" TargetType="Button" BasedOn="{StaticResource TitleBarButton}">
+        <Style x:Key="TitlebarButton" TargetType="Button" BasedOn="{StaticResource TitleBarButton}">
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
                         <Border Background="{TemplateBinding Background}" BorderThickness="0" CornerRadius="0">
-                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,0,3"/>
+                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
                         </Border>
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ButtonBg}"/>
+                    <Setter Property="Background" Value="{DynamicResource SecondaryButtonHover}"/>
                 </Trigger>
                 <Trigger Property="IsPressed" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ButtonHover}"/>
+                    <Setter Property="Background" Value="{DynamicResource SecondaryButtonPressed}"/>
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -551,12 +472,81 @@
                 </Trigger>
             </Style.Triggers>
         </Style>
+
+        <!-- ContextMenu Style -->
+        <Style TargetType="ContextMenu">
+            <Setter Property="Background" Value="{DynamicResource CardBgColor}"/>
+            <Setter Property="BorderBrush" Value="{DynamicResource BorderColor}"/>
+            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="Padding" Value="4"/>
+            <Setter Property="HasDropShadow" Value="True"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ContextMenu">
+                        <Border Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="4"
+                                Padding="{TemplateBinding Padding}">
+                            <StackPanel IsItemsHost="True"/>
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <!-- MenuItem Style -->
+        <Style TargetType="MenuItem">
+            <Setter Property="Foreground" Value="{DynamicResource FgColor}"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Padding" Value="8,6"/>
+            <Setter Property="Height" Value="32"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="MenuItem">
+                        <Border Background="{TemplateBinding Background}"
+                                BorderThickness="0"
+                                CornerRadius="4"
+                                Padding="{TemplateBinding Padding}">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="24"/>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+                                <ContentPresenter Grid.Column="0" ContentSource="Icon" 
+                                                VerticalAlignment="Center"
+                                                HorizontalAlignment="Center"/>
+                                <ContentPresenter Grid.Column="1" ContentSource="Header" 
+                                                VerticalAlignment="Center"
+                                                Margin="8,0,0,1"/>
+                            </Grid>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsHighlighted" Value="True">
+                                <Setter Property="Background" Value="{DynamicResource ComboItemHoverColor}"/>
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter Property="Background" Value="{DynamicResource ComboItemSelectedColor}"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
     </Window.Resources>
 
     <Border BorderBrush="{DynamicResource BorderColor}" 
             BorderThickness="1" 
             CornerRadius="8" 
-            Background="{DynamicResource BgColor}">
+            Background="{DynamicResource BgColor}"
+            Margin="25">
+        <Border.Effect>
+            <DropShadowEffect Color="Black" 
+                            Opacity="0.15" 
+                            BlurRadius="20" 
+                            ShadowDepth="0" 
+                            Direction="0"/>
+        </Border.Effect>
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="32"/>
@@ -589,7 +579,33 @@
                                    Margin="12,0,0,0"
                                    FontSize="12"/>
                         <StackPanel Grid.Column="1" Orientation="Horizontal">
-                            <Button x:Name="HelpBtn" Content="?" FontFamily="Segoe UI" FontSize="15" Style="{StaticResource HelpButton}" ToolTip="Open Wiki" AutomationProperties.Name="Open Wiki"/>
+                            <Button x:Name="KofiBtn" Content="&#xEB52;" FontFamily="Segoe Fluent Icons" FontSize="15" Style="{StaticResource TitlebarButton}" ToolTip="Support the creator" AutomationProperties.Name="Support the creator"/>
+                            <Button x:Name="MenuBtn" Content="&#xE700;" FontFamily="Segoe Fluent Icons" FontSize="15" Style="{StaticResource TitlebarButton}" ToolTip="Options" AutomationProperties.Name="Options">
+                                <Button.ContextMenu>
+                                    <ContextMenu x:Name="MainMenu">
+                                        <MenuItem x:Name="MenuDocumentation" Header="Documentation" AutomationProperties.Name="Documentation">
+                                            <MenuItem.Icon>
+                                                <TextBlock Text="&#xe736;" FontFamily="Segoe MDL2 Assets" FontSize="16" Foreground="{DynamicResource FgColor}"/>
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                        <MenuItem x:Name="MenuReportBug" Header="Report a bug" AutomationProperties.Name="Report a bug">
+                                            <MenuItem.Icon>
+                                                <TextBlock Text="&#xEBE8;" FontFamily="Segoe Fluent Icons" FontSize="16" Foreground="{DynamicResource FgColor}"/>
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                        <MenuItem x:Name="MenuLogs" Header="Logs" AutomationProperties.Name="Logs">
+                                            <MenuItem.Icon>
+                                                <TextBlock Text="&#xf000;" FontFamily="Segoe Fluent Icons" FontSize="16" Foreground="{DynamicResource FgColor}"/>
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                        <MenuItem x:Name="MenuAbout" Header="About" AutomationProperties.Name="About">
+                                            <MenuItem.Icon>
+                                                <TextBlock Text="&#xE946;" FontFamily="Segoe Fluent Icons" FontSize="16" Foreground="{DynamicResource FgColor}"/>
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                    </ContextMenu>
+                                </Button.ContextMenu>
+                            </Button>
                             <Button x:Name="CloseBtn" Content="&#xE8BB;" Style="{StaticResource CloseButton}" ToolTip="Close" AutomationProperties.Name="Close"/>
                         </StackPanel>
                     </Grid>
@@ -656,12 +672,21 @@
                                 <Run Text="Your clean Windows experience is just a few clicks away!"/>
                             </TextBlock>
                             
-                            <!-- Start Button -->
-                            <Button x:Name="HomeStartBtn" Width="125" Height="53" Style="{StaticResource Win11Button}" HorizontalAlignment="Center" Margin="0,20,0,0" AutomationProperties.Name="Start">
-                                <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-                                    <TextBlock Text="Start" FontWeight="SemiBold" VerticalAlignment="Center" FontSize="24" Margin="0,0,0,3"/>
-                                </StackPanel>
-                            </Button>
+                            <!-- Action Buttons -->
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,20,0,0">
+                                <Button x:Name="HomeDefaultModeBtn" Width="180" Height="50" Style="{DynamicResource PrimaryButtonStyle}" Margin="0,0,12,0" AutomationProperties.Name="Default Mode">
+                                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                                        <TextBlock Text="&#xe735;" FontFamily="Segoe Fluent Icons" FontSize="16" VerticalAlignment="Center" Margin="0,0,8,0"/>
+                                        <TextBlock Text="Default Mode" ToolTip="Quickly select the recommended settings" FontWeight="SemiBold" VerticalAlignment="Center" FontSize="17" Margin="0,0,0,2"/>
+                                    </StackPanel>
+                                </Button>
+                                <Button x:Name="HomeStartBtn" Width="180" Height="50" Style="{DynamicResource SecondaryButtonStyle}" AutomationProperties.Name="Custom Setup">
+                                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                                        <TextBlock Text="&#xe90f;" FontFamily="Segoe Fluent Icons" FontSize="14" VerticalAlignment="Center" Margin="0,0,8,0"/>
+                                        <TextBlock Text="Custom Setup" ToolTip="Manually select your preferred settings" FontWeight="SemiBold" VerticalAlignment="Center" FontSize="17" Margin="0,0,0,2"/>
+                                    </StackPanel>
+                                </Button>
+                            </StackPanel>
                         </StackPanel>
                     </Grid>
                 </TabItem>
@@ -685,9 +710,9 @@
                                     </Grid.ColumnDefinitions>
                                     
                                     <StackPanel Orientation="Horizontal" Grid.Column="0">
-                                        <Button x:Name="DefaultAppsBtn" Content="Select Default Apps" ToolTip="Select the default selection of apps" Style="{StaticResource Win11ButtonSecondary}" Height="32" Padding="10,0" Margin="0,0,10,0" AutomationProperties.Name="Select Default Apps"/>
-                                        <Button x:Name="LoadLastUsedAppsBtn" Content="Select Last Used Selection" ToolTip="Select the apps that were selected the last time Win11Debloat was run" Style="{StaticResource Win11ButtonSecondary}" Height="32" Padding="10,0" Margin="0,0,10,0" AutomationProperties.Name="Select Last Used Selection"/>
-                                        <Button x:Name="ClearAppSelectionBtn" Content="Clear Selection" ToolTip="Clear all selected apps" Style="{StaticResource Win11ButtonSecondary}" Height="32"  Padding="10,0" Margin="0,0,10,0" AutomationProperties.Name="Clear Selection"/>
+                                        <Button x:Name="DefaultAppsBtn" Content="Select Default Apps" ToolTip="Select the default selection of apps" Style="{DynamicResource SecondaryButtonStyle}" Height="32" Padding="10,0" Margin="0,0,10,0" AutomationProperties.Name="Select Default Apps"/>
+                                        <Button x:Name="LoadLastUsedAppsBtn" Content="Select Last Used Selection" ToolTip="Select the apps that were selected the last time Win11Debloat was run" Style="{DynamicResource SecondaryButtonStyle}" Height="32" Padding="10,0" Margin="0,0,10,0" AutomationProperties.Name="Select Last Used Selection"/>
+                                        <Button x:Name="ClearAppSelectionBtn" Content="Clear Selection" ToolTip="Clear all selected apps" Style="{DynamicResource SecondaryButtonStyle}" Height="32"  Padding="10,0" Margin="0,0,10,0" AutomationProperties.Name="Clear Selection"/>
                                     </StackPanel>
                                     
                                     <CheckBox x:Name="OnlyInstalledAppsBox" Grid.Column="2" Content="Only show installed apps" IsChecked="False" Foreground="{DynamicResource FgColor}" VerticalAlignment="Center" AutomationProperties.Name="Only show installed apps"/>
@@ -707,7 +732,7 @@
                                                 <ColumnDefinition Width="Auto"/>
                                                 <ColumnDefinition Width="*"/>
                                             </Grid.ColumnDefinitions>
-                                            <TextBlock Grid.Column="0" Text="&#xE721;" FontFamily="Segoe MDL2 Assets" FontSize="14" VerticalAlignment="Center" Margin="4,0,8,0" Foreground="{DynamicResource FgColor}"/>
+                                            <TextBlock Grid.Column="0" Text="&#xE721;" FontFamily="Segoe Fluent Icons" FontSize="14" VerticalAlignment="Center" Margin="4,0,8,0" Foreground="{DynamicResource FgColor}"/>
                                             <TextBlock x:Name="AppSearchPlaceholder" Grid.Column="1" Text="Search app" Foreground="{DynamicResource FgColor}" Opacity="0.5" FontSize="13" Margin="3,0,0,1" VerticalAlignment="Center" IsHitTestVisible="False"/>
                                             <TextBox x:Name="AppSearchBox" Grid.Column="1" Background="Transparent" Foreground="{DynamicResource FgColor}" BorderThickness="0" FontSize="13" Margin="1,0,0,1" VerticalAlignment="Center" Text="" AutomationProperties.Name="Search app"/>
                                         </Grid>
@@ -722,16 +747,36 @@
                             </Grid.RowDefinitions>
                             
                             <!-- Apps List -->
-                            <Border Grid.Row="0" BorderBrush="{DynamicResource BorderColor}" CornerRadius="4" BorderThickness="1" Margin="20,0,20,10" Background="{DynamicResource CardBgColor}">
-                                <Grid>
-                                    <ScrollViewer VerticalScrollBarVisibility="Auto">
-                                        <StackPanel x:Name="AppSelectionPanel" Margin="8"/>
-                                    </ScrollViewer>
-                                    <Border x:Name="LoadingAppsIndicator" CornerRadius="4" Background="{DynamicResource ScrollBarThumbColor}" Opacity="0.8" Visibility="Collapsed">
-                                        <TextBlock Text="Loading apps..." FontSize="16" FontWeight="SemiBold" Foreground="{DynamicResource FgColor}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                    </Border>
-                                </Grid>
-                            </Border>
+                            <Grid Grid.Row="0" Margin="20,0,20,10">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="*"/>
+                                </Grid.RowDefinitions>
+                                <!-- Column Headers -->
+                                <Border Grid.Row="0" Background="{DynamicResource TableHeaderColor}" BorderBrush="{DynamicResource BorderColor}" BorderThickness="1,1,1,0" CornerRadius="4,4,0,0">
+                                    <Grid Margin="26,6,8,8">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="160"/>
+                                            <ColumnDefinition Width="*"/>
+                                            <ColumnDefinition Width="300"/>
+                                        </Grid.ColumnDefinitions>
+                                        <TextBlock Grid.Column="0" Text="Name" FontWeight="SemiBold" FontSize="16" Foreground="{DynamicResource FgColor}" Margin="16,0,0,0"/>
+                                        <TextBlock Grid.Column="1" Text="Description" FontWeight="SemiBold" FontSize="16" Foreground="{DynamicResource FgColor}" Margin="24,0,0,0"/>
+                                        <TextBlock Grid.Column="2" Text="App ID" FontWeight="SemiBold" FontSize="16" Foreground="{DynamicResource FgColor}"/>
+                                    </Grid>
+                                </Border>
+                                <!-- Apps content -->
+                                <Border Grid.Row="1" BorderBrush="{DynamicResource BorderColor}" CornerRadius="0,0,4,4" BorderThickness="1" Background="{DynamicResource CardBgColor}" Padding="0,1,1,1">
+                                    <Grid>
+                                        <ScrollViewer VerticalScrollBarVisibility="Visible">
+                                            <StackPanel x:Name="AppSelectionPanel" Margin="10,4,0,4"/>
+                                        </ScrollViewer>
+                                        <Border x:Name="LoadingAppsIndicator" CornerRadius="0,0,4,4" Background="{DynamicResource CardBgColor}" Opacity="0.8" Visibility="Collapsed">
+                                            <TextBlock Text="Loading apps..." FontSize="16" FontWeight="SemiBold" Foreground="{DynamicResource FgColor}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                        </Border>
+                                    </Grid>
+                                </Border>
+                            </Grid>
 
                             <!-- Status Info -->
                             <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="20,0,20,0">
@@ -747,7 +792,7 @@
                         <Border DockPanel.Dock="Top" Padding="20,10,20,0" Background="{DynamicResource BgColor}">
                             <StackPanel>
                                 <TextBlock Text="System Tweaks" FontWeight="Bold" FontSize="20" Margin="0,0,0,5" Foreground="{DynamicResource FgColor}"/>
-                                <TextBlock Text="Select which tweaks you want to apply to your system" FontSize="13" Margin="0,0,0,20" Foreground="{DynamicResource FgColor}" TextWrapping="Wrap"/>
+                                <TextBlock Text="Select which tweaks you want to apply to your system, hover over settings for more information" FontSize="13" Margin="0,0,0,20" Foreground="{DynamicResource FgColor}" TextWrapping="Wrap"/>
                             
                                 <!-- Filter Options -->
                                 <Grid Margin="0,0,0,12">
@@ -758,9 +803,9 @@
                                     </Grid.ColumnDefinitions>
                                     
                                     <StackPanel Grid.Column="0" Orientation="Horizontal">
-                                        <Button x:Name="LoadDefaultsBtn" Content="Select Default Settings" ToolTip="Select the settings that are recommended for most people" Style="{StaticResource Win11ButtonSecondary}" Padding="10,0" Height="32" Margin="0,0,10,0" AutomationProperties.Name="Select Default Settings"/>
-                                        <Button x:Name="LoadLastUsedBtn" Content="Select Last Used Settings" ToolTip="Select the settings that were used the last time Win11Debloat was run" Style="{StaticResource Win11ButtonSecondary}" Padding="10,0" Height="32" Margin="0,0,10,0" AutomationProperties.Name="Select Last Used Settings"/>
-                                        <Button x:Name="ClearAllTweaksBtn" Content="Clear Selection" ToolTip="Clear all selected tweaks" Style="{StaticResource Win11ButtonSecondary}" Padding="10,0" Height="32" Margin="0,0,10,0" AutomationProperties.Name="Clear Selection"/>
+                                        <Button x:Name="LoadDefaultsBtn" Content="Select Default Settings" ToolTip="Select the settings that are recommended for most people" Style="{DynamicResource SecondaryButtonStyle}" Padding="10,0" Height="32" Margin="0,0,10,0" AutomationProperties.Name="Select Default Settings"/>
+                                        <Button x:Name="LoadLastUsedBtn" Content="Select Last Used Settings" ToolTip="Select the settings that were used the last time Win11Debloat was run" Style="{DynamicResource SecondaryButtonStyle}" Padding="10,0" Height="32" Margin="0,0,10,0" AutomationProperties.Name="Select Last Used Settings"/>
+                                        <Button x:Name="ClearAllTweaksBtn" Content="Clear Selection" ToolTip="Clear all selected tweaks" Style="{DynamicResource SecondaryButtonStyle}" Padding="10,0" Height="32" Margin="0,0,10,0" AutomationProperties.Name="Clear Selection"/>
                                     </StackPanel>
 
                                     <Border x:Name="TweakSearchBorder" Grid.Column="2">
@@ -778,7 +823,7 @@
                                                 <ColumnDefinition Width="Auto"/>
                                                 <ColumnDefinition Width="*"/>
                                             </Grid.ColumnDefinitions>
-                                            <TextBlock Grid.Column="0" Text="&#xE721;" FontFamily="Segoe MDL2 Assets" FontSize="14" VerticalAlignment="Center" Margin="4,0,8,0" Foreground="{DynamicResource FgColor}"/>
+                                            <TextBlock Grid.Column="0" Text="&#xE721;" FontFamily="Segoe Fluent Icons" FontSize="14" VerticalAlignment="Center" Margin="4,0,8,0" Foreground="{DynamicResource FgColor}"/>
                                             <TextBlock x:Name="TweakSearchPlaceholder" Grid.Column="1" Text="Search setting" Foreground="{DynamicResource FgColor}" Opacity="0.5" FontSize="13" Margin="3,0,0,1" VerticalAlignment="Center" IsHitTestVisible="False"/>
                                             <TextBox x:Name="TweakSearchBox" Grid.Column="1" Background="Transparent" Foreground="{DynamicResource FgColor}" BorderThickness="0" FontSize="13" Margin="1,0,0,1" VerticalAlignment="Center" Text=""/>
                                         </Grid>
@@ -828,167 +873,146 @@
                     </DockPanel>
                 </TabItem>
 
-                <!-- Overview Tab -->
-                <TabItem Header="Overview" x:Name="OverviewTab">
+                <!-- Deployment Settings Tab -->
+                <TabItem Header="Deployment Settings" x:Name="DeploymentSettingsTab">
                     <DockPanel>
                         <Border DockPanel.Dock="Top" Padding="20,10,20,0">
                             <StackPanel>
-                                <TextBlock Text="Overview" FontWeight="Bold" FontSize="20" Margin="0,0,0,5" Foreground="{DynamicResource FgColor}"/>
-                                <TextBlock Text="Review and confirm your choices before proceeding" FontSize="13" Margin="0,0,0,20" Foreground="{DynamicResource FgColor}" TextWrapping="Wrap"/>
+                                <TextBlock Text="Deployment Settings" FontWeight="Bold" FontSize="20" Margin="0,0,0,5" Foreground="{DynamicResource FgColor}"/>
+                                <TextBlock Text="Configure how your changes will be applied and more" FontSize="13" Margin="0,0,0,20" Foreground="{DynamicResource FgColor}" TextWrapping="Wrap"/>
                             </StackPanel>
                         </Border>
+
                         <Grid>
-                            <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="0,-20,0,0" Padding="20,10,20,0">
-                                <StackPanel Margin="0,10,0,5">
-                                    <!-- Selected Changes -->
-                                    <Border BorderBrush="{DynamicResource BorderColor}" BorderThickness="1" CornerRadius="4" Background="{DynamicResource CardBgColor}" Padding="16,12,16,4" Margin="0,0,0,16">
-                                        <StackPanel>
-                                            <TextBlock Text="Selected Changes" Style="{StaticResource CategoryHeaderTextBlock}"/>
-                                            <StackPanel x:Name="OverviewChangesPanel"/>
-                                            <StackPanel Margin="0,0,0,3"/>
-                                        </StackPanel>
-                                    </Border>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="*"/>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
 
-                                    <!-- Apply Changes To -->
-                                    <Border BorderBrush="{DynamicResource BorderColor}" BorderThickness="1" CornerRadius="4" Background="{DynamicResource CardBgColor}" Padding="16,12" Margin="0,0,0,16">
-                                        <StackPanel>
-                                            <TextBlock Text="Apply Changes To" Style="{StaticResource CategoryHeaderTextBlock}"/>
-                                            <ComboBox x:Name="UserSelectionCombo" Margin="0,0,0,6" AutomationProperties.Name="Apply Changes To">
-                                                <ComboBoxItem Content="Current User" IsSelected="True"/>
-                                                <ComboBoxItem Content="Other User"/>
-                                                <ComboBoxItem Content="Windows Default User (Sysprep)"/>
-                                            </ComboBox>
-                                            <StackPanel x:Name="OtherUserPanel" Visibility="Collapsed" Margin="0,0,0,6">
-                                                <TextBlock x:Name="UsernameValidationMessage" Text="" FontStyle="Italic" Foreground="{DynamicResource CloseHover}" FontSize="11" Margin="3,0,0,4" TextWrapping="Wrap"/>
-                                                <Border IsEnabled="{Binding ElementName=OtherUsernameTextBox, Path=IsEnabled}">
-                                                    <Border.Style>
-                                                        <Style TargetType="Border" BasedOn="{StaticResource UserTextBoxBorderStyle}">
-                                                            <Style.Triggers>
-                                                                <DataTrigger Binding="{Binding ElementName=OtherUsernameTextBox, Path=IsFocused}" Value="True">
-                                                                    <Setter Property="Background" Value="{DynamicResource InputFocusColor}"/>
-                                                                </DataTrigger>
-                                                            </Style.Triggers>
-                                                        </Style>
-                                                    </Border.Style>
-                                                    <Grid>
-                                                        <Grid.ColumnDefinitions>
-                                                            <ColumnDefinition Width="Auto"/>
-                                                            <ColumnDefinition Width="*"/>
-                                                        </Grid.ColumnDefinitions>
-                                                        <TextBlock Grid.Column="0" Text="&#xE77B;" FontFamily="Segoe MDL2 Assets" FontSize="14" VerticalAlignment="Center" Margin="4,0,8,0" Foreground="{DynamicResource FgColor}"/>
-                                                        <TextBlock x:Name="UsernameTextBoxPlaceholder" Grid.Column="1" Text="Enter username" Foreground="{DynamicResource FgColor}" Opacity="0.5" FontSize="13" Margin="3,0,0,1" VerticalAlignment="Center" IsHitTestVisible="False"/>
-                                                        <TextBox x:Name="OtherUsernameTextBox" Grid.Column="1" Style="{StaticResource UserTextBoxStyle}" Text="" AutomationProperties.Name="Enter username"/>
-                                                    </Grid>
-                                                </Border>
-                                            </StackPanel>
-                                            <TextBlock x:Name="UserSelectionDescription" Text="Changes will be applied to the currently logged-in user profile." Foreground="{DynamicResource FgColor}" FontSize="12" TextWrapping="Wrap" Margin="0,6,0,3"/>
-                                        </StackPanel>
-                                    </Border>
+                            <Grid Grid.Row="0">
+                                <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="0,-20,0,0" Padding="20,10,20,0">
+                                    <Grid Margin="0,10,0,5">
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto"/>
+                                            <RowDefinition Height="Auto"/>
+                                            <RowDefinition Height="Auto"/>
+                                        </Grid.RowDefinitions>
 
-                                    <!-- App Removal Scope -->
-                                    <Border x:Name="AppRemovalScopeSection" BorderBrush="{DynamicResource BorderColor}" BorderThickness="1" CornerRadius="4" Background="{DynamicResource CardBgColor}" Padding="16,12" Margin="0,0,0,16">
-                                        <StackPanel>
-                                            <TextBlock Text="Remove Apps From" Style="{StaticResource CategoryHeaderTextBlock}"/>
-                                            <ComboBox x:Name="AppRemovalScopeCombo" Margin="0,0,0,6" AutomationProperties.Name="App Removal Scope">
-                                                <ComboBoxItem x:Name="AppRemovalScopeAllUsers" Content="All users" IsSelected="True"/>
-                                                <ComboBoxItem x:Name="AppRemovalScopeCurrentUser" Content="Current user only"/>
-                                                <ComboBoxItem x:Name="AppRemovalScopeTargetUser" Content="Target user only" Visibility="Collapsed"/>
-                                            </ComboBox>
-                                            <TextBlock x:Name="AppRemovalScopeDescription" Text="Apps will be removed for all users and from the Windows image to prevent reinstallation for new users." Foreground="{DynamicResource FgColor}" FontSize="12" TextWrapping="Wrap" Margin="0,6,0,3"/>
-                                        </StackPanel>
-                                    </Border>
-
-                                    <!-- Options -->
-                                    <Border BorderBrush="{DynamicResource BorderColor}" BorderThickness="1" CornerRadius="4" Background="{DynamicResource CardBgColor}" Padding="16,12,16,3" Margin="0,0,0,16">
-                                        <StackPanel>
-                                            <TextBlock Text="Options" Style="{StaticResource CategoryHeaderTextBlock}"/>
-
-                                            <!-- Restore Point Option -->
+                                        <!-- Apply Changes To -->
+                                        <Border Grid.Row="0" BorderBrush="{DynamicResource BorderColor}" BorderThickness="1" CornerRadius="4" Background="{DynamicResource CardBgColor}" Padding="16,12" Margin="0,0,0,16">
                                             <StackPanel>
-                                                <CheckBox x:Name="RestorePointCheckBox" Style="{StaticResource FeatureCheckboxStyle}" Content="Create a system restore point (Recommended)" AutomationProperties.Name="Create a system restore point (Recommended)"/>
+                                                <TextBlock Text="Apply Changes To" Style="{StaticResource CategoryHeaderTextBlock}"/>
+                                                <ComboBox x:Name="UserSelectionCombo" Margin="0,0,0,6" AutomationProperties.Name="Apply Changes To">
+                                                    <ComboBoxItem Content="Current User" IsSelected="True"/>
+                                                    <ComboBoxItem Content="Other User"/>
+                                                    <ComboBoxItem Content="Windows Default User (Sysprep)"/>
+                                                </ComboBox>
+                                                <StackPanel x:Name="OtherUserPanel" Visibility="Collapsed" Margin="0,0,0,6">
+                                                    <TextBlock x:Name="UsernameValidationMessage" Text="" FontStyle="Italic" Foreground="{DynamicResource CloseHover}" FontSize="11" Margin="3,0,0,4" TextWrapping="Wrap"/>
+                                                    <Border IsEnabled="{Binding ElementName=OtherUsernameTextBox, Path=IsEnabled}">
+                                                        <Border.Style>
+                                                            <Style TargetType="Border" BasedOn="{StaticResource UserTextBoxBorderStyle}">
+                                                                <Style.Triggers>
+                                                                    <DataTrigger Binding="{Binding ElementName=OtherUsernameTextBox, Path=IsFocused}" Value="True">
+                                                                        <Setter Property="Background" Value="{DynamicResource InputFocusColor}"/>
+                                                                    </DataTrigger>
+                                                                </Style.Triggers>
+                                                            </Style>
+                                                        </Border.Style>
+                                                        <Grid>
+                                                            <Grid.ColumnDefinitions>
+                                                                <ColumnDefinition Width="Auto"/>
+                                                                <ColumnDefinition Width="*"/>
+                                                            </Grid.ColumnDefinitions>
+                                                            <TextBlock Grid.Column="0" Text="&#xE77B;" FontFamily="Segoe Fluent Icons" FontSize="14" VerticalAlignment="Center" Margin="4,0,8,0" Foreground="{DynamicResource FgColor}"/>
+                                                            <TextBlock x:Name="UsernameTextBoxPlaceholder" Grid.Column="1" Text="Enter username" Foreground="{DynamicResource FgColor}" Opacity="0.5" FontSize="13" Margin="3,0,0,1" VerticalAlignment="Center" IsHitTestVisible="False"/>
+                                                            <TextBox x:Name="OtherUsernameTextBox" Grid.Column="1" Style="{StaticResource UserTextBoxStyle}" Text="" AutomationProperties.Name="Enter username"/>
+                                                        </Grid>
+                                                    </Border>
+                                                </StackPanel>
+                                                <TextBlock x:Name="UserSelectionDescription" Text="Changes will be applied to the currently logged-in user profile." Foreground="{DynamicResource FgColor}" FontSize="12" TextWrapping="Wrap" Margin="0,6,0,3"/>
                                             </StackPanel>
-                                            
-                                            <!-- Restart Explorer Option -->
+                                        </Border>
+
+                                        <!-- App Removal Scope -->
+                                        <Border Grid.Row="1" x:Name="AppRemovalScopeSection" BorderBrush="{DynamicResource BorderColor}" BorderThickness="1" CornerRadius="4" Background="{DynamicResource CardBgColor}" Padding="16,12" Margin="0,0,0,16">
                                             <StackPanel>
-                                                <CheckBox x:Name="RestartExplorerCheckBox" Style="{StaticResource FeatureCheckboxStyle}" Content="Restart the Windows Explorer process to apply all changes immediately" AutomationProperties.Name="Restart the Windows Explorer process to apply all changes immediately"/>
+                                                <TextBlock Text="Remove Apps For" Style="{StaticResource CategoryHeaderTextBlock}"/>
+                                                <ComboBox x:Name="AppRemovalScopeCombo" Margin="0,0,0,6" AutomationProperties.Name="App Removal Scope">
+                                                    <ComboBoxItem x:Name="AppRemovalScopeAllUsers" Content="All users" IsSelected="True"/>
+                                                    <ComboBoxItem x:Name="AppRemovalScopeCurrentUser" Content="Current user only"/>
+                                                    <ComboBoxItem x:Name="AppRemovalScopeTargetUser" Content="Target user only" Visibility="Collapsed"/>
+                                                </ComboBox>
+                                                <TextBlock x:Name="AppRemovalScopeDescription" Text="Apps will be removed for all users and from the Windows image to prevent reinstallation for new users." Foreground="{DynamicResource FgColor}" FontSize="12" TextWrapping="Wrap" Margin="0,6,0,3"/>
                                             </StackPanel>
-                                        </StackPanel>
-                                    </Border>
-                                    
-                                    <!-- Apply Changes Button -->
-                                    <Button x:Name="OverviewApplyBtn" Style="{StaticResource Win11Button}" Width="190" Height="44" Margin="0,0,0,15" HorizontalAlignment="Center" AutomationProperties.Name="Apply Changes">
-                                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-                                            <TextBlock Text="&#xE73E;" FontFamily="Segoe MDL2 Assets" FontSize="20" FontWeight="SemiBold" VerticalAlignment="Center"/>
-                                            <TextBlock Text="Apply Changes" VerticalAlignment="Center" FontSize="18" FontWeight="SemiBold"  Margin="8,0,0,4"/>
-                                        </StackPanel>
-                                    </Button>
-                                </StackPanel>
-                            </ScrollViewer>
-                            <!-- Top fade gradient -->
-                            <Border IsHitTestVisible="False" VerticalAlignment="Top" Height="15" Margin="0,-15,20,0" Background="{DynamicResource BgColor}">
-                                <Border.OpacityMask>
-                                    <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
-                                        <GradientStop Color="Black" Offset="0"/>
-                                        <GradientStop Color="Black" Offset="0.5"/>
-                                        <GradientStop Color="Transparent" Offset="1"/>
-                                    </LinearGradientBrush>
-                                </Border.OpacityMask>
-                            </Border>
-                            <!-- Bottom fade gradient -->
-                            <Border IsHitTestVisible="False" VerticalAlignment="Bottom" Height="20" Margin="0,0,20,0" Background="{DynamicResource BgColor}">
-                                <Border.OpacityMask>
-                                    <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
-                                        <GradientStop Color="Transparent" Offset="0"/>
-                                        <GradientStop Color="Black" Offset="1"/>
-                                    </LinearGradientBrush>
-                                </Border.OpacityMask>
-                            </Border>
+                                        </Border>
+
+                                        <!-- Options -->
+                                        <Border Grid.Row="2" BorderBrush="{DynamicResource BorderColor}" BorderThickness="1" CornerRadius="4" Background="{DynamicResource CardBgColor}" Padding="16,12,16,3" Margin="0,0,0,16">
+                                            <StackPanel>
+                                                <TextBlock Text="Options" Style="{StaticResource CategoryHeaderTextBlock}"/>
+
+                                                <!-- Restore Point Option -->
+                                                <StackPanel>
+                                                    <CheckBox x:Name="RestorePointCheckBox" Style="{StaticResource FeatureCheckboxStyle}" IsChecked="True" Content="Create a system restore point (Recommended)" AutomationProperties.Name="Create a system restore point (Recommended)"/>
+                                                </StackPanel>
+                                                
+                                                <!-- Restart Explorer Option -->
+                                                <StackPanel>
+                                                    <CheckBox x:Name="RestartExplorerCheckBox" Style="{StaticResource FeatureCheckboxStyle}" Content="Restart the Windows Explorer process to apply all changes immediately" AutomationProperties.Name="Restart the Windows Explorer process to apply all changes immediately"/>
+                                                </StackPanel>
+                                            </StackPanel>
+                                        </Border>
+                                    </Grid>
+                                </ScrollViewer>
+                                <!-- Top fade gradient -->
+                                <Border IsHitTestVisible="False" VerticalAlignment="Top" Height="10" Margin="0,-12,20,0" Background="{DynamicResource BgColor}">
+                                    <Border.OpacityMask>
+                                        <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
+                                            <GradientStop Color="Black" Offset="0"/>
+                                            <GradientStop Color="Black" Offset="0.5"/>
+                                            <GradientStop Color="Transparent" Offset="1"/>
+                                        </LinearGradientBrush>
+                                    </Border.OpacityMask>
+                                </Border>
+                                <!-- Bottom fade gradient -->
+                                <Border IsHitTestVisible="False" VerticalAlignment="Bottom" Height="20" Margin="0,0,20,0" Background="{DynamicResource BgColor}">
+                                    <Border.OpacityMask>
+                                        <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
+                                            <GradientStop Color="Transparent" Offset="0"/>
+                                            <GradientStop Color="Black" Offset="1"/>
+                                        </LinearGradientBrush>
+                                    </Border.OpacityMask>
+                                </Border>
+                            </Grid>
+
+                            <!-- Review & Apply Section -->
+                            <StackPanel Grid.Row="1" HorizontalAlignment="Stretch" Background="{DynamicResource BgColor}">
+                                <Button x:Name="ReviewChangesBtn" Background="Transparent" BorderThickness="0" Cursor="Hand" HorizontalAlignment="Center" Margin="0,4,0,8" AutomationProperties.Name="Review selected changes">
+                                    <Button.Template>
+                                        <ControlTemplate TargetType="Button">
+                                            <TextBlock x:Name="LinkText" Text="Review selected changes" FontSize="14" Foreground="{DynamicResource ButtonBg}" FontWeight="SemiBold" HorizontalAlignment="Center"/>
+                                            <ControlTemplate.Triggers>
+                                                <Trigger Property="IsMouseOver" Value="True">
+                                                    <Setter TargetName="LinkText" Property="Foreground" Value="{DynamicResource ButtonHover}"/>
+                                                </Trigger>
+                                                <Trigger Property="IsPressed" Value="True">
+                                                    <Setter TargetName="LinkText" Property="Foreground" Value="{DynamicResource ButtonPressed}"/>
+                                                </Trigger>
+                                            </ControlTemplate.Triggers>
+                                        </ControlTemplate>
+                                    </Button.Template>
+                                </Button>
+                                <Button x:Name="DeploymentApplyBtn" Style="{DynamicResource PrimaryButtonStyle}" Width="190" Height="44" HorizontalAlignment="Center" AutomationProperties.Name="Apply Changes">
+                                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                                        <TextBlock Text="&#xE73E;" FontFamily="Segoe Fluent Icons" FontSize="20" FontWeight="SemiBold" VerticalAlignment="Center"/>
+                                        <TextBlock Text="Apply Changes" VerticalAlignment="Center" FontSize="18" FontWeight="SemiBold" Margin="8,0,0,4"/>
+                                    </StackPanel>
+                                </Button>
+                            </StackPanel>
                         </Grid>
                     </DockPanel>
                 </TabItem>
-
-                <!-- Apply Tab -->
-                <TabItem Header="Apply" x:Name="ApplyTab">
-                    <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="*"/>
-                            <RowDefinition Height="Auto"/>
-                        </Grid.RowDefinitions>
-
-                        <!-- Header -->
-                        <Border DockPanel.Dock="Top" Padding="20,10,20,0">
-                            <StackPanel Grid.Row="0">
-                                <TextBlock Text="Applying Changes" FontWeight="Bold" FontSize="20" Margin="0,0,0,5" Foreground="{DynamicResource FgColor}"/>
-                                <TextBlock Text="Sit back and relax while Win11Debloat applies your selected changes" FontSize="13" Margin="0,0,0,20" Foreground="{DynamicResource FgColor}" TextWrapping="Wrap"/>
-                            </StackPanel>
-                        </Border>
-
-                        <!-- Console Output -->
-                        <Border Grid.Row="1" BorderBrush="{DynamicResource BorderColor}" BorderThickness="1" CornerRadius="4" Background="#0C0C0C" Margin="20,0">
-                            <ScrollViewer x:Name="ConsoleScrollViewer" VerticalScrollBarVisibility="Auto" Padding="10">
-                                <TextBlock x:Name="ConsoleOutput" FontFamily="Consolas" FontSize="12" Foreground="#CCCCCC" TextWrapping="Wrap" Text="" AutomationProperties.LiveSetting="Polite"/>
-                            </ScrollViewer>
-                        </Border>
-
-                        <!-- Progress and Finish Button -->
-                        <Border Grid.Row="2" Background="{DynamicResource BgColor}" Padding="10,0" CornerRadius="0,0,8,8" Margin="20,16,20,16">
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto"/>
-                                    <RowDefinition Height="Auto"/>
-                                </Grid.RowDefinitions>
-
-                                <!-- Status and Finish Button -->
-                                <StackPanel Grid.Row="1" HorizontalAlignment="Center">
-                                    <Button x:Name="FinishBtn" Width="200" Height="48" Style="{StaticResource Win11Button}" Margin="0" IsEnabled="False" AutomationProperties.Name="Finish">
-                                        <TextBlock x:Name="FinishBtnText" Text="Applying changes..." VerticalAlignment="Center" FontSize="16" Margin="0,0,0,1"/>
-                                    </Button>
-                                </StackPanel>
-                            </Grid>
-                        </Border>
-                    </Grid>
-                </TabItem>
             </TabControl>
 
             <!-- Bottom Navigation Buttons -->
@@ -999,18 +1023,18 @@
                         <ColumnDefinition Width="*"/>
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
-                    <Button x:Name="PreviousBtn" Grid.Column="0" Width="120" Height="36" Style="{StaticResource Win11ButtonSecondary}" Visibility="Collapsed" Margin="10,0,0,0" AutomationProperties.Name="Previous">
+                    <Button x:Name="PreviousBtn" Grid.Column="0" Width="120" Height="36" Style="{DynamicResource SecondaryButtonStyle}" Visibility="Collapsed" Margin="10,0,0,0" AutomationProperties.Name="Back">
                         <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-                            <TextBlock Text="&#xE72B;" FontFamily="Segoe MDL2 Assets" FontSize="12" Margin="0,0,8,0" VerticalAlignment="Center"/>
-                            <TextBlock Text="Previous" VerticalAlignment="Center" FontSize="14" Margin="0,0,0,1"/>
+                            <TextBlock Text="&#xE72B;" FontFamily="Segoe Fluent Icons" FontSize="12" Margin="0,0,8,0" VerticalAlignment="Center"/>
+                            <TextBlock Text="Back" VerticalAlignment="Center" FontSize="14" Margin="0,0,0,1"/>
                         </StackPanel>
                     </Button>
                     
                     <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right">
-                        <Button x:Name="NextBtn" Width="120" Height="36" Margin="0,0,10,0" Style="{StaticResource Win11Button}" AutomationProperties.Name="Next">
+                        <Button x:Name="NextBtn" Width="120" Height="36" Margin="0,0,10,0" Style="{DynamicResource PrimaryButtonStyle}" AutomationProperties.Name="Next">
                             <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                                 <TextBlock Text="Next" VerticalAlignment="Center" FontSize="14" Margin="0,0,0,1"/>
-                                <TextBlock Text="&#xE72A;" FontFamily="Segoe MDL2 Assets" FontSize="12" Margin="8,0,0,0" VerticalAlignment="Center"/>
+                                <TextBlock Text="&#xE72A;" FontFamily="Segoe Fluent Icons" FontSize="12" Margin="8,0,0,0" VerticalAlignment="Center"/>
                             </StackPanel>
                         </Button>
                     </StackPanel>
@@ -1020,9 +1044,19 @@
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
                     <Ellipse x:Name="ProgressIndicator1" Width="10" Height="10" Margin="4,0" Fill="#808080" ToolTip="App Removal"/>
                     <Ellipse x:Name="ProgressIndicator2" Width="10" Height="10" Margin="4,0" Fill="#808080" ToolTip="System Tweaks"/>
-                    <Ellipse x:Name="ProgressIndicator3" Width="10" Height="10" Margin="4,0" Fill="#808080" ToolTip="Overview"/>
+                    <Ellipse x:Name="ProgressIndicator3" Width="10" Height="10" Margin="4,0" Fill="#808080" ToolTip="Deployment Settings"/>
                 </StackPanel>
             </Grid>
+            
+            <!-- Modal Overlay for MessageBoxes -->
+            <Rectangle x:Name="ModalOverlay" 
+                       Grid.RowSpan="3" 
+                       Fill="#80000000" 
+                       Visibility="Collapsed" 
+                       Panel.ZIndex="1000"
+                       RadiusX="8"
+                       RadiusY="8"
+                       Margin="-1"/>
         </Grid>
     </Border>
 </Window>

Schemas/MessageBoxWindow.xaml

@@ -0,0 +1,99 @@
+<Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="MessageBox" 
+        Width="440"
+        SizeToContent="Height"
+        MaxHeight="500"
+        ResizeMode="NoResize"
+        WindowStartupLocation="CenterOwner"
+        WindowStyle="None"
+        AllowsTransparency="True"
+        Background="Transparent"
+        Topmost="True"
+        ShowInTaskbar="False">
+
+    <Border BorderBrush="{DynamicResource BorderColor}" 
+            BorderThickness="1" 
+            CornerRadius="8"
+            Background="{DynamicResource CardBgColor}"
+            Margin="25">
+        <Border.Effect>
+            <DropShadowEffect Color="Black" 
+                            Opacity="0.15" 
+                            BlurRadius="20" 
+                            ShadowDepth="0" 
+                            Direction="0"/>
+        </Border.Effect>
+        
+        <Grid Margin="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+
+            <!-- Title Bar -->
+            <Grid Grid.Row="0" x:Name="TitleBar" Height="40" Background="Transparent">
+                <TextBlock x:Name="TitleText" 
+                           Text="Message" 
+                           Foreground="{DynamicResource FgColor}"
+                           FontSize="16"
+                           FontWeight="SemiBold"
+                           VerticalAlignment="Center" 
+                           Margin="16,0,0,0"/>
+            </Grid>
+
+            <!-- Message Content -->
+            <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" MaxHeight="500" Padding="0" Margin="20,12,1,20">
+                <Grid Margin="0,0,20,0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <!-- Icon -->
+                    <TextBlock x:Name="IconText"
+                               Grid.Column="0"
+                               FontFamily="Segoe Fluent Icons"
+                               FontSize="24"
+                               Foreground="{DynamicResource FgColor}"
+                               VerticalAlignment="Center"
+                               Margin="4,2,14,0"
+                               Visibility="Collapsed"/>
+
+                    <!-- Message Text -->
+                    <TextBlock x:Name="MessageText"
+                               Grid.Column="1"
+                               Text="Message content goes here"
+                               TextWrapping="Wrap"
+                               FontSize="14"
+                               LineHeight="20"
+                               Foreground="{DynamicResource FgColor}"
+                               VerticalAlignment="Center"/>
+                </Grid>
+            </ScrollViewer>
+
+            <!-- Button Panel -->
+            <Border Grid.Row="2" 
+                    Background="{DynamicResource BgColor}"
+                    BorderBrush="{DynamicResource BorderColor}"
+                    BorderThickness="0,1,0,0"
+                    Padding="16,12"
+                    CornerRadius="0,0,8,8">
+                <StackPanel x:Name="ButtonPanel"
+                            Orientation="Horizontal"
+                            HorizontalAlignment="Right">
+                    <Button x:Name="Button1" 
+                            Content="OK" 
+                            Height="32" MinWidth="80" Margin="4,0"
+                            Style="{DynamicResource PrimaryButtonStyle}"/>
+                    <Button x:Name="Button2" 
+                            Content="Cancel" 
+                            Height="32" MinWidth="80" Margin="4,0"
+                            Style="{DynamicResource SecondaryButtonStyle}"
+                            Visibility="Collapsed"/>
+                </StackPanel>
+            </Border>
+        </Grid>
+    </Border>
+</Window>

Schemas/SharedStyles.xaml

@@ -0,0 +1,165 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <!-- Primary Button Style -->
+    <Style x:Key="PrimaryButtonStyle" TargetType="Button">
+        <Setter Property="Background" Value="{DynamicResource ButtonBg}"/>
+        <Setter Property="Foreground" Value="white"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ButtonBg}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border Background="{TemplateBinding Background}" 
+                            BorderBrush="{TemplateBinding BorderBrush}" 
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="4"
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Background" Value="{DynamicResource ButtonDisabled}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonDisabled}"/>
+                <Setter Property="Foreground" Value="{DynamicResource ButtonTextDisabled}"/>
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{DynamicResource ButtonHover}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonHover}"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="{DynamicResource ButtonPressed}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonPressed}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <!-- Secondary Button Style -->
+    <Style x:Key="SecondaryButtonStyle" TargetType="Button">
+        <Setter Property="Background" Value="{DynamicResource SecondaryButtonBg}"/>
+        <Setter Property="Foreground" Value="{DynamicResource FgColor}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderColor}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border Background="{TemplateBinding Background}" 
+                            BorderBrush="{TemplateBinding BorderBrush}" 
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="4"
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,0,1"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Background" Value="{DynamicResource SecondaryButtonDisabled}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource BorderColor}"/>
+                <Setter Property="Foreground" Value="{DynamicResource SecondaryButtonTextDisabled}"/>
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{DynamicResource SecondaryButtonHover}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderColor}"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="{DynamicResource SecondaryButtonPressed}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderColor}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <!-- Hyperlink Style -->
+    <Style x:Key="HyperlinkStyle" TargetType="TextBlock">
+        <Setter Property="Foreground" Value="{DynamicResource ButtonBg}"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Foreground" Value="{DynamicResource ButtonHover}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <!-- ProgressBar Style -->
+    <Style x:Key="ApplyProgressBarStyle" TargetType="ProgressBar">
+        <Setter Property="Background" Value="{DynamicResource ButtonBorderColor}"/>
+        <Setter Property="Foreground" Value="{DynamicResource ButtonBg}"/>
+        <Setter Property="Height" Value="6"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ProgressBar">
+                    <Grid>
+                        <Border x:Name="PART_Track" Background="{TemplateBinding Background}" CornerRadius="3" Height="{TemplateBinding Height}"/>
+                        <Border x:Name="PART_Indicator" Background="{TemplateBinding Foreground}" CornerRadius="3" HorizontalAlignment="Left" Height="{TemplateBinding Height}"/>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Modal Title Style -->
+    <Style x:Key="ModalTitleStyle" TargetType="TextBlock">
+        <Setter Property="FontWeight" Value="Bold"/>
+        <Setter Property="FontSize" Value="20"/>
+        <Setter Property="Foreground" Value="{DynamicResource FgColor}"/>
+        <Setter Property="HorizontalAlignment" Value="Center"/>
+        <Setter Property="Margin" Value="0,0,0,8"/>
+    </Style>
+
+    <!-- Modal Subtext Style -->
+    <Style x:Key="ModalSubtextStyle" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="13"/>
+        <Setter Property="Foreground" Value="{DynamicResource FgColor}"/>
+        <Setter Property="Opacity" Value="0.8"/>
+        <Setter Property="HorizontalAlignment" Value="Center"/>
+        <Setter Property="TextAlignment" Value="Center"/>
+    </Style>
+
+    <!-- ScrollBar Style -->
+    <Style TargetType="{x:Type ScrollBar}">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Width" Value="8"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ScrollBar}">
+                    <Grid>
+                        <Track Name="PART_Track" IsDirectionReversed="true">
+                            <Track.Thumb>
+                                <Thumb>
+                                    <Thumb.Style>
+                                        <Style TargetType="Thumb">
+                                            <Setter Property="Background" Value="{DynamicResource ScrollBarThumbColor}"/>
+                                            <Setter Property="Template">
+                                                <Setter.Value>
+                                                    <ControlTemplate TargetType="Thumb">
+                                                        <Border Background="{TemplateBinding Background}" CornerRadius="4"/>
+                                                    </ControlTemplate>
+                                                </Setter.Value>
+                                            </Setter>
+                                            <Style.Triggers>
+                                                <Trigger Property="IsMouseOver" Value="True">
+                                                    <Setter Property="Background" Value="{DynamicResource ScrollBarThumbHoverColor}"/>
+                                                </Trigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </Thumb.Style>
+                                </Thumb>
+                            </Track.Thumb>
+                        </Track>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>

Scripts/AppRemoval/ForceRemoveEdge.ps1

@@ -0,0 +1,57 @@
+# Forcefully removes Microsoft Edge using its uninstaller
+# Credit: Based on work from loadstring1 & ave9858
+function ForceRemoveEdge {
+    Write-Host "> Forcefully uninstalling Microsoft Edge..."
+
+    $regView = [Microsoft.Win32.RegistryView]::Registry32
+    $hklm = [Microsoft.Win32.RegistryKey]::OpenBaseKey([Microsoft.Win32.RegistryHive]::LocalMachine, $regView)
+    $hklm.CreateSubKey('SOFTWARE\Microsoft\EdgeUpdateDev').SetValue('AllowUninstall', '')
+
+    # Create stub (This somehow allows uninstalling Edge)
+    $edgeStub = "$env:SystemRoot\SystemApps\Microsoft.MicrosoftEdge_8wekyb3d8bbwe"
+    New-Item $edgeStub -ItemType Directory | Out-Null
+    New-Item "$edgeStub\MicrosoftEdge.exe" | Out-Null
+
+    # Remove edge
+    $uninstallRegKey = $hklm.OpenSubKey('SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge')
+    if ($null -ne $uninstallRegKey) {
+        Write-Host "Running uninstaller..."
+        $uninstallString = $uninstallRegKey.GetValue('UninstallString') + ' --force-uninstall'
+        Invoke-NonBlocking -ScriptBlock {
+            param($cmd)
+            Start-Process cmd.exe "/c $cmd" -WindowStyle Hidden -Wait
+        } -ArgumentList $uninstallString
+
+        Write-Host "Removing leftover files..."
+
+        $edgePaths = @(
+            "$env:ProgramData\Microsoft\Windows\Start Menu\Programs\Microsoft Edge.lnk",
+            "$env:APPDATA\Microsoft\Internet Explorer\Quick Launch\Microsoft Edge.lnk",
+            "$env:APPDATA\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar\Microsoft Edge.lnk",
+            "$env:APPDATA\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar\Tombstones\Microsoft Edge.lnk",
+            "$env:PUBLIC\Desktop\Microsoft Edge.lnk",
+            "$env:USERPROFILE\Desktop\Microsoft Edge.lnk",
+            "$edgeStub"
+        )
+
+        foreach ($path in $edgePaths) {
+            if (Test-Path -Path $path) {
+                Remove-Item -Path $path -Force -Recurse -ErrorAction SilentlyContinue
+                Write-Host "  Removed $path" -ForegroundColor DarkGray
+            }
+        }
+
+        Write-Host "Cleaning up registry..."
+
+        # Remove MS Edge from autostart
+        reg delete "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Run" /v "MicrosoftEdgeAutoLaunch_A9F6DCE4ABADF4F51CF45CD7129E3C6C" /f *>$null
+        reg delete "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Run" /v "Microsoft Edge Update" /f *>$null
+        reg delete "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\StartupApproved\Run" /v "MicrosoftEdgeAutoLaunch_A9F6DCE4ABADF4F51CF45CD7129E3C6C" /f *>$null
+        reg delete "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\StartupApproved\Run" /v "Microsoft Edge Update" /f *>$null
+
+        Write-Host "Microsoft Edge was uninstalled"
+    }
+    else {
+        Write-Host "Unable to forcefully uninstall Microsoft Edge, uninstaller could not be found" -ForegroundColor Red
+    }
+}

Scripts/AppRemoval/RemoveApps.ps1

@@ -0,0 +1,111 @@
+# Removes apps specified during function call based on the target scope.
+function RemoveApps {
+    param (
+        $appslist
+    )
+
+    # Determine target from script-level params, defaulting to AllUsers
+    $targetUser = GetTargetUserForAppRemoval
+
+    $appIndex = 0
+    $appCount = @($appsList).Count
+
+    Foreach ($app in $appsList) {
+        if ($script:CancelRequested) {
+            return
+        }
+
+        $appIndex++
+
+        # Update step name and sub-progress to show which app is being removed (only for bulk removal)
+        if ($script:ApplySubStepCallback -and $appCount -gt 1) {
+            & $script:ApplySubStepCallback "Removing apps ($appIndex/$appCount)" $appIndex $appCount
+        }
+
+        Write-Host "Attempting to remove $app..."
+
+        # Use WinGet only to remove OneDrive and Edge
+        if (($app -eq "Microsoft.OneDrive") -or ($app -eq "Microsoft.Edge")) {
+            if ($script:WingetInstalled -eq $false) {
+                Write-Host "WinGet is either not installed or is outdated, $app could not be removed" -ForegroundColor Red
+                continue
+            }
+
+            $appName = $app -replace '\.', '_'
+
+            # Uninstall app via WinGet, or create a scheduled task to uninstall it later
+            if ($script:Params.ContainsKey("User")) {
+                ImportRegistryFile "Adding scheduled task to uninstall $app for user $(GetUserName)..." "Uninstall_$($appName).reg"
+            }
+            elseif ($script:Params.ContainsKey("Sysprep")) {
+                ImportRegistryFile "Adding scheduled task to uninstall $app after for new users..." "Uninstall_$($appName).reg"
+            }
+            else {
+                # Uninstall app via WinGet
+                $wingetOutput = Invoke-NonBlocking -ScriptBlock {
+                    param($appId)
+                    winget uninstall --accept-source-agreements --disable-interactivity --id $appId
+                } -ArgumentList $app
+
+                If (($app -eq "Microsoft.Edge") -and (Select-String -InputObject $wingetOutput -Pattern "Uninstall failed with exit code")) {
+                    Write-Host "Unable to uninstall Microsoft Edge via WinGet" -ForegroundColor Red
+
+                    if ($script:GuiWindow) {
+                        $result = Show-MessageBox -Message 'Unable to uninstall Microsoft Edge via WinGet. Would you like to forcefully uninstall it? NOT RECOMMENDED!' -Title 'Force Uninstall Microsoft Edge?' -Button 'YesNo' -Icon 'Warning'
+
+                        if ($result -eq 'Yes') {
+                            Write-Host ""
+                            ForceRemoveEdge
+                        }
+                    }
+                    elseif ($( Read-Host -Prompt "Would you like to forcefully uninstall Microsoft Edge? NOT RECOMMENDED! (y/n)" ) -eq 'y') {
+                        Write-Host ""
+                        ForceRemoveEdge
+                    }
+                }
+            }
+
+            continue
+        }
+
+        # Use Remove-AppxPackage to remove all other apps
+        $appPattern = '*' + $app + '*'
+
+        try {
+            switch ($targetUser) {
+                "AllUsers" {
+                    # Remove installed app for all existing users, and from OS image
+                    Invoke-NonBlocking -ScriptBlock {
+                        param($pattern)
+                        Get-AppxPackage -Name $pattern -AllUsers | Remove-AppxPackage -AllUsers -ErrorAction Continue
+                        Get-AppxProvisionedPackage -Online | Where-Object { $_.PackageName -like $pattern } | ForEach-Object { Remove-ProvisionedAppxPackage -Online -AllUsers -PackageName $_.PackageName }
+                    } -ArgumentList $appPattern
+                }
+                "CurrentUser" {
+                    # Remove installed app for current user only
+                    Invoke-NonBlocking -ScriptBlock {
+                        param($pattern)
+                        Get-AppxPackage -Name $pattern | Remove-AppxPackage -ErrorAction Continue
+                    } -ArgumentList $appPattern
+                }
+                default {
+                    # Target is a specific username - remove app for that user only
+                    Invoke-NonBlocking -ScriptBlock {
+                        param($pattern, $user)
+                        $userAccount = New-Object System.Security.Principal.NTAccount($user)
+                        $userSid = $userAccount.Translate([System.Security.Principal.SecurityIdentifier]).Value
+                        Get-AppxPackage -Name $pattern -User $userSid | Remove-AppxPackage -User $userSid -ErrorAction Continue
+                    } -ArgumentList @($appPattern, $targetUser)
+                }
+            }
+        }
+        catch {
+            if ($DebugPreference -ne "SilentlyContinue") {
+                Write-Host "Something went wrong while trying to remove $app" -ForegroundColor Yellow
+                Write-Host $psitem.Exception.StackTrace -ForegroundColor Gray
+            }
+        }
+    }
+
+    Write-Host ""
+}

Scripts/CLI/AwaitKeyToExit.ps1

@@ -0,0 +1,11 @@
+function AwaitKeyToExit {
+    # Suppress prompt if Silent parameter was passed
+    if (-not $Silent) {
+        Write-Output ""
+        Write-Output "Press any key to exit..."
+        $null = [System.Console]::ReadKey()
+    }
+
+    Stop-Transcript
+    Exit
+}

Scripts/CLI/PrintHeader.ps1

@@ -0,0 +1,20 @@
+# Prints the header for the script
+function PrintHeader {
+    param (
+        $title
+    )
+
+    $fullTitle = " Win11Debloat Script - $title"
+
+    if ($script:Params.ContainsKey("Sysprep")) {
+        $fullTitle = "$fullTitle (Sysprep mode)"
+    }
+    else {
+        $fullTitle = "$fullTitle (User: $(GetUserName))"
+    }
+
+    Clear-Host
+    Write-Host "-------------------------------------------------------------------------------------------"
+    Write-Host $fullTitle
+    Write-Host "-------------------------------------------------------------------------------------------"
+}

Scripts/CLI/PrintPendingChanges.ps1

@@ -0,0 +1,66 @@
+# Prints all pending changes that will be made by the script
+function PrintPendingChanges {
+    Write-Output "Win11Debloat will make the following changes:"
+
+    if ($script:Params['CreateRestorePoint']) {
+        Write-Output "- $($script:Features['CreateRestorePoint'].Label)"
+    }
+    foreach ($parameterName in $script:Params.Keys) {
+        if ($script:ControlParams -contains $parameterName) {
+            continue
+        }
+
+        # Print parameter description
+        switch ($parameterName) {
+            'Apps' {
+                continue
+            }
+            'CreateRestorePoint' {
+                continue
+            }
+            'RemoveApps' {
+                $appsList = GenerateAppsList
+
+                if ($appsList.Count -eq 0) {
+                    Write-Host "No valid apps were selected for removal" -ForegroundColor Yellow
+                    Write-Output ""
+                    continue
+                }
+
+                Write-Output "- Remove $($appsList.Count) apps:"
+                Write-Host $appsList -ForegroundColor DarkGray
+                continue
+            }
+            'RemoveAppsCustom' {
+                $appsList = LoadAppsFromFile $script:CustomAppsListFilePath
+
+                if ($appsList.Count -eq 0) {
+                    Write-Host "No valid apps were selected for removal" -ForegroundColor Yellow
+                    Write-Output ""
+                    continue
+                }
+
+                Write-Output "- Remove $($appsList.Count) apps:"
+                Write-Host $appsList -ForegroundColor DarkGray
+                continue
+            }
+            default {
+                if ($script:Features -and $script:Features.ContainsKey($parameterName)) {
+                    $action = $script:Features[$parameterName].Action
+                    $message = $script:Features[$parameterName].Label
+                    Write-Output "- $action $message"
+                }
+                else {
+                    # Fallback: show the parameter name if no feature description is available
+                    Write-Output "- $parameterName"
+                }
+                continue
+            }
+        }
+    }
+
+    Write-Output ""
+    Write-Output ""
+    Write-Output "Press enter to execute the script or press CTRL+C to quit..."
+    Read-Host | Out-Null
+}

Scripts/CLI/ShowCLIAppRemoval.ps1

@@ -0,0 +1,28 @@
+# Shows the CLI app removal menu and prompts the user to select which apps to remove.
+function ShowCLIAppRemoval {
+    PrintHeader "App Removal"
+
+    Write-Output "> Opening app selection form..."
+
+    $result = Show-AppSelectionWindow
+
+    if ($result -eq $true) {
+        Write-Output "You have selected $($script:SelectedApps.Count) apps for removal"
+        AddParameter 'RemoveAppsCustom'
+
+        SaveSettings
+
+        # Suppress prompt if Silent parameter was passed
+        if (-not $Silent) {
+            Write-Output ""
+            Write-Output ""
+            Write-Output "Press enter to remove the selected apps or press CTRL+C to quit..."
+            Read-Host | Out-Null
+            PrintHeader "App Removal"
+        }
+    }
+    else {
+        Write-Host "Selection was cancelled, no apps have been removed" -ForegroundColor Red
+        Write-Output ""
+    }
+}

Scripts/CLI/ShowCLIDefaultModeAppRemovalOptions.ps1

@@ -0,0 +1,33 @@
+# Shows the CLI default mode app removal options. Loops until a valid option is selected.
+function ShowCLIDefaultModeAppRemovalOptions {
+    PrintHeader 'Default Mode'
+
+    Write-Host "Please note: The default selection of apps includes Microsoft Teams, Spotify, Sticky Notes and more. Select option 2 to verify and change what apps are removed by the script" -ForegroundColor DarkGray
+    Write-Host ""
+
+    Do {
+        Write-Host "Options:" -ForegroundColor Yellow
+        Write-Host " (n) Don't remove any apps" -ForegroundColor Yellow
+        Write-Host " (1) Only remove the default selection of apps" -ForegroundColor Yellow
+        Write-Host " (2) Manually select which apps to remove" -ForegroundColor Yellow
+        $RemoveAppsInput = Read-Host "Do you want to remove any apps? Apps will be removed for all users (n/1/2)"
+
+        # Show app selection form if user entered option 3
+        if ($RemoveAppsInput -eq '2') {
+            $result = Show-AppSelectionWindow
+
+            if ($result -ne $true) {
+                # User cancelled or closed app selection, change RemoveAppsInput so the menu will be shown again
+                Write-Host ""
+                Write-Host "Cancelled application selection, please try again" -ForegroundColor Red
+
+                $RemoveAppsInput = 'c'
+            }
+            
+            Write-Host ""
+        }
+    }
+    while ($RemoveAppsInput -ne 'n' -and $RemoveAppsInput -ne '0' -and $RemoveAppsInput -ne '1' -and $RemoveAppsInput -ne '2')
+
+    return $RemoveAppsInput
+}

Scripts/CLI/ShowCLIDefaultModeOptions.ps1

@@ -0,0 +1,55 @@
+# Show CLI default mode options for removing apps, or set selection if RunDefaults or RunDefaultsLite parameter was passed
+function ShowCLIDefaultModeOptions {
+    if ($RunDefaults) {
+        $RemoveAppsInput = '1'
+    }
+    elseif ($RunDefaultsLite) {
+        $RemoveAppsInput = '0'                
+    }
+    else {
+        $RemoveAppsInput = ShowCLIDefaultModeAppRemovalOptions
+
+        if ($RemoveAppsInput -eq '2' -and ($script:SelectedApps.contains('Microsoft.XboxGameOverlay') -or $script:SelectedApps.contains('Microsoft.XboxGamingOverlay')) -and 
+          $( Read-Host -Prompt "Disable Game Bar integration and game/screen recording? This also stops ms-gamingoverlay and ms-gamebar popups (y/n)" ) -eq 'y') {
+            $DisableGameBarIntegrationInput = $true;
+        }
+    }
+
+    PrintHeader 'Default Mode'
+
+    # Add default settings based on user input
+    try {
+        # Select app removal options based on user input
+        switch ($RemoveAppsInput) {
+            '1' {
+                AddParameter 'RemoveApps'
+                AddParameter 'Apps' 'Default'
+            }
+            '2' {
+                AddParameter 'RemoveAppsCustom'
+
+                if ($DisableGameBarIntegrationInput) {
+                    AddParameter 'DisableDVR'
+                    AddParameter 'DisableGameBarIntegration'
+                }
+            }
+        }
+
+        # Load settings from DefaultSettings.json and add to params
+        LoadSettings -filePath $script:DefaultSettingsFilePath -expectedVersion "1.0"
+    }
+    catch {
+        Write-Error "Failed to load settings from DefaultSettings.json file: $_"
+        AwaitKeyToExit
+    }
+
+    SaveSettings
+
+    # Skip change summary if Silent parameter was passed
+    if ($Silent) {
+        return
+    }
+
+    PrintPendingChanges
+    PrintHeader 'Default Mode'
+}

Scripts/CLI/ShowCLILastUsedSettings.ps1

@@ -0,0 +1,16 @@
+# Shows the CLI last used settings from LastUsedSettings.json file, displays pending changes and prompts the user to apply them.
+function ShowCLILastUsedSettings {
+    PrintHeader 'Custom Mode'
+
+    try {
+        # Load settings from LastUsedSettings.json and add to params
+        LoadSettings -filePath $script:SavedSettingsFilePath -expectedVersion "1.0"
+    }
+    catch {
+        Write-Error "Failed to load settings from LastUsedSettings.json file: $_"
+        AwaitKeyToExit
+    }
+
+    PrintPendingChanges
+    PrintHeader 'Custom Mode'
+}

Scripts/CLI/ShowCLIMenuOptions.ps1

@@ -0,0 +1,30 @@
+# Shows the CLI menu options and prompts the user to select one. Loops until a valid option is selected.
+function ShowCLIMenuOptions {
+    Do { 
+        $ModeSelectionMessage = "Please select an option (1/2)" 
+
+        PrintHeader 'Menu'
+
+        Write-Host "(1) Default mode: Quickly apply the recommended changes"
+        Write-Host "(2) App removal mode: Select & remove apps, without making other changes"
+
+        # Only show this option if SavedSettings file exists
+        if (Test-Path $script:SavedSettingsFilePath) {
+            Write-Host "(3) Quickly apply your last used settings"
+            
+            $ModeSelectionMessage = "Please select an option (1/2/3)" 
+        }
+
+        Write-Host ""
+        Write-Host ""
+
+        $Mode = Read-Host $ModeSelectionMessage
+
+        if (($Mode -eq '3') -and -not (Test-Path $script:SavedSettingsFilePath)) {
+            $Mode = $null
+        }
+    }
+    while ($Mode -ne '1' -and $Mode -ne '2' -and $Mode -ne '3')
+
+    return $Mode
+}

Scripts/Features/CreateSystemRestorePoint.ps1

@@ -0,0 +1,104 @@
+function CreateSystemRestorePoint {
+    $SysRestore = Get-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SystemRestore" -Name "RPSessionInterval"
+    $failed = $false
+
+    if ($SysRestore.RPSessionInterval -eq 0) {
+        # In GUI mode, skip the prompt and just try to enable it
+        if ($script:GuiWindow -or $Silent -or $( Read-Host -Prompt "System restore is disabled, would you like to enable it and create a restore point? (y/n)") -eq 'y') {
+            $enableSystemRestoreJob = Start-Job {
+                try {
+                    Enable-ComputerRestore -Drive "$env:SystemDrive"
+                }
+                catch {
+                    return "Error: Failed to enable System Restore: $_"
+                }
+                return $null
+            }
+
+            $enableSystemRestoreJobDone = $enableSystemRestoreJob | Wait-Job -TimeOut 20
+
+            if (-not $enableSystemRestoreJobDone) {
+                Remove-Job -Job $enableSystemRestoreJob -Force -ErrorAction SilentlyContinue
+                Write-Host "Error: Failed to enable system restore and create restore point, operation timed out" -ForegroundColor Red
+                $failed = $true
+            }
+            else {
+                $result = Receive-Job $enableSystemRestoreJob
+                Remove-Job -Job $enableSystemRestoreJob -ErrorAction SilentlyContinue
+                if ($result) {
+                    Write-Host $result -ForegroundColor Red
+                    $failed = $true
+                }
+            }
+        }
+        else {
+            Write-Host ""
+            $failed = $true
+        }
+    }
+
+    if (-not $failed) {
+        $createRestorePointJob = Start-Job {
+            # Find existing restore points that are less than 24 hours old
+            try {
+                $recentRestorePoints = Get-ComputerRestorePoint | Where-Object { (Get-Date) - [System.Management.ManagementDateTimeConverter]::ToDateTime($_.CreationTime) -le (New-TimeSpan -Hours 24) }
+            }
+            catch {
+                return @{ Success = $false; Message = "Error: Unable to retrieve existing restore points: $_" }
+            }
+
+            if ($recentRestorePoints.Count -eq 0) {
+                try {
+                    Checkpoint-Computer -Description "Restore point created by Win11Debloat" -RestorePointType "MODIFY_SETTINGS"
+                    return @{ Success = $true; Message = "System restore point created successfully" }
+                }
+                catch {
+                    return @{ Success = $false; Message = "Error: Unable to create restore point: $_" }
+                }
+            }
+            else {
+                return @{ Success = $true; Message = "A recent restore point already exists, no new restore point was created" }
+            }
+        }
+
+        $createRestorePointJobDone = $createRestorePointJob | Wait-Job -TimeOut 20
+
+        if (-not $createRestorePointJobDone) {
+            Remove-Job -Job $createRestorePointJob -Force -ErrorAction SilentlyContinue
+            Write-Host "Error: Failed to create system restore point, operation timed out" -ForegroundColor Red
+            $failed = $true
+        }
+        else {
+            $result = Receive-Job $createRestorePointJob
+            Remove-Job -Job $createRestorePointJob -ErrorAction SilentlyContinue
+            if ($result.Success) {
+                Write-Host $result.Message
+            }
+            else {
+                Write-Host $result.Message -ForegroundColor Red
+                $failed = $true
+            }
+        }
+    }
+
+    # Ensure that the user is aware if creating a restore point failed, and give them the option to continue without a restore point or cancel the script
+    if ($failed) {
+        if ($script:GuiWindow) {
+            $result = Show-MessageBox "Failed to create a system restore point. Do you want to continue without a restore point?" "Restore Point Creation Failed" "YesNo" "Warning"
+
+            if ($result -ne "Yes") {
+                $script:CancelRequested = $true
+                return
+            }
+        }
+        elseif (-not $Silent) {
+            Write-Host "Failed to create a system restore point. Do you want to continue without a restore point? (y/n)" -ForegroundColor Yellow
+            if ($( Read-Host ) -ne 'y') {
+                $script:CancelRequested = $true
+                return
+            }
+        }
+
+        Write-Host "Warning: Continuing without restore point" -ForegroundColor Yellow
+    }
+}

Scripts/Features/DisableStoreSearchSuggestions.ps1

@@ -0,0 +1,52 @@
+# Disables Microsoft Store search suggestions in the start menu for all users by denying access to the Store app database file for each user
+function DisableStoreSearchSuggestionsForAllUsers {
+    # Get path to Store app database for all users
+    $userPathString = GetUserDirectory -userName "*" -fileName "AppData\Local\Packages"
+    $usersStoreDbPaths = get-childitem -path $userPathString
+
+    # Go through all users and disable start search suggestions
+    ForEach ($storeDbPath in $usersStoreDbPaths) {
+        DisableStoreSearchSuggestions ($storeDbPath.FullName + "\Microsoft.WindowsStore_8wekyb3d8bbwe\LocalState\store.db")
+    }
+
+    # Also disable start search suggestions for the default user profile
+    $defaultStoreDbPath = GetUserDirectory -userName "Default" -fileName "AppData\Local\Packages\Microsoft.WindowsStore_8wekyb3d8bbwe\LocalState\store.db" -exitIfPathNotFound $false
+    DisableStoreSearchSuggestions $defaultStoreDbPath
+}
+
+
+# Disables Microsoft Store search suggestions in the start menu by denying access to the Store app database file
+function DisableStoreSearchSuggestions {
+    param (
+        $StoreAppsDatabase = "$env:LocalAppData\Packages\Microsoft.WindowsStore_8wekyb3d8bbwe\LocalState\store.db"
+    )
+
+    # Change path to correct user if a user was specified
+    if ($script:Params.ContainsKey("User")) {
+        $StoreAppsDatabase = GetUserDirectory -userName "$(GetUserName)" -fileName "AppData\Local\Packages\Microsoft.WindowsStore_8wekyb3d8bbwe\LocalState\store.db" -exitIfPathNotFound $false
+    }
+
+    $userName = [regex]::Match($StoreAppsDatabase, '(?:Users\\)([^\\]+)(?:\\AppData)').Groups[1].Value
+
+    # This file doesn't exist in EEA (No Store app suggestions).
+    if (-not (Test-Path -Path $StoreAppsDatabase))
+    {
+        Write-Host "Unable to find Store app database for user $userName, creating it now to prevent Windows from creating it later..." -ForegroundColor Yellow
+
+        $storeDbDir = Split-Path -Path $StoreAppsDatabase -Parent
+
+        if (-not (Test-Path -Path $storeDbDir)) {
+            New-Item -Path $storeDbDir -ItemType Directory -Force | Out-Null
+        }
+
+        New-Item -Path $StoreAppsDatabase -ItemType File -Force | Out-Null
+    }
+    
+    $AccountSid = [System.Security.Principal.SecurityIdentifier]::new('S-1-1-0') # 'EVERYONE' group
+    $Acl = Get-Acl -Path $StoreAppsDatabase
+    $Ace = [System.Security.AccessControl.FileSystemAccessRule]::new($AccountSid, 'FullControl', 'Deny')
+    $Acl.SetAccessRule($Ace) | Out-Null
+    Set-Acl -Path $StoreAppsDatabase -AclObject $Acl | Out-Null
+
+    Write-Host "Disabled Microsoft Store search suggestions for user $userName"
+}

Scripts/Features/EnableWindowsFeature.ps1

@@ -0,0 +1,16 @@
+# Enables a Windows optional feature and pipes its output to the console
+function EnableWindowsFeature {
+    param (
+        [string]$FeatureName
+    )
+
+    $result = Invoke-NonBlocking -ScriptBlock {
+        param($name)
+        Enable-WindowsOptionalFeature -Online -FeatureName $name -All -NoRestart
+    } -ArgumentList $FeatureName
+
+    $dismResult = @($result) | Where-Object { $_ -is [Microsoft.Dism.Commands.ImageObject] }
+    if ($dismResult) {
+        Write-Host ($dismResult | Out-String).Trim()
+    }
+}

Scripts/Features/ImportRegistryFile.ps1

@@ -0,0 +1,69 @@
+# Import & execute regfile
+function ImportRegistryFile {
+    param (
+        $message,
+        $path
+    )
+
+    Write-Host $message
+
+    # Validate that the regfile exists in both locations
+    if (-not (Test-Path "$script:RegfilesPath\$path") -or -not (Test-Path "$script:RegfilesPath\Sysprep\$path")) {
+        Write-Host "Error: Unable to find registry file: $path" -ForegroundColor Red
+        Write-Host ""
+        return
+    }
+
+    # Reset exit code before running reg.exe for reliable success detection
+    $global:LASTEXITCODE = 0
+
+    if ($script:Params.ContainsKey("Sysprep") -or $script:Params.ContainsKey("User")) {
+        # Sysprep targets Default user, User targets the specified user
+        $hiveDatPath = if ($script:Params.ContainsKey("Sysprep")) {
+            GetUserDirectory -userName "Default" -fileName "NTUSER.DAT"
+        } else {
+            GetUserDirectory -userName $script:Params.Item("User") -fileName "NTUSER.DAT"
+        }
+
+        $regResult = Invoke-NonBlocking -ScriptBlock {
+            param($datPath, $regFilePath)
+            $global:LASTEXITCODE = 0
+            reg load "HKU\Default" $datPath | Out-Null
+            $output = reg import $regFilePath 2>&1
+            $code = $LASTEXITCODE
+            reg unload "HKU\Default" | Out-Null
+            return @{ Output = $output; ExitCode = $code }
+        } -ArgumentList @($hiveDatPath, "$script:RegfilesPath\Sysprep\$path")
+    }
+    else {
+        $regResult = Invoke-NonBlocking -ScriptBlock {
+            param($regFilePath)
+            $global:LASTEXITCODE = 0
+            $output = reg import $regFilePath 2>&1
+            return @{ Output = $output; ExitCode = $LASTEXITCODE }
+        } -ArgumentList "$script:RegfilesPath\$path"
+    }
+
+    $regOutput = $regResult.Output
+    $hasSuccess = $regResult.ExitCode -eq 0
+    
+    if ($regOutput) {
+        foreach ($line in $regOutput) {
+            $lineText = if ($line -is [System.Management.Automation.ErrorRecord]) { $line.Exception.Message } else { $line.ToString() }
+            if ($lineText -and $lineText.Length -gt 0) {
+                if ($hasSuccess) {
+                    Write-Host $lineText
+                }
+                else {
+                    Write-Host $lineText -ForegroundColor Red
+                }
+            }
+        }
+    }
+
+    if (-not $hasSuccess) {
+        Write-Host "Failed importing registry file: $path" -ForegroundColor Red
+    }
+
+    Write-Host ""
+}

Scripts/Features/ReplaceStartMenu.ps1

@@ -0,0 +1,83 @@
+# Replace the startmenu for all users, when using the default startmenuTemplate this clears all pinned apps
+# Credit: https://lazyadmin.nl/win-11/customize-windows-11-start-menu-layout/
+function ReplaceStartMenuForAllUsers {
+    param (
+        $startMenuTemplate = "$script:AssetsPath/Start/start2.bin"
+    )
+
+    Write-Host "> Removing all pinned apps from the start menu for all users..."
+
+    # Check if template bin file exists
+    if (-not (Test-Path $startMenuTemplate)) {
+        Write-Host "Error: Unable to clear start menu, start2.bin file missing from script folder" -ForegroundColor Red
+        Write-Host ""
+        return
+    }
+
+    # Get path to start menu file for all users
+    $userPathString = GetUserDirectory -userName "*" -fileName "AppData\Local\Packages\Microsoft.Windows.StartMenuExperienceHost_cw5n1h2txyewy\LocalState"
+    $usersStartMenuPaths = get-childitem -path $userPathString
+
+    # Go through all users and replace the start menu file
+    ForEach ($startMenuPath in $usersStartMenuPaths) {
+        ReplaceStartMenu $startMenuTemplate "$($startMenuPath.Fullname)\start2.bin"
+    }
+
+    # Also replace the start menu file for the default user profile
+    $defaultStartMenuPath = GetUserDirectory -userName "Default" -fileName "AppData\Local\Packages\Microsoft.Windows.StartMenuExperienceHost_cw5n1h2txyewy\LocalState" -exitIfPathNotFound $false
+
+    # Create folder if it doesn't exist
+    if (-not (Test-Path $defaultStartMenuPath)) {
+        new-item $defaultStartMenuPath -ItemType Directory -Force | Out-Null
+        Write-Host "Created LocalState folder for default user profile"
+    }
+
+    # Copy template to default profile
+    Copy-Item -Path $startMenuTemplate -Destination $defaultStartMenuPath -Force
+    Write-Host "Replaced start menu for the default user profile"
+    Write-Host ""
+}
+
+
+# Replace the startmenu for all users, when using the default startmenuTemplate this clears all pinned apps
+# Credit: https://lazyadmin.nl/win-11/customize-windows-11-start-menu-layout/
+function ReplaceStartMenu {
+    param (
+        $startMenuTemplate = "$script:AssetsPath/Start/start2.bin",
+        $startMenuBinFile = "$env:LOCALAPPDATA\Packages\Microsoft.Windows.StartMenuExperienceHost_cw5n1h2txyewy\LocalState\start2.bin"
+    )
+
+    # Change path to correct user if a user was specified
+    if ($script:Params.ContainsKey("User")) {
+        $startMenuBinFile = GetUserDirectory -userName "$(GetUserName)" -fileName "AppData\Local\Packages\Microsoft.Windows.StartMenuExperienceHost_cw5n1h2txyewy\LocalState\start2.bin" -exitIfPathNotFound $false
+    }
+
+    # Check if template bin file exists
+    if (-not (Test-Path $startMenuTemplate)) {
+        Write-Host "Error: Unable to replace start menu, template file not found" -ForegroundColor Red
+        return
+    }
+
+    if ([IO.Path]::GetExtension($startMenuTemplate) -ne ".bin" ) {
+        Write-Host "Error: Unable to replace start menu, template file is not a valid .bin file" -ForegroundColor Red
+        return
+    }
+
+    $userName = [regex]::Match($startMenuBinFile, '(?:Users\\)([^\\]+)(?:\\AppData)').Groups[1].Value
+
+    $backupBinFile = $startMenuBinFile + ".bak"
+
+    if (Test-Path $startMenuBinFile) {
+        # Backup current start menu file
+        Move-Item -Path $startMenuBinFile -Destination $backupBinFile -Force
+    }
+    else {
+        Write-Host "Unable to find original start2.bin file for user $userName, no backup was created for this user" -ForegroundColor Yellow
+        New-Item -ItemType File -Path $startMenuBinFile -Force
+    }
+
+    # Copy template file
+    Copy-Item -Path $startMenuTemplate -Destination $startMenuBinFile -Force
+
+    Write-Host "Replaced start menu for user $userName"
+}

Scripts/Features/RestartExplorer.ps1

@@ -0,0 +1,26 @@
+# Restart the Windows Explorer process
+function RestartExplorer {
+    Write-Host "> Attempting to restart the Windows Explorer process to apply all changes..."
+    
+    if ($script:Params.ContainsKey("Sysprep") -or $script:Params.ContainsKey("User") -or $script:Params.ContainsKey("NoRestartExplorer")) {
+        Write-Host "Explorer process restart was skipped, please manually reboot your PC to apply all changes" -ForegroundColor Yellow
+        return
+    }
+
+    foreach ($paramKey in $script:Params.Keys) {
+        if ($script:Features.ContainsKey($paramKey) -and $script:Features[$paramKey].RequiresReboot -eq $true) {
+            $feature = $script:Features[$paramKey]
+            Write-Host "Warning: '$($feature.Action) $($feature.Label)' requires a reboot to take full effect" -ForegroundColor Yellow
+        }
+    }
+
+    # Only restart if the powershell process matches the OS architecture.
+    # Restarting explorer from a 32bit PowerShell window will fail on a 64bit OS
+    if ([Environment]::Is64BitProcess -eq [Environment]::Is64BitOperatingSystem) {
+        Write-Host "Restarting the Windows Explorer process... (This may cause your screen to flicker)"
+        Stop-Process -processName: Explorer -Force
+    }
+    else {
+        Write-Host "Unable to restart Windows Explorer process, please manually reboot your PC to apply all changes" -ForegroundColor Yellow
+    }
+}

Scripts/FileIO/LoadAppsDetailsFromJson.ps1

@@ -0,0 +1,46 @@
+# Read Apps.json and return list of app objects with optional filtering
+function LoadAppsDetailsFromJson {
+    param (
+        [switch]$OnlyInstalled,
+        [string]$InstalledList = "",
+        [switch]$InitialCheckedFromJson
+    )
+
+    $apps = @()
+    try {
+        $jsonContent = Get-Content -Path $script:AppsListFilePath -Raw | ConvertFrom-Json
+    }
+    catch {
+        Write-Error "Failed to read Apps.json: $_"
+        return $apps
+    }
+
+    foreach ($appData in $jsonContent.Apps) {
+        $appId = $appData.AppId.Trim()
+        if ($appId.length -eq 0) { continue }
+
+        if ($OnlyInstalled) {
+            if (-not ($InstalledList -like ("*$appId*")) -and -not (Get-AppxPackage -Name $appId)) {
+                continue
+            }
+            if (($appId -eq "Microsoft.Edge") -and -not ($InstalledList -like "* Microsoft.Edge *")) {
+                continue
+            }
+        }
+
+        $friendlyName = if ($appData.FriendlyName) { $appData.FriendlyName } else { $appId }
+        $displayName = if ($appData.FriendlyName) { "$($appData.FriendlyName) ($appId)" } else { $appId }
+        $isChecked = if ($InitialCheckedFromJson) { $appData.SelectedByDefault } else { $false }
+
+        $apps += [PSCustomObject]@{
+            AppId = $appId
+            FriendlyName = $friendlyName
+            DisplayName = $displayName
+            IsChecked = $isChecked
+            Description = $appData.Description
+            SelectedByDefault = $appData.SelectedByDefault
+        }
+    }
+
+    return $apps
+}

Scripts/FileIO/LoadAppsFromFile.ps1

@@ -0,0 +1,45 @@
+# Returns list of apps from the specified file, it trims the app names and removes any comments
+function LoadAppsFromFile {
+    param (
+        $appsFilePath
+    )
+
+    $appsList = @()
+
+    if (-not (Test-Path $appsFilePath)) {
+        return $appsList
+    }
+
+    try {
+        # Check if file is JSON or text format
+        if ($appsFilePath -like "*.json") {
+            # JSON file format
+            $jsonContent = Get-Content -Path $appsFilePath -Raw | ConvertFrom-Json
+            Foreach ($appData in $jsonContent.Apps) {
+                $appId = $appData.AppId.Trim()
+                $selectedByDefault = $appData.SelectedByDefault
+                if ($selectedByDefault -and $appId.length -gt 0) {
+                    $appsList += $appId
+                }
+            }
+        }
+        else {
+            # Legacy text file format
+            Foreach ($app in (Get-Content -Path $appsFilePath | Where-Object { $_ -notmatch '^#.*' -and $_ -notmatch '^\s*$' } )) { 
+                if (-not ($app.IndexOf('#') -eq -1)) {
+                    $app = $app.Substring(0, $app.IndexOf('#'))
+                }
+
+                $app = $app.Trim()
+                $appString = $app.Trim('*')
+                $appsList += $appString
+            }
+        }
+
+        return $appsList
+    } 
+    catch {
+        Write-Error "Unable to read apps list from file: $appsFilePath"
+        AwaitKeyToExit
+    }
+}

Scripts/FileIO/LoadJsonFile.ps1

@@ -0,0 +1,32 @@
+# Loads a JSON file from the specified path and returns the parsed object
+# Returns $null if the file doesn't exist or if parsing fails
+function LoadJsonFile {
+    param (
+        [string]$filePath,
+        [string]$expectedVersion = $null,
+        [switch]$optionalFile
+    )
+    
+    if (-not (Test-Path $filePath)) {
+        if (-not $optionalFile) {
+            Write-Error "File not found: $filePath"
+        }
+        return $null
+    }
+    
+    try {
+        $jsonContent = Get-Content -Path $filePath -Raw | ConvertFrom-Json
+        
+        # Validate version if specified
+        if ($expectedVersion -and $jsonContent.Version -and $jsonContent.Version -ne $expectedVersion) {
+            Write-Error "$(Split-Path $filePath -Leaf) version mismatch (expected $expectedVersion, found $($jsonContent.Version))"
+            return $null
+        }
+        
+        return $jsonContent
+    }
+    catch {
+        Write-Error "Failed to parse JSON file: $filePath"
+        return $null
+    }
+}

Scripts/FileIO/LoadSettings.ps1

@@ -0,0 +1,31 @@
+# Loads settings from a JSON file and adds them to script params
+function LoadSettings {
+    param (
+        [string]$filePath,
+        [string]$expectedVersion = "1.0"
+    )
+    
+    $settingsJson = LoadJsonFile -filePath $filePath -expectedVersion $expectedVersion
+    
+    if (-not $settingsJson -or -not $settingsJson.Settings) {
+        throw "Failed to load settings from $(Split-Path $filePath -Leaf)"
+    }
+
+    # Get current Windows build version
+    $WinVersion = Get-ItemPropertyValue 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion' CurrentBuild
+    
+    foreach ($setting in $settingsJson.Settings) {
+        if ($setting.Value -eq $false) {
+            continue
+        }
+
+        $feature = $script:Features[$setting.Name]
+
+        # Check version and feature compatibility using Features.json
+        if (($feature.MinVersion -and $WinVersion -lt $feature.MinVersion) -or ($feature.MaxVersion -and $WinVersion -gt $feature.MaxVersion) -or ($feature.FeatureId -eq 'DisableModernStandbyNetworking' -and (-not $script:ModernStandbySupported))) {
+           continue
+        }
+        
+        AddParameter $setting.Name $setting.Value
+    }
+}

Scripts/FileIO/SaveCustomAppsListToFile.ps1

@@ -0,0 +1,15 @@
+# Saves the provided appsList to the CustomAppsList file
+function SaveCustomAppsListToFile {
+    param (
+        $appsList
+    )
+
+    $script:SelectedApps = $appsList
+
+    # Create file that stores selected apps if it doesn't exist
+    if (-not (Test-Path $script:CustomAppsListFilePath)) {
+        $null = New-Item $script:CustomAppsListFilePath -ItemType File
+    }
+
+    Set-Content -Path $script:CustomAppsListFilePath -Value $script:SelectedApps
+}

Scripts/FileIO/SaveSettings.ps1

@@ -0,0 +1,26 @@
+# Saves the current settings, excluding control parameters, to 'LastUsedSettings.json' file
+function SaveSettings {
+    $settings = @{
+        "Version" = "1.0"
+        "Settings" = @()
+    }
+    
+    foreach ($param in $script:Params.Keys) {
+        if ($script:ControlParams -notcontains $param) {
+            $value = $script:Params[$param]
+
+            $settings.Settings += @{
+                "Name" = $param
+                "Value" = $value
+            }
+        }
+    }
+
+    try {
+        $settings | ConvertTo-Json -Depth 10 | Set-Content $script:SavedSettingsFilePath
+    }
+    catch {
+        Write-Output ""
+        Write-Host "Error: Failed to save settings to LastUsedSettings.json file" -ForegroundColor Red
+    }
+}

Scripts/FileIO/ValidateAppslist.ps1

@@ -0,0 +1,24 @@
+# Returns a validated list of apps based on the provided appsList and the supported apps from Apps.json
+function ValidateAppslist {
+    param (
+        $appsList
+    )
+
+    $supportedAppsList = (LoadAppsDetailsFromJson | ForEach-Object { $_.AppId })
+    $validatedAppsList = @()
+
+    # Validate provided appsList against supportedAppsList
+    Foreach ($app in $appsList) {
+        $app = $app.Trim()
+        $appString = $app.Trim('*')
+
+        if ($supportedAppsList -notcontains $appString) {
+            Write-Host "Removal of app '$appString' is not supported and will be skipped" -ForegroundColor Yellow
+            continue
+        }
+
+        $validatedAppsList += $appString
+    }
+
+    return $validatedAppsList
+}

Scripts/GUI/ApplySettingsToUiControls.ps1

@@ -0,0 +1,73 @@
+# Applies settings from a JSON object to UI controls (checkboxes and comboboxes)
+# Used by LoadDefaultsBtn and LoadLastUsedBtn in the UI
+function ApplySettingsToUiControls {
+    param (
+        $window,
+        $settingsJson,
+        $uiControlMappings
+    )
+    
+    if (-not $settingsJson -or -not $settingsJson.Settings) {
+        return $false
+    }
+    
+    # First, reset all tweaks to "No Change" (index 0) or unchecked
+    if ($uiControlMappings) {
+        foreach ($comboName in $uiControlMappings.Keys) {
+            $control = $window.FindName($comboName)
+            if ($control -is [System.Windows.Controls.CheckBox]) {
+                $control.IsChecked = $false
+            }
+            elseif ($control -is [System.Windows.Controls.ComboBox]) {
+                $control.SelectedIndex = 0
+            }
+        }
+    }
+    
+    # Apply settings from JSON
+    foreach ($setting in $settingsJson.Settings) {
+        if ($setting.Value -ne $true) { continue }
+        $paramName = $setting.Name
+
+        # Skip RestorePointCheckBox, this is always checked by default
+        if ($paramName -eq 'CreateRestorePoint') {
+            continue
+        }
+
+        if ($uiControlMappings) {
+            foreach ($comboName in $uiControlMappings.Keys) {
+                $mapping = $uiControlMappings[$comboName]
+                if ($mapping.Type -eq 'group') {
+                    $i = 1
+                    foreach ($val in $mapping.Values) {
+                        if ($val.FeatureIds -contains $paramName) {
+                            $control = $window.FindName($comboName)
+                            if ($control -and $control.Visibility -eq 'Visible') {
+                                if ($control -is [System.Windows.Controls.ComboBox]) {
+                                    $control.SelectedIndex = $i
+                                }
+                            }
+                            break
+                        }
+                        $i++
+                    }
+                }
+                elseif ($mapping.Type -eq 'feature') {
+                    if ($mapping.FeatureId -eq $paramName) {
+                        $control = $window.FindName($comboName)
+                        if ($control -and $control.Visibility -eq 'Visible') {
+                            if ($control -is [System.Windows.Controls.CheckBox]) {
+                                $control.IsChecked = $true
+                            }
+                            elseif ($control -is [System.Windows.Controls.ComboBox]) {
+                                $control.SelectedIndex = 1
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+    return $true
+}

Scripts/GUI/AttachShiftClickBehavior.ps1

@@ -0,0 +1,71 @@
+# Attaches shift-click selection behavior to a checkbox in an apps panel
+# Parameters:
+#   - $checkbox: The checkbox to attach the behavior to
+#   - $appsPanel: The StackPanel containing checkbox items
+#   - $lastSelectedCheckboxRef: A reference to a variable storing the last clicked checkbox
+#   - $updateStatusCallback: Optional callback to update selection status
+function AttachShiftClickBehavior {
+    param (
+        [System.Windows.Controls.CheckBox]$checkbox,
+        [System.Windows.Controls.StackPanel]$appsPanel,
+        [ref]$lastSelectedCheckboxRef,
+        [scriptblock]$updateStatusCallback = $null
+    )
+
+    # Use a closure to capture the parameters
+    $checkbox.Add_PreviewMouseLeftButtonDown({
+        param(
+            $sender,
+            $e
+        )
+        
+        $isShiftPressed = [System.Windows.Input.Keyboard]::IsKeyDown([System.Windows.Input.Key]::LeftShift) -or 
+                          [System.Windows.Input.Keyboard]::IsKeyDown([System.Windows.Input.Key]::RightShift)
+        
+        if ($isShiftPressed -and $null -ne $lastSelectedCheckboxRef.Value) {
+            # Get all visible checkboxes in the panel
+            $visibleCheckboxes = @()
+            foreach ($child in $appsPanel.Children) {
+                if ($child -is [System.Windows.Controls.CheckBox] -and $child.Visibility -eq 'Visible') {
+                    $visibleCheckboxes += $child
+                }
+            }
+
+            # Find indices of the last selected and current checkbox
+            $lastIndex = -1
+            $currentIndex = -1
+
+            for ($i = 0; $i -lt $visibleCheckboxes.Count; $i++) {
+                if ($visibleCheckboxes[$i] -eq $lastSelectedCheckboxRef.Value) {
+                    $lastIndex = $i
+                }
+                if ($visibleCheckboxes[$i] -eq $sender) {
+                    $currentIndex = $i
+                }
+            }
+
+            if ($lastIndex -ge 0 -and $currentIndex -ge 0 -and $lastIndex -ne $currentIndex) {
+                $startIndex = [Math]::Min($lastIndex, $currentIndex)
+                $endIndex = [Math]::Max($lastIndex, $currentIndex)
+
+                $shouldDeselect = $sender.IsChecked
+
+                # Set all checkboxes in the range to the appropriate state
+                for ($i = $startIndex; $i -le $endIndex; $i++) {
+                    $visibleCheckboxes[$i].IsChecked = -not $shouldDeselect
+                }
+
+                if ($updateStatusCallback) {
+                    & $updateStatusCallback
+                }
+
+                # Mark the event as handled to prevent the default toggle behavior
+                $e.Handled = $true
+                return
+            }
+        }
+
+        # Update the last selected checkbox reference for next time
+        $lastSelectedCheckboxRef.Value = $sender
+    }.GetNewClosure())
+}

Scripts/GUI/GetSystemUsesDarkMode.ps1

@@ -0,0 +1,9 @@
+# Checks if the system is set to use dark mode for apps
+function GetSystemUsesDarkMode {
+    try {
+        return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize' -Name 'AppsUseLightTheme').AppsUseLightTheme -eq 0
+    }
+    catch {
+        return $false
+    }
+}

Scripts/GUI/SetWindowThemeResources.ps1

@@ -0,0 +1,90 @@
+# Sets resource colors for a WPF window based on dark mode preference
+function SetWindowThemeResources {
+    param (
+        $window,
+        [bool]$usesDarkMode
+    )
+
+    if ($usesDarkMode) {
+        $window.Resources.Add("BgColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#202020")))
+        $window.Resources.Add("FgColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#FFFFFF")))
+        $window.Resources.Add("CardBgColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#2b2b2b")))
+        $window.Resources.Add("BorderColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#404040")))
+        $window.Resources.Add("ButtonBorderColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#404040")))
+        $window.Resources.Add("CheckBoxBgColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#272727")))
+        $window.Resources.Add("CheckBoxBorderColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#808080")))
+        $window.Resources.Add("CheckBoxHoverColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#343434")))
+        $window.Resources.Add("ComboBgColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#373737")))
+        $window.Resources.Add("ComboHoverColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#434343")))
+        $window.Resources.Add("ComboItemBgColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#2c2c2c")))
+        $window.Resources.Add("ComboItemHoverColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#383838")))
+        $window.Resources.Add("ComboItemSelectedColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#343434")))
+        $window.Resources.Add("AccentColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#FFD700")))
+        $window.Resources.Add("ButtonDisabled", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#434343")))
+        $window.Resources.Add("ButtonTextDisabled", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#989898")))
+        $window.Resources.Add("SecondaryButtonBg", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#393939")))
+        $window.Resources.Add("SecondaryButtonHover", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#2a2a2a")))
+        $window.Resources.Add("SecondaryButtonPressed", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#1e1e1e")))
+        $window.Resources.Add("SecondaryButtonDisabled", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#3b3b3b")))
+        $window.Resources.Add("SecondaryButtonTextDisabled", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#787878")))
+        $window.Resources.Add("InputFocusColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#1f1f1f")))
+        $window.Resources.Add("ScrollBarThumbColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#3d3d3d")))
+        $window.Resources.Add("ScrollBarThumbHoverColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#4b4b4b")))
+        $window.Resources.Add("AppIdColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#afafaf")))
+        $window.Resources.Add("SearchHighlightColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#4A4A2A")))
+        $window.Resources.Add("SearchHighlightActiveColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#8A7000")))
+        $window.Resources.Add("TableHeaderColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#333333")))
+    }
+    else {
+        $window.Resources.Add("BgColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#f3f3f3")))
+        $window.Resources.Add("FgColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#000000")))
+        $window.Resources.Add("CardBgColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#fbfbfb")))
+        $window.Resources.Add("BorderColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#ededed")))
+        $window.Resources.Add("ButtonBorderColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#d3d3d3")))
+        $window.Resources.Add("CheckBoxBgColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#f5f5f5")))
+        $window.Resources.Add("CheckBoxBorderColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#898989")))
+        $window.Resources.Add("CheckBoxHoverColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#ececec")))
+        $window.Resources.Add("ComboBgColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#FFFFFF")))
+        $window.Resources.Add("ComboHoverColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#f8f8f8")))
+        $window.Resources.Add("ComboItemBgColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#f9f9f9")))
+        $window.Resources.Add("ComboItemHoverColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#f0f0f0")))
+        $window.Resources.Add("ComboItemSelectedColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#f3f3f3")))
+        $window.Resources.Add("AccentColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#ffae00")))
+        $window.Resources.Add("ButtonDisabled", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#bfbfbf")))
+        $window.Resources.Add("ButtonTextDisabled", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#ffffff")))
+        $window.Resources.Add("SecondaryButtonBg", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#fbfbfb")))
+        $window.Resources.Add("SecondaryButtonHover", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#f6f6f6")))
+        $window.Resources.Add("SecondaryButtonPressed", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#f0f0f0")))
+        $window.Resources.Add("SecondaryButtonDisabled", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#f7f7f7")))
+        $window.Resources.Add("SecondaryButtonTextDisabled", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#b7b7b7")))
+        $window.Resources.Add("InputFocusColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#fbfbfb")))
+        $window.Resources.Add("ScrollBarThumbColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#b9b9b9")))
+        $window.Resources.Add("ScrollBarThumbHoverColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#8b8b8b")))
+        $window.Resources.Add("AppIdColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#666666")))
+        $window.Resources.Add("SearchHighlightColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#FFF4CE")))
+        $window.Resources.Add("SearchHighlightActiveColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#FFD966")))
+        $window.Resources.Add("TableHeaderColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#ffffff")))
+    }
+
+    $window.Resources.Add("ButtonBg", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#0067c0")))
+    $window.Resources.Add("ButtonHover", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#1E88E5")))
+    $window.Resources.Add("ButtonPressed", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#3284cc")))
+    $window.Resources.Add("CloseHover", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#c42b1c")))
+    $window.Resources.Add("InformationIconColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#0078D4")))
+    $window.Resources.Add("WarningIconColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#FFB900")))
+    $window.Resources.Add("ErrorIconColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#E81123")))
+    $window.Resources.Add("QuestionIconColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#0078D4")))
+
+    # Load and merge shared styles
+    if ($script:SharedStylesSchema -and (Test-Path $script:SharedStylesSchema)) {
+        $sharedXaml = Get-Content -Path $script:SharedStylesSchema -Raw
+        $sharedReader = [System.Xml.XmlReader]::Create([System.IO.StringReader]::new($sharedXaml))
+        try {
+            $sharedDict = [System.Windows.Markup.XamlReader]::Load($sharedReader)
+            $window.Resources.MergedDictionaries.Add($sharedDict)
+        }
+        finally {
+            $sharedReader.Close()
+        }
+    }
+}

Scripts/GUI/Show-AboutDialog.ps1

@@ -0,0 +1,95 @@
+function Show-AboutDialog {
+    param (
+        [Parameter(Mandatory=$false)]
+        [System.Windows.Window]$Owner = $null
+    )
+    
+    Add-Type -AssemblyName PresentationFramework,PresentationCore,WindowsBase | Out-Null
+    
+    $usesDarkMode = GetSystemUsesDarkMode
+    
+    # Determine owner window
+    $ownerWindow = if ($Owner) { $Owner } else { $script:GuiWindow }
+    
+    # Show overlay if owner window exists
+    $overlay = $null
+    if ($ownerWindow) {
+        try {
+            $overlay = $ownerWindow.FindName('ModalOverlay')
+            if ($overlay) {
+                $ownerWindow.Dispatcher.Invoke([action]{ $overlay.Visibility = 'Visible' })
+            }
+        }
+        catch { }
+    }
+    
+    # Load XAML from file
+    $xaml = Get-Content -Path $script:AboutWindowSchema -Raw
+    $reader = [System.Xml.XmlReader]::Create([System.IO.StringReader]::new($xaml))
+    try {
+        $aboutWindow = [System.Windows.Markup.XamlReader]::Load($reader)
+    }
+    finally {
+        $reader.Close()
+    }
+    
+    # Set owner to owner window if it exists
+    if ($ownerWindow) {
+        try {
+            $aboutWindow.Owner = $ownerWindow
+        }
+        catch { }
+    }
+    
+    # Apply theme resources
+    SetWindowThemeResources -window $aboutWindow -usesDarkMode $usesDarkMode
+    
+    # Get UI elements
+    $titleBar = $aboutWindow.FindName('TitleBar')
+    $versionText = $aboutWindow.FindName('VersionText')
+    $projectLink = $aboutWindow.FindName('ProjectLink')
+    $kofiLink = $aboutWindow.FindName('KofiLink')
+    $closeButton = $aboutWindow.FindName('CloseButton')
+    
+    # Set version
+    $versionText.Text = $script:Version
+    
+    # Title bar drag to move window
+    $titleBar.Add_MouseLeftButtonDown({
+        $aboutWindow.DragMove()
+    })
+    
+    # Project link click handler
+    $projectLink.Add_MouseLeftButtonDown({
+        Start-Process "https://github.com/Raphire/Win11Debloat"
+    })
+    
+    # Ko-fi link click handler
+    $kofiLink.Add_MouseLeftButtonDown({
+        Start-Process "https://ko-fi.com/raphire"
+    })
+    
+    # Close button handler
+    $closeButton.Add_Click({
+        $aboutWindow.Close()
+    })
+    
+    # Handle Escape key to close
+    $aboutWindow.Add_KeyDown({
+        param($sender, $e)
+        if ($e.Key -eq 'Escape') {
+            $aboutWindow.Close()
+        }
+    })
+    
+    # Show dialog
+    $aboutWindow.ShowDialog() | Out-Null
+    
+    # Hide overlay after dialog closes
+    if ($overlay) {
+        try {
+            $ownerWindow.Dispatcher.Invoke([action]{ $overlay.Visibility = 'Collapsed' })
+        }
+        catch { }
+    }
+}

Scripts/GUI/Show-AppSelectionWindow.ps1

@@ -0,0 +1,161 @@
+# Shows application selection window that allows the user to select what apps they want to remove or keep
+function Show-AppSelectionWindow {
+    Add-Type -AssemblyName PresentationFramework,PresentationCore,WindowsBase | Out-Null
+
+    $usesDarkMode = GetSystemUsesDarkMode
+    
+    # Show overlay if main window exists
+    $overlay = $null
+    if ($script:GuiWindow) {
+        try {
+            $overlay = $script:GuiWindow.FindName('ModalOverlay')
+            if ($overlay) {
+                $script:GuiWindow.Dispatcher.Invoke([action]{ $overlay.Visibility = 'Visible' })
+            }
+        }
+        catch { }
+    }
+
+    # Load XAML from file
+    $xaml = Get-Content -Path $script:AppSelectionSchema -Raw
+    $reader = [System.Xml.XmlReader]::Create([System.IO.StringReader]::new($xaml))
+    try {
+        $window = [System.Windows.Markup.XamlReader]::Load($reader)
+    }
+    finally {
+        $reader.Close()
+    }
+    
+    # Set owner to main window if it exists
+    if ($script:GuiWindow) {
+        try {
+            $window.Owner = $script:GuiWindow
+        }
+        catch { }
+    }
+
+    SetWindowThemeResources -window $window -usesDarkMode $usesDarkMode
+
+    $appsPanel = $window.FindName('AppsPanel')
+    $checkAllBox = $window.FindName('CheckAllBox')
+    $onlyInstalledBox = $window.FindName('OnlyInstalledBox')
+    $confirmBtn = $window.FindName('ConfirmBtn')
+    $loadingIndicator = $window.FindName('LoadingAppsIndicator')
+    $titleBar = $window.FindName('TitleBar')
+    
+    # Track the last selected checkbox for shift-click range selection
+    $script:AppSelectionWindowLastSelectedCheckbox = $null
+
+    # Loads apps into the apps UI
+    function LoadApps {
+        # Show loading indicator
+        $loadingIndicator.Visibility = 'Visible'
+        $window.Dispatcher.Invoke([System.Windows.Threading.DispatcherPriority]::Background, [action]{})
+
+        $appsPanel.Children.Clear()
+        $listOfApps = ""
+
+        if ($onlyInstalledBox.IsChecked -and ($script:WingetInstalled -eq $true)) {
+            # Attempt to get a list of installed apps via WinGet, times out after 10 seconds
+            $listOfApps = GetInstalledAppsViaWinget -TimeOut 10
+            if (-not $listOfApps) {
+                # Show error that the script was unable to get list of apps from WinGet
+                Show-MessageBox -Message 'Unable to load list of installed apps via WinGet.' -Title 'Error' -Button 'OK' -Icon 'Error' -Owner $window | Out-Null
+                $onlyInstalledBox.IsChecked = $false
+            }
+        }
+
+        $appsToAdd = LoadAppsDetailsFromJson -OnlyInstalled:$onlyInstalledBox.IsChecked -InstalledList $listOfApps -InitialCheckedFromJson:$true
+
+        # Reset the last selected checkbox when loading a new list
+        $script:AppSelectionWindowLastSelectedCheckbox = $null
+
+        # Sort apps alphabetically and add to panel
+        $appsToAdd | Sort-Object -Property DisplayName | ForEach-Object {
+            $checkbox = New-Object System.Windows.Controls.CheckBox
+            $checkbox.Content = $_.DisplayName
+            $checkbox.SetValue([System.Windows.Automation.AutomationProperties]::NameProperty, $_.DisplayName)
+            $checkbox.Tag = $_.AppId
+            $checkbox.IsChecked = $_.IsChecked
+            $checkbox.ToolTip = $_.Description
+            $checkbox.Style = $window.Resources["AppsPanelCheckBoxStyle"]
+            
+            # Attach shift-click behavior for range selection
+            AttachShiftClickBehavior -checkbox $checkbox -appsPanel $appsPanel -lastSelectedCheckboxRef ([ref]$script:AppSelectionWindowLastSelectedCheckbox)
+            
+            $appsPanel.Children.Add($checkbox) | Out-Null
+        }
+
+        # Hide loading indicator
+        $loadingIndicator.Visibility = 'Collapsed'
+    }
+
+    # Event handlers
+    $titleBar.Add_MouseLeftButtonDown({
+        $window.DragMove()
+    })
+
+    $checkAllBox.Add_Checked({
+        foreach ($child in $appsPanel.Children) {
+            if ($child -is [System.Windows.Controls.CheckBox]) {
+                $child.IsChecked = $true
+            }
+        }
+    })
+
+    $checkAllBox.Add_Unchecked({
+        foreach ($child in $appsPanel.Children) {
+            if ($child -is [System.Windows.Controls.CheckBox]) {
+                $child.IsChecked = $false
+            }
+        }
+    })
+
+    $onlyInstalledBox.Add_Checked({ LoadApps })
+    $onlyInstalledBox.Add_Unchecked({ LoadApps })
+
+    $confirmBtn.Add_Click({
+        $selectedApps = @()
+        foreach ($child in $appsPanel.Children) {
+            if ($child -is [System.Windows.Controls.CheckBox] -and $child.IsChecked) {
+                $selectedApps += $child.Tag
+            }
+        }
+
+        # Close form without saving if no apps were selected
+        if ($selectedApps.Count -eq 0) {
+            $window.Close()
+            return
+        }
+
+        if ($selectedApps -contains "Microsoft.WindowsStore" -and -not $Silent) {
+            $result = Show-MessageBox -Message 'Are you sure you wish to uninstall the Microsoft Store? This app cannot easily be reinstalled.' -Title 'Are you sure?' -Button 'YesNo' -Icon 'Warning' -Owner $window
+
+            if ($result -eq 'No') {
+                return
+            }
+        }
+
+        SaveCustomAppsListToFile -appsList $selectedApps
+
+        $window.DialogResult = $true
+    })
+
+    # Load apps after window is shown (allows UI to render first)
+    $window.Add_ContentRendered({ 
+        $window.Dispatcher.Invoke([System.Windows.Threading.DispatcherPriority]::Background, [action]{ LoadApps })
+    })
+
+    # Show the window and return dialog result
+    $result = $window.ShowDialog()
+    
+    # Hide overlay after dialog closes
+    if ($overlay) {
+        try {
+            $script:GuiWindow.Dispatcher.Invoke([action]{ $overlay.Visibility = 'Collapsed' })
+        }
+        catch { }
+    }
+    
+    return $result
+}

Scripts/GUI/Show-ApplyModal.ps1

@@ -0,0 +1,254 @@
+function Show-ApplyModal {
+    param (
+        [Parameter(Mandatory=$false)]
+        [System.Windows.Window]$Owner = $null,
+        [Parameter(Mandatory=$false)]
+        [bool]$RestartExplorer = $false
+    )
+    
+    Add-Type -AssemblyName PresentationFramework,PresentationCore,WindowsBase | Out-Null
+
+    # P/Invoke helpers for forcing focus back after Explorer restart
+    if (-not ([System.Management.Automation.PSTypeName]'Win11Debloat.FocusHelper').Type) {
+        Add-Type -Namespace Win11Debloat -Name FocusHelper -MemberDefinition @'
+            [DllImport("user32.dll")] public static extern bool SetForegroundWindow(IntPtr hWnd);
+            [DllImport("user32.dll")] public static extern IntPtr GetForegroundWindow();
+            [DllImport("user32.dll")] public static extern uint GetWindowThreadProcessId(IntPtr hWnd, IntPtr lpdwProcessId);
+            [DllImport("user32.dll")] public static extern bool AttachThreadInput(uint idAttach, uint idAttachTo, bool fAttach);
+            [DllImport("kernel32.dll")] public static extern uint GetCurrentThreadId();
+
+            public static void ForceActivate(IntPtr hwnd) {
+                IntPtr fg = GetForegroundWindow();
+                uint fgThread = GetWindowThreadProcessId(fg, IntPtr.Zero);
+                uint myThread = GetCurrentThreadId();
+                if (fgThread != myThread) AttachThreadInput(myThread, fgThread, true);
+                SetForegroundWindow(hwnd);
+                if (fgThread != myThread) AttachThreadInput(myThread, fgThread, false);
+            }
+'@
+    }
+    
+    $usesDarkMode = GetSystemUsesDarkMode
+    
+    # Determine owner window
+    $ownerWindow = if ($Owner) { $Owner } else { $script:GuiWindow }
+    
+    # Show overlay if owner window exists
+    $overlay = $null
+    if ($ownerWindow) {
+        try {
+            $overlay = $ownerWindow.FindName('ModalOverlay')
+            if ($overlay) {
+                $ownerWindow.Dispatcher.Invoke([action]{ $overlay.Visibility = 'Visible' })
+            }
+        }
+        catch { }
+    }
+    
+    # Load XAML from file
+    $xaml = Get-Content -Path $script:ApplyChangesWindowSchema -Raw
+    $reader = [System.Xml.XmlReader]::Create([System.IO.StringReader]::new($xaml))
+    try {
+        $applyWindow = [System.Windows.Markup.XamlReader]::Load($reader)
+    }
+    finally {
+        $reader.Close()
+    }
+    
+    # Set owner to owner window if it exists
+    if ($ownerWindow) {
+        try {
+            $applyWindow.Owner = $ownerWindow
+        }
+        catch { }
+    }
+    
+    # Apply theme resources
+    SetWindowThemeResources -window $applyWindow -usesDarkMode $usesDarkMode
+    
+    # Get UI elements
+    $script:ApplyInProgressPanel = $applyWindow.FindName('ApplyInProgressPanel')
+    $script:ApplyCompletionPanel = $applyWindow.FindName('ApplyCompletionPanel')
+    $script:ApplyStepNameEl = $applyWindow.FindName('ApplyStepName')
+    $script:ApplyStepCounterEl = $applyWindow.FindName('ApplyStepCounter')
+    $script:ApplyProgressBarEl = $applyWindow.FindName('ApplyProgressBar')
+    $script:ApplyCompletionTitleEl = $applyWindow.FindName('ApplyCompletionTitle')
+    $script:ApplyCompletionMessageEl = $applyWindow.FindName('ApplyCompletionMessage')
+    $script:ApplyCompletionIconEl = $applyWindow.FindName('ApplyCompletionIcon')
+    $applyRebootPanel = $applyWindow.FindName('ApplyRebootPanel')
+    $applyRebootList = $applyWindow.FindName('ApplyRebootList')
+    $applyCloseBtn = $applyWindow.FindName('ApplyCloseBtn')
+    $applyKofiBtn = $applyWindow.FindName('ApplyKofiBtn')
+    $applyCancelBtn = $applyWindow.FindName('ApplyCancelBtn')
+    
+    # Initialize in-progress state
+    $script:ApplyInProgressPanel.Visibility = 'Visible'
+    $script:ApplyCompletionPanel.Visibility = 'Collapsed'
+    $script:ApplyStepNameEl.Text = "Preparing..."
+    $script:ApplyStepCounterEl.Text = "Preparing..."
+    $script:ApplyProgressBarEl.Value = 0
+    $script:ApplyModalInErrorState = $false
+    
+    # Set up progress callback for ExecuteAllChanges
+    $script:ApplyProgressCallback = {
+        param($currentStep, $totalSteps, $stepName)
+        $script:ApplyStepNameEl.Text = $stepName
+        $script:ApplyStepCounterEl.Text = "Step $currentStep of $totalSteps"
+        # Store current step/total in Tag properties for sub-step interpolation
+        $script:ApplyStepCounterEl.Tag = $currentStep
+        $script:ApplyProgressBarEl.Tag = $totalSteps
+        # Show progress at the start of each step (empty at step 1, full after last step completes)
+        $pct = if ($totalSteps -gt 0) { [math]::Round((($currentStep - 1) / $totalSteps) * 100) } else { 0 }
+        $script:ApplyProgressBarEl.Value = $pct
+        # Process pending window messages to keep UI responsive
+        DoEvents
+    }
+
+    # Sub-step callback updates step name and interpolates progress bar within the current step
+    $script:ApplySubStepCallback = {
+        param($subStepName, $subIndex, $subCount)
+        $script:ApplyStepNameEl.Text = $subStepName
+        # Interpolate progress bar between previous step and current step
+        $currentStep = [int]($script:ApplyStepCounterEl.Tag)
+        $totalSteps = [int]($script:ApplyProgressBarEl.Tag)
+        if ($totalSteps -gt 0 -and $subCount -gt 0) {
+            $baseProgress = ($currentStep - 1) / $totalSteps
+            $stepFraction = ($subIndex / $subCount) / $totalSteps
+            $script:ApplyProgressBarEl.Value = [math]::Round(($baseProgress + $stepFraction) * 100)
+        }
+        DoEvents
+    }
+    
+    # Run changes in background to keep UI responsive
+    $applyWindow.Dispatcher.BeginInvoke([System.Windows.Threading.DispatcherPriority]::Background, [action]{
+        try {
+            ExecuteAllChanges
+            
+            # Restart explorer if requested
+            if ($RestartExplorer -and -not $script:CancelRequested) {
+                RestartExplorer
+                
+                # Wait for Explorer to finish relaunching, then reclaim focus.
+                Start-Sleep -Milliseconds 800
+                $applyWindow.Dispatcher.Invoke([action]{
+                    $hwnd = (New-Object System.Windows.Interop.WindowInteropHelper($applyWindow)).Handle
+                    [Win11Debloat.FocusHelper]::ForceActivate($hwnd)
+                })
+            }
+            
+            Write-Host ""
+            if ($script:CancelRequested) {
+                Write-Host "Script execution was cancelled by the user. Some changes may not have been applied."
+            } else {
+                Write-Host "All changes have been applied successfully!"
+            }
+            
+            # Show completion state
+            $script:ApplyProgressBarEl.Value = 100
+            $script:ApplyInProgressPanel.Visibility = 'Collapsed'
+            $script:ApplyCompletionPanel.Visibility = 'Visible'
+            
+            if ($script:CancelRequested) {
+                $script:ApplyCompletionIconEl.Text = [char]0xE7BA
+                $script:ApplyCompletionIconEl.Foreground = [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#e8912d"))
+                $script:ApplyCompletionTitleEl.Text = "Cancelled"
+                $script:ApplyCompletionMessageEl.Text = "Script execution was cancelled by the user."
+            } else {
+                $script:ApplyCompletionTitleEl.Text = "Changes Applied"
+
+                # Show completion message with reboot instructions if any applied features require reboot
+                if ($RestartExplorer) {
+                    $rebootFeatures = @()
+                    foreach ($paramKey in $script:Params.Keys) {
+                        if ($script:Features.ContainsKey($paramKey) -and $script:Features[$paramKey].RequiresReboot -eq $true) {
+                            $feature = $script:Features[$paramKey]
+                            $rebootFeatures += "$($feature.Action) $($feature.Label)"
+                        }
+                    }
+
+                    if ($rebootFeatures.Count -gt 0) {
+                        foreach ($featureName in $rebootFeatures) {
+                            $tb = [System.Windows.Controls.TextBlock]::new()
+                            $tb.Text = "$([char]0x2022) $featureName"
+                            $tb.FontSize = 12
+                            $tb.SetResourceReference([System.Windows.Controls.TextBlock]::ForegroundProperty, 'FgColor')
+                            $tb.Opacity = 0.85
+                            $tb.Margin = [System.Windows.Thickness]::new(0, 2, 0, 0)
+                            $applyRebootList.Children.Add($tb) | Out-Null
+                        }
+                        $applyRebootPanel.Visibility = 'Visible'
+                    }
+                    else {
+                        $script:ApplyCompletionMessageEl.Text = "Your clean system is ready. Thanks for using Win11Debloat!"
+                    }
+                }
+            }
+            $applyWindow.Dispatcher.Invoke([System.Windows.Threading.DispatcherPriority]::Render, [action]{})
+        }
+        catch {
+            Write-Host "Error: $($_.Exception.Message)"
+            $script:ApplyInProgressPanel.Visibility = 'Collapsed'
+            $script:ApplyCompletionPanel.Visibility = 'Visible'
+            $script:ApplyCompletionIconEl.Text = [char]0xEA39
+            $script:ApplyCompletionIconEl.Foreground = [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#c42b1c"))
+            $script:ApplyCompletionTitleEl.Text = "Error"
+            $script:ApplyCompletionMessageEl.Text = "An error occurred while applying changes: $($_.Exception.Message)"
+            
+            # Set error state to change Kofi button to report link
+            $script:ApplyModalInErrorState = $true
+
+            # Update Kofi button to be a report issue button
+            $applyKofiBtn.Content = $null
+            
+            $reportText = [System.Windows.Controls.TextBlock]::new()
+            $reportText.Text = 'Report a bug'
+            $reportText.VerticalAlignment = 'Center'
+            $reportText.FontSize = 14
+            $reportText.Margin = [System.Windows.Thickness]::new(0, 0, 0, 1)
+
+            $applyKofiBtn.Content = $reportText
+            
+            [System.Windows.Automation.AutomationProperties]::SetName($applyKofiBtn, 'Report a bug')
+            
+            $applyWindow.Dispatcher.Invoke([System.Windows.Threading.DispatcherPriority]::Render, [action]{})
+        }
+        finally {
+            $script:ApplyProgressCallback = $null
+            $script:ApplySubStepCallback = $null
+        }
+    })
+    
+    # Button handlers
+    $applyCloseBtn.Add_Click({
+        $applyWindow.Close()
+    })
+
+    $applyKofiBtn.Add_Click({
+        if ($script:ApplyModalInErrorState) {
+            Start-Process "https://github.com/Raphire/Win11Debloat/issues/new"
+        } else {
+            Start-Process "https://ko-fi.com/raphire"
+        }
+    })
+
+    $applyCancelBtn.Add_Click({
+        if ($script:ApplyCompletionPanel.Visibility -eq 'Visible') {
+            # Completion state - just close
+            $applyWindow.Close()
+        } else {
+            # In-progress state - request cancellation
+            $script:CancelRequested = $true
+        }
+    })
+    
+    # Show dialog
+    $applyWindow.ShowDialog() | Out-Null
+    
+    # Hide overlay after dialog closes
+    if ($overlay) {
+        try {
+            $ownerWindow.Dispatcher.Invoke([action]{ $overlay.Visibility = 'Collapsed' })
+        }
+        catch { }
+    }
+}

Scripts/GUI/Show-MessageBox.ps1

@@ -0,0 +1,166 @@
+# Shows a Windows 11 styled custom message box
+function Show-MessageBox {
+    param (
+        [Parameter(Mandatory=$true)]
+        [string]$Message,
+        
+        [Parameter(Mandatory=$false)]
+        [string]$Title = "Win11Debloat",
+        
+        [Parameter(Mandatory=$false)]
+        [ValidateSet('OK', 'OKCancel', 'YesNo')]
+        [string]$Button = 'OK',
+        
+        [Parameter(Mandatory=$false)]
+        [ValidateSet('None', 'Information', 'Warning', 'Error', 'Question')]
+        [string]$Icon = 'None',
+        
+        [Parameter(Mandatory=$false)]
+        [System.Windows.Window]$Owner = $null,
+        
+        [Parameter(Mandatory=$false)]
+        [int]$Width = 0
+    )
+    
+    Add-Type -AssemblyName PresentationFramework,PresentationCore,WindowsBase | Out-Null
+    
+    $usesDarkMode = GetSystemUsesDarkMode
+    
+    # Determine owner window - use provided Owner, or fall back to main GUI window
+    $ownerWindow = if ($Owner) { $Owner } else { $script:GuiWindow }
+    
+    # Show overlay if owner window exists
+    $overlay = $null
+    $overlayWasAlreadyVisible = $false
+    if ($ownerWindow) {
+        try {
+            $overlay = $ownerWindow.FindName('ModalOverlay')
+            if ($overlay) {
+                $overlayWasAlreadyVisible = ($overlay.Visibility -eq 'Visible')
+                if (-not $overlayWasAlreadyVisible) {
+                    $ownerWindow.Dispatcher.Invoke([action]{ $overlay.Visibility = 'Visible' })
+                }
+            }
+        }
+        catch { }
+    }
+    
+    # Load XAML from file
+    $xaml = Get-Content -Path $script:MessageBoxSchema -Raw
+    $reader = [System.Xml.XmlReader]::Create([System.IO.StringReader]::new($xaml))
+    try {
+        $msgWindow = [System.Windows.Markup.XamlReader]::Load($reader)
+    }
+    finally {
+        $reader.Close()
+    }
+    
+    # Set owner to owner window if it exists
+    if ($ownerWindow) {
+        try {
+            $msgWindow.Owner = $ownerWindow
+        }
+        catch { }
+    }
+    
+    # Apply custom width if specified
+    if ($Width -gt 0) {
+        $msgWindow.Width = $Width
+    }
+    
+    # Apply theme resources
+    SetWindowThemeResources -window $msgWindow -usesDarkMode $usesDarkMode
+    
+    # Get UI elements
+    $titleText = $msgWindow.FindName('TitleText')
+    $messageText = $msgWindow.FindName('MessageText')
+    $iconText = $msgWindow.FindName('IconText')
+    $button1 = $msgWindow.FindName('Button1')
+    $button2 = $msgWindow.FindName('Button2')
+    $titleBar = $msgWindow.FindName('TitleBar')
+    
+    # Set title and message
+    $titleText.Text = $Title
+    $messageText.Text = $Message
+    
+    # Configure icon
+    switch ($Icon) {
+        'Information' { 
+            $iconText.Text = [char]0xE946
+            $iconText.Foreground = $msgWindow.FindResource('InformationIconColor')
+            $iconText.Visibility = 'Visible'
+        }
+        'Warning' { 
+            $iconText.Text = [char]0xE7BA
+            $iconText.Foreground = $msgWindow.FindResource('WarningIconColor')
+            $iconText.Visibility = 'Visible'
+        }
+        'Error' { 
+            $iconText.Text = [char]0xEA39
+            $iconText.Foreground = $msgWindow.FindResource('ErrorIconColor')
+            $iconText.Visibility = 'Visible'
+        }
+        'Question' { 
+            $iconText.Text = [char]0xE897
+            $iconText.Foreground = $msgWindow.FindResource('QuestionIconColor')
+            $iconText.Visibility = 'Visible'
+        }
+        default {
+            $iconText.Visibility = 'Collapsed'
+        }
+    }
+    
+    # Configure buttons - store result in window's Tag property
+    switch ($Button) {
+        'OK' {
+            $button1.Content = 'OK'
+            $button1.Add_Click({ $msgWindow.Tag = 'OK'; $msgWindow.Close() })
+            $button2.Visibility = 'Collapsed'
+        }
+        'OKCancel' {
+            $button1.Content = 'OK'
+            $button2.Content = 'Cancel'
+            $button1.Add_Click({ $msgWindow.Tag = 'OK'; $msgWindow.Close() })
+            $button2.Add_Click({ $msgWindow.Tag = 'Cancel'; $msgWindow.Close() })
+            $button2.Visibility = 'Visible'
+        }
+        'YesNo' {
+            $button1.Content = 'Yes'
+            $button2.Content = 'No'
+            $button1.Add_Click({ $msgWindow.Tag = 'Yes'; $msgWindow.Close() })
+            $button2.Add_Click({ $msgWindow.Tag = 'No'; $msgWindow.Close() })
+            $button2.Visibility = 'Visible'
+        }
+    }
+    
+    # Title bar drag to move window
+    $titleBar.Add_MouseLeftButtonDown({
+        $msgWindow.DragMove()
+    })
+    
+    # Handle Escape key to close
+    $msgWindow.Add_KeyDown({
+        param($sender, $e)
+        if ($e.Key -eq 'Escape') {
+            if ($Button -eq 'OK') {
+                $msgWindow.Tag = 'OK'
+            } else {
+                $msgWindow.Tag = 'Cancel'
+            }
+            $msgWindow.Close()
+        }
+    })
+    
+    # Show dialog and return result from Tag
+    $msgWindow.ShowDialog() | Out-Null
+    
+    # Hide overlay after dialog closes (only if this dialog was the one that showed it)
+    if ($overlay -and -not $overlayWasAlreadyVisible) {
+        try {
+            $ownerWindow.Dispatcher.Invoke([action]{ $overlay.Visibility = 'Collapsed' })
+        }
+        catch { }
+    }
+    
+    return $msgWindow.Tag
+}

Scripts/Get.ps1

@@ -22,17 +22,24 @@ param (
     [switch]$ForceRemoveEdge,
     [switch]$DisableDVR,
     [switch]$DisableGameBarIntegration,
+    [switch]$EnableWindowsSandbox,
+    [switch]$EnableWindowsSubsystemForLinux,
     [switch]$DisableTelemetry,
+    [switch]$DisableSearchHistory,
     [switch]$DisableFastStartup,
     [switch]$DisableBitlockerAutoEncryption,
     [switch]$DisableModernStandbyNetworking,
+    [switch]$DisableStorageSense,
     [switch]$DisableUpdateASAP,
     [switch]$PreventUpdateAutoReboot,
     [switch]$DisableDeliveryOptimization,
     [switch]$DisableBing,
+    [switch]$DisableStoreSearchSuggestions,
     [switch]$DisableDesktopSpotlight,
     [switch]$DisableLockscreenTips,
     [switch]$DisableSuggestions,
+    [switch]$DisableLocationServices,
+    [switch]$DisableFindMyDevice,
     [switch]$DisableEdgeAds,
     [switch]$DisableBraveBloat,
     [switch]$DisableSettings365Ads,
@@ -50,13 +57,16 @@ param (
     [switch]$HideSearchTb, [switch]$ShowSearchIconTb, [switch]$ShowSearchLabelTb, [switch]$ShowSearchBoxTb,
     [switch]$HideTaskview,
     [switch]$DisableStartRecommended,
+    [switch]$DisableStartAllApps,
     [switch]$DisableStartPhoneLink,
     [switch]$DisableCopilot,
     [switch]$DisableRecall,
     [switch]$DisableClickToDo,
+    [switch]$DisableAISvcAutoStart,
     [switch]$DisablePaintAI,
     [switch]$DisableNotepadAI,
     [switch]$DisableEdgeAI,
+    [switch]$DisableSearchHighlights,
     [switch]$DisableWidgets,
     [switch]$HideChat,
     [switch]$EnableEndTask,
@@ -117,11 +127,29 @@ catch {
     Exit
 }
 
-# Remove old script folder if it exists, except for CustomAppsList and LastUsedSettings.json files
+Write-Output ""
+Write-Output "> Cleaning up old Win11Debloat folder..."
+
+# Remove old script folder if it exists, but keep config and log files
 if (Test-Path "$env:TEMP/Win11Debloat") {
-    Write-Output ""
-    Write-Output "> Cleaning up old Win11Debloat folder..."
-    Get-ChildItem -Path "$env:TEMP/Win11Debloat" -Exclude CustomAppsList,LastUsedSettings.json,Win11Debloat.log | Remove-Item -Recurse -Force
+    Get-ChildItem -Path "$env:TEMP/Win11Debloat" -Exclude CustomAppsList,LastUsedSettings.json,Win11Debloat.log,Config,Logs | Remove-Item -Recurse -Force
+}
+
+$configDir = "$env:TEMP/Win11Debloat/Config"
+$backupDir = "$env:TEMP/Win11Debloat/ConfigOld"
+
+# Temporarily move existing config files if they exist to prevent them from being overwritten by the new script files, will be moved back after the new script is unpacked
+if (Test-Path "$configDir") {
+    New-Item -ItemType Directory -Path "$backupDir" -Force | Out-Null
+
+    $filesToKeep = @(
+        'CustomAppsList',
+        'LastUsedSettings.json'
+    )
+
+    Get-ChildItem -Path "$configDir" -Recurse | Where-Object { $_.Name -in $filesToKeep } | Move-Item -Destination "$backupDir"
+
+    Remove-Item "$configDir" -Recurse -Force
 }
 
 Write-Output ""
@@ -136,6 +164,16 @@ Remove-Item "$env:TEMP/win11debloat.zip"
 # Move files
 Get-ChildItem -Path "$env:TEMP/Win11Debloat/Raphire-Win11Debloat-*" -Recurse | Move-Item -Destination "$env:TEMP/Win11Debloat"
 
+# Add existing config files back to Config folder
+if (Test-Path "$backupDir") {
+    if (-not (Test-Path "$configDir")) {
+        New-Item -ItemType Directory -Path "$configDir" -Force | Out-Null
+    }
+
+    Get-ChildItem -Path "$backupDir" -Recurse | Move-Item -Destination "$configDir"
+    Remove-Item "$backupDir" -Recurse -Force
+}
+
 # Make list of arguments to pass on to the script
 $arguments = $($PSBoundParameters.GetEnumerator() | ForEach-Object {
     if ($_.Value -eq $true) {
@@ -157,6 +195,12 @@ else {
     $windowStyle = "Normal"
 }
 
+# Remove Powershell 7 modules from path to prevent module loading issues in the script
+if ($PSVersionTable.PSVersion.Major -ge 7) {
+    $NewPSModulePath = $env:PSModulePath -split ';' | Where-Object -FilterScript { $_ -like '*WindowsPowerShell*' }
+    $env:PSModulePath = $NewPSModulePath -join ';'
+}
+
 # Run Win11Debloat script with the provided arguments
 $debloatProcess = Start-Process powershell.exe -WindowStyle $windowStyle -PassThru -ArgumentList "-executionpolicy bypass -File $env:TEMP\Win11Debloat\Win11Debloat.ps1 $arguments" -Verb RunAs
 
@@ -171,7 +215,7 @@ if (Test-Path "$env:TEMP/Win11Debloat") {
     Write-Output "> Cleaning up..."
 
     # Cleanup, remove Win11Debloat directory
-    Get-ChildItem -Path "$env:TEMP/Win11Debloat" -Exclude CustomAppsList,LastUsedSettings.json,Win11Debloat.log | Remove-Item -Recurse -Force
+    Get-ChildItem -Path "$env:TEMP/Win11Debloat" -Exclude CustomAppsList,LastUsedSettings.json,Win11Debloat.log,Config,Logs | Remove-Item -Recurse -Force
 }
 
 Write-Output ""