Bump version

- 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. Avoid using policies where possible.
+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

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

Config/Features.json

@@ -10,7 +10,7 @@
       "Icon": ""
     },
     {
-      "Name": "Start Menu",
+      "Name": "Start Menu & Search",
       "Icon": ""
     },
     {
@@ -166,10 +166,10 @@
       "GroupId": "ClearStart",
       "Label": "Remove pinned apps from the start menu",
       "ToolTip": "This setting allows you to quickly remove all pinned apps from the start menu.",
-      "Category": "Start Menu",
+      "Category": "Start Menu & Search",
       "Values": [
         {
-          "Label": "Remove for the current user",
+          "Label": "Remove for the selected user",
           "FeatureIds": [
             "ClearStart"
           ]
@@ -352,7 +352,7 @@
       "Category": "Privacy & Suggested Content",
       "Action": "Disable",
       "RegistryKey": "Disable_Telemetry.reg",
-      "ApplyText": "> Disabling telemetry, diagnostic data, activity history, app-launch tracking and targeted ads...",
+      "ApplyText": "Disabling telemetry, diagnostic data, activity history, app-launch tracking and targeted ads...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Telemetry.reg",
       "MinVersion": null,
@@ -361,11 +361,11 @@
     {
       "FeatureId": "DisableSuggestions",
       "Label": "tips, tricks & suggested content throughout Windows",
-      "ToolTip": "This setting removes many annoying distractions from Windows.",
+      "ToolTip": "This setting removes many annoying distractions from Windows. This includes things like notifications, reminders and sync provider ads. It also prevents automated installation of suggested apps.",
       "Category": "Privacy & Suggested Content",
       "Action": "Disable",
       "RegistryKey": "Disable_Windows_Suggestions.reg",
-      "ApplyText": "> Disabling tips, tricks, suggestions and ads throughout Windows...",
+      "ApplyText": "Disabling tips, tricks, suggestions and ads throughout Windows...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Windows_Suggestions.reg",
       "MinVersion": null,
@@ -374,26 +374,26 @@
     {
       "FeatureId": "DisableLocationServices",
       "Label": "Windows location services & app location access",
-      "ToolTip": "This will turn off Windows Location Services and deny apps access to your location. This feature uses policies, some settings will be locked.",
+      "ToolTip": "This will turn off Windows Location Services and deny apps access to your location. This feature uses policies, which will lock down certain settings.",
       "Category": "Privacy & Suggested Content",
       "Action": "Disable",
       "RegistryKey": "Disable_Location_Services.reg",
-      "ApplyText": "> Disabling Windows location services and app location access...",
+      "ApplyText": "Disabling Windows location services and app location access...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Location_Services.reg",
       "MinVersion": null,
       "MaxVersion": null
     },
     {
-      "FeatureId": "DisableSearchHistory",
-      "Label": "local Windows Search history",
-      "ToolTip": "This setting disables local search history in Windows Search. This does not affect web search history or the search history saved in Microsoft Edge.",
+      "FeatureId": "DisableFindMyDevice",
+      "Label": "Find My Device location tracking",
+      "ToolTip": "This will turn off the 'Find My Device' feature, which periodically sends your device's location to Microsoft. This feature uses policies, which will lock down certain settings.",
       "Category": "Privacy & Suggested Content",
       "Action": "Disable",
-      "RegistryKey": "Disable_Search_History.reg",
-      "ApplyText": "> Disabling search history...",
+      "RegistryKey": "Disable_Find_My_Device.reg",
+      "ApplyText": "> Disabling Find My Device location tracking...",
       "UndoAction": "Enable",
-      "RegistryUndoKey": "Enable_Search_History.reg",
+      "RegistryUndoKey": "Enable_Find_My_Device.reg",
       "MinVersion": null,
       "MaxVersion": null
     },
@@ -404,7 +404,7 @@
       "Category": "Privacy & Suggested Content",
       "Action": "Disable",
       "RegistryKey": "Disable_Lockscreen_Tips.reg",
-      "ApplyText": "> Disabling tips & tricks on the lock screen...",
+      "ApplyText": "Disabling tips & tricks on the lock screen...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Lockscreen_Tips.reg",
       "MinVersion": null,
@@ -417,7 +417,7 @@
       "Category": "Privacy & Suggested Content",
       "Action": "Disable",
       "RegistryKey": "Disable_Desktop_Spotlight.reg",
-      "ApplyText": "> Disabling the 'Windows Spotlight' desktop background option...",
+      "ApplyText": "Disabling the 'Windows Spotlight' desktop background option...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Desktop_Spotlight.reg",
       "MinVersion": null,
@@ -426,11 +426,11 @@
     {
       "FeatureId": "DisableEdgeAds",
       "Label": "ads, suggestions and newsfeed in Edge",
-      "ToolTip": "This will turn off various distractions from Microsoft Edge such as ads, suggestions and the MSN news feed. This feature uses policies, some settings will be locked.",
+      "ToolTip": "This will turn off various distractions from Microsoft Edge such as ads, suggestions and the MSN news feed. This feature uses policies, which will lock down certain settings.",
       "Category": "Privacy & Suggested Content",
       "Action": "Disable",
       "RegistryKey": "Disable_Edge_Ads_And_Suggestions.reg",
-      "ApplyText": "> Disabling ads, suggestions and the MSN news feed in Microsoft Edge...",
+      "ApplyText": "Disabling ads, suggestions and the MSN news feed in Microsoft Edge...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Edge_Ads_And_Suggestions.reg",
       "MinVersion": null,
@@ -443,7 +443,7 @@
       "Category": "AI",
       "Action": "Disable",
       "RegistryKey": "Disable_Copilot.reg",
-      "ApplyText": "> Disabling Microsoft Copilot...",
+      "ApplyText": "Disabling Microsoft Copilot...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Copilot.reg",
       "MinVersion": 22621,
@@ -452,11 +452,11 @@
     {
       "FeatureId": "DisableRecall",
       "Label": "Windows Recall",
-      "ToolTip": "This will disable Windows Recall, an AI-powered feature that provides quick access to recently used files, apps and activities.",
+      "ToolTip": "This will disable Windows Recall, an AI-powered feature that provides quick access to recently used files, apps and activities. This feature uses policies, which will lock down certain settings.",
       "Category": "AI",
       "Action": "Disable",
       "RegistryKey": "Disable_AI_Recall.reg",
-      "ApplyText": "> Disabling Windows Recall...",
+      "ApplyText": "Disabling Windows Recall...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_AI_Recall.reg",
       "MinVersion": 22621,
@@ -465,24 +465,37 @@
     {
       "FeatureId": "DisableClickToDo",
       "Label": "Click To Do, AI text & image analysis",
-      "ToolTip": "This will disable Click To Do, which provides AI-powered text and image analysis features in Windows.",
+      "ToolTip": "This will disable Click To Do, which provides AI-powered text and image analysis features in Windows. This feature uses policies, which will lock down certain settings.",
       "Category": "AI",
       "Action": "Disable",
       "RegistryKey": "Disable_Click_to_Do.reg",
-      "ApplyText": "> Disabling Click to Do...",
+      "ApplyText": "Disabling Click to Do...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Click_to_Do.reg",
       "MinVersion": 22621,
       "MaxVersion": null
     },
+    {
+      "FeatureId": "DisableAISvcAutoStart",
+      "Label": "AI service from starting automatically",
+      "ToolTip": "This will set the WSAIFabricSvc service to manual startup, preventing the service from starting automatically with Windows.",
+      "Category": "AI",
+      "Action": "Prevent",
+      "RegistryKey": "Disable_AI_Service_Auto_Start.reg",
+      "ApplyText": "> Preventing AI service from starting automatically...",
+      "UndoAction": "Allow",
+      "RegistryUndoKey": "Enable_AI_Service_Auto_Start.reg",
+      "MinVersion": 22621,
+      "MaxVersion": null
+    },
     {
       "FeatureId": "DisableDVR",
       "Label": "Xbox game/screen recording",
-      "ToolTip": "This will disable the Xbox game/screen recording features included with the Game Bar app.",
+      "ToolTip": "This will disable the Xbox game/screen recording features included with the Game Bar app. This feature uses policies, which will lock down certain settings.",
       "Category": "Gaming",
       "Action": "Disable",
       "RegistryKey": "Disable_DVR.reg",
-      "ApplyText": "> Disabling Xbox game/screen recording...",
+      "ApplyText": "Disabling Xbox game/screen recording...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_DVR.reg",
       "MinVersion": null,
@@ -495,7 +508,7 @@
       "Category": "Gaming",
       "Action": "Disable",
       "RegistryKey": "Disable_Game_Bar_Integration.reg",
-      "ApplyText": "> Disabling Game Bar integration...",
+      "ApplyText": "Disabling Game Bar integration...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Game_Bar_Integration.reg",
       "MinVersion": null,
@@ -505,7 +518,7 @@
       "FeatureId": "ClearStart",
       "Action": "Clear Start Menu",
       "Label": "Remove all pinned apps from the start menu for this user only",
-      "Category": "Start Menu",
+      "Category": "Start Menu & Search",
       "RegistryKey": null,
       "ApplyText": null,
       "UndoAction": null,
@@ -517,7 +530,7 @@
       "FeatureId": "ClearStartAllUsers",
       "Action": "Clear Start Menu (All Users)",
       "Label": "Remove all pinned apps from the start menu for all existing and new users",
-      "Category": "Start Menu",
+      "Category": "Start Menu & Search",
       "RegistryKey": null,
       "ApplyText": null,
       "UndoAction": null,
@@ -552,42 +565,94 @@
     {
       "FeatureId": "DisableStartRecommended",
       "Label": "recommended section in the start menu",
-      "ToolTip": "This will hide the recommended section in the start menu, which shows recently added apps, recently opened files and app recommendations.",
-      "Category": "Start Menu",
+      "ToolTip": "This will hide the recommended section in the start menu, which shows recently added apps, recently opened files and app recommendations. This feature uses policies, which will lock down certain settings.",
+      "Category": "Start Menu & Search",
       "Action": "Hide",
       "RegistryKey": "Disable_Start_Recommended.reg",
-      "ApplyText": "> Disabling the start menu recommended section...",
+      "ApplyText": "Disabling the start menu recommended section...",
       "UndoAction": "Show",
       "RegistryUndoKey": "Enable_Start_Recommended.reg",
       "MinVersion": 22621,
       "MaxVersion": null
     },
     {
-      "FeatureId": "DisableBing",
-      "Label": "Bing web search & Copilot integration",
-      "ToolTip": "This will turn off Bing web search results and Copilot integration in the Windows search experience.",
-      "Category": "Start Menu",
-      "Action": "Disable",
-      "RegistryKey": "Disable_Bing_Cortana_In_Search.reg",
-      "ApplyText": "> Disabling Bing web search & Copilot integration in Windows search...",
-      "UndoAction": "Enable",
-      "RegistryUndoKey": "Enable_Bing_Cortana_In_Search.reg",
-      "MinVersion": null,
+      "FeatureId": "DisableStartAllApps",
+      "Label": "'All Apps' section in the start menu",
+      "ToolTip": "This will hide the 'All Apps' section in the start menu, which shows all installed apps. WARNING: Hiding this section may make it harder to find installed apps on your system. This feature uses policies, which will lock down certain settings.",
+      "Category": "Start Menu & Search",
+      "Action": "Hide",
+      "RegistryKey": "Disable_Start_All_Apps.reg",
+      "ApplyText": "Disabling the 'All Apps' section in the start menu...",
+      "UndoAction": "Show",
+      "RegistryUndoKey": "Enable_Start_All_Apps.reg",
+      "MinVersion": 26200,
       "MaxVersion": null
     },
     {
       "FeatureId": "DisableStartPhoneLink",
       "Label": "Phone Link integration in the start menu",
       "ToolTip": "This will remove the Phone Link integration in the start menu when you have a mobile device linked to your PC.",
-      "Category": "Start Menu",
+      "Category": "Start Menu & Search",
       "Action": "Disable",
       "RegistryKey": "Disable_Phone_Link_In_Start.reg",
-      "ApplyText": "> Disabling the Phone Link mobile devices integration in the start menu...",
+      "ApplyText": "Disabling the Phone Link mobile devices integration in the start menu...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Phone_Link_In_Start.reg",
       "MinVersion": 22621,
       "MaxVersion": null
     },
+    {
+      "FeatureId": "DisableBing",
+      "Label": "Bing web search & Copilot integration in search",
+      "ToolTip": "This will turn off Bing web search results and Copilot integration in the Windows search experience. This feature uses policies, which will lock down certain settings.",
+      "Category": "Start Menu & Search",
+      "Action": "Disable",
+      "RegistryKey": "Disable_Bing_Cortana_In_Search.reg",
+      "ApplyText": "Disabling Bing web search & Copilot integration in Windows search...",
+      "UndoAction": "Enable",
+      "RegistryUndoKey": "Enable_Bing_Cortana_In_Search.reg",
+      "MinVersion": null,
+      "MaxVersion": null
+    },
+    {
+       "FeatureId": "DisableStoreSearchSuggestions",
+      "Label": "Microsoft Store app suggestions in search",
+      "ToolTip": "This will disable the Microsoft Store app suggestions in Windows search.",
+      "Category": "Start Menu & Search",
+      "Action": "Disable",
+      "RegistryKey": null,
+      "ApplyText": null,
+      "UndoAction": null,
+      "RegistryUndoKey": null,
+      "MinVersion": 22621,
+      "MaxVersion": null
+    },
+    {
+      "FeatureId": "DisableSearchHighlights",
+      "Label": "Search Highlights in the taskbar search box",
+      "ToolTip": "This will turn off Search Highlights, which shows dynamically curated branded content and trending topics in the Windows search box on the taskbar.",
+      "Category": "Start Menu & Search",
+      "Action": "Disable",
+      "RegistryKey": "Disable_Search_Highlights.reg",
+      "ApplyText": "> Disabling Search Highlights in the Windows search box...",
+      "UndoAction": "Enable",
+      "RegistryUndoKey": "Enable_Search_Highlights.reg",
+      "MinVersion": 22621,
+      "MaxVersion": null
+    },
+    {
+      "FeatureId": "DisableSearchHistory",
+      "Label": "local Windows Search history",
+      "ToolTip": "This setting disables local search history in Windows Search. This does not affect web search history or the search history saved in Microsoft Edge.",
+      "Category": "Start Menu & Search",
+      "Action": "Disable",
+      "RegistryKey": "Disable_Search_History.reg",
+      "ApplyText": "Disabling search history...",
+      "UndoAction": "Enable",
+      "RegistryUndoKey": "Enable_Search_History.reg",
+      "MinVersion": null,
+      "MaxVersion": null
+    },
     {
       "FeatureId": "DisableSettings365Ads",
       "Label": "Microsoft 365 Copilot ads in Settings Home",
@@ -595,7 +660,7 @@
       "Category": "Privacy & Suggested Content",
       "Action": "Hide",
       "RegistryKey": "Disable_Settings_365_Ads.reg",
-      "ApplyText": "> Disabling Microsoft 365 Copilot ads in Settings Home...",
+      "ApplyText": "Disabling Microsoft 365 Copilot ads in Settings Home...",
       "UndoAction": "Show",
       "RegistryUndoKey": "Enable_Settings_365_Ads.reg",
       "MinVersion": null,
@@ -608,7 +673,7 @@
       "Category": "Other",
       "Action": "Hide",
       "RegistryKey": "Disable_Settings_Home.reg",
-      "ApplyText": "> Disabling the Settings Home page...",
+      "ApplyText": "Disabling the Settings Home page...",
       "UndoAction": "Show",
       "RegistryUndoKey": "Enable_Settings_Home.reg",
       "MinVersion": null,
@@ -617,11 +682,11 @@
     {
       "FeatureId": "DisableEdgeAI",
       "Label": "AI features in Microsoft Edge",
-      "ToolTip": "This will turn off AI features in Microsoft Edge, such as the AI-powered sidebar and Copilot features. This feature uses policies, some settings will be locked.",
+      "ToolTip": "This will turn off AI features in Microsoft Edge, such as the AI-powered sidebar and Copilot features. This feature uses policies, which will lock down certain settings.",
       "Category": "AI",
       "Action": "Disable",
       "RegistryKey": "Disable_Edge_AI_Features.reg",
-      "ApplyText": "> Disabling AI features in Microsoft Edge...",
+      "ApplyText": "Disabling AI features in Microsoft Edge...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Edge_AI_Features.reg",
       "MinVersion": 22621,
@@ -630,11 +695,11 @@
     {
       "FeatureId": "DisablePaintAI",
       "Label": "AI features in Paint",
-      "ToolTip": "This will turn off AI features in Paint, such as the AI-powered image generation and editing tools.",
+      "ToolTip": "This will turn off AI features in Paint, such as the AI-powered image generation and editing tools. This feature uses policies, which will lock down certain settings.",
       "Category": "AI",
       "Action": "Disable",
       "RegistryKey": "Disable_Paint_AI_Features.reg",
-      "ApplyText": "> Disabling AI features in Paint...",
+      "ApplyText": "Disabling AI features in Paint...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Paint_AI_Features.reg",
       "MinVersion": 22621,
@@ -643,11 +708,11 @@
     {
       "FeatureId": "DisableNotepadAI",
       "Label": "AI features in Notepad",
-      "ToolTip": "This will turn off AI features in Notepad, such as the AI-powered writing suggestions.",
+      "ToolTip": "This will turn off AI features in Notepad, such as the AI-powered writing suggestions. This feature uses policies, which will lock down certain settings.",
       "Category": "AI",
       "Action": "Disable",
       "RegistryKey": "Disable_Notepad_AI_Features.reg",
-      "ApplyText": "> Disabling AI features in Notepad...",
+      "ApplyText": "Disabling AI features in Notepad...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Notepad_AI_Features.reg",
       "MinVersion": 22621,
@@ -660,7 +725,7 @@
       "Category": "Appearance",
       "Action": "Enable dark",
       "RegistryKey": "Enable_Dark_Mode.reg",
-      "ApplyText": "> Enabling dark mode for system and apps...",
+      "ApplyText": "Enabling dark mode for system and apps...",
       "UndoAction": "Disable light",
       "RegistryUndoKey": "Enable_Light_Mode.reg",
       "MinVersion": null,
@@ -673,7 +738,7 @@
       "Category": "System",
       "Action": "Disable",
       "RegistryKey": "Disable_Share_Drag_Tray.reg",
-      "ApplyText": "> Disabling Drag Tray...",
+      "ApplyText": "Disabling Drag Tray...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Share_Drag_Tray.reg",
       "MinVersion": 26200,
@@ -682,11 +747,11 @@
     {
       "FeatureId": "RevertContextMenu",
       "Label": "context menu style",
-      "ToolTip": "This will restore the classic Windows 10 style context menu instead of the modern Windows 11 style menu.",
+      "ToolTip": "This will restore the classic Windows 10 style context menu, which is normally hidden behind the 'Show more options' entry in the new Windows 11 context menu.",
       "Category": "System",
       "Action": "Use classic Windows 10",
       "RegistryKey": "Disable_Show_More_Options_Context_Menu.reg",
-      "ApplyText": "> Restoring the classic Windows 10 style context menu...",
+      "ApplyText": "Restoring the classic Windows 10 style context menu...",
       "UndoAction": "Use modern Windows 11",
       "RegistryUndoKey": "Enable_W11_Style_Context_Menu.reg",
       "MinVersion": 22000,
@@ -699,9 +764,10 @@
       "Category": "System",
       "Action": "Disable",
       "RegistryKey": "Disable_Enhance_Pointer_Precision.reg",
-      "ApplyText": "> Turning off Enhanced Pointer Precision...",
+      "ApplyText": "Turning off Enhanced Pointer Precision...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Enhance_Pointer_Precision.reg",
+      "RequiresReboot": true,
       "MinVersion": null,
       "MaxVersion": null
     },
@@ -712,9 +778,10 @@
       "Category": "System",
       "Action": "Disable",
       "RegistryKey": "Disable_Sticky_Keys_Shortcut.reg",
-      "ApplyText": "> Disabling the Sticky Keys keyboard shortcut...",
+      "ApplyText": "Disabling the Sticky Keys keyboard shortcut...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Sticky_Keys_Shortcut.reg",
+      "RequiresReboot": true,
       "MinVersion": 26100,
       "MaxVersion": null
     },
@@ -726,7 +793,7 @@
       "Priority": 1,
       "Action": "Disable",
       "RegistryKey": "Disable_Window_Snapping.reg",
-      "ApplyText": "> Disabling window snapping...",
+      "ApplyText": "Disabling window snapping...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Window_Snapping.reg",
       "MinVersion": null,
@@ -740,7 +807,7 @@
       "Priority": 2,
       "Action": "Disable",
       "RegistryKey": "Disable_Snap_Assist.reg",
-      "ApplyText": "> Disabling the Snap Assist suggestions...",
+      "ApplyText": "Disabling the Snap Assist suggestions...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Snap_Assist.reg",
       "MinVersion": 22000,
@@ -754,7 +821,7 @@
       "Priority": 3,
       "Action": "Hide",
       "RegistryKey": "Disable_Snap_Layouts.reg",
-      "ApplyText": "> Hiding snap layouts when dragging windows to top of the screen and on maximize button...",
+      "ApplyText": "Hiding snap layouts when dragging windows to top of the screen and on maximize button...",
       "UndoAction": "Show",
       "RegistryUndoKey": "Enable_Snap_Layouts.reg",
       "MinVersion": 22000,
@@ -766,7 +833,7 @@
       "Category": "Multi-tasking",
       "Action": "Hide",
       "RegistryKey": "Hide_Tabs_In_Alt_Tab.reg",
-      "ApplyText": "> Disable showing tabs from apps when snapping or pressing Alt+Tab...",
+      "ApplyText": "Disable showing tabs from apps when snapping or pressing Alt+Tab...",
       "UndoAction": null,
       "RegistryUndoKey": null,
       "MinVersion": 22000,
@@ -778,7 +845,7 @@
       "Category": "Multi-tasking",
       "Action": "Show 3",
       "RegistryKey": "Show_3_Tabs_In_Alt_Tab.reg",
-      "ApplyText": "> Enable showing 3 tabs from apps when snapping or pressing Alt+Tab...",
+      "ApplyText": "Enable showing 3 tabs from apps when snapping or pressing Alt+Tab...",
       "UndoAction": null,
       "RegistryUndoKey": null,
       "MinVersion": 22000,
@@ -790,7 +857,7 @@
       "Category": "Multi-tasking",
       "Action": "Show 5",
       "RegistryKey": "Show_5_Tabs_In_Alt_Tab.reg",
-      "ApplyText": "> Enable showing 5 tabs from apps when snapping or pressing Alt+Tab...",
+      "ApplyText": "Enable showing 5 tabs from apps when snapping or pressing Alt+Tab...",
       "UndoAction": null,
       "RegistryUndoKey": null,
       "MinVersion": 22000,
@@ -802,7 +869,7 @@
       "Category": "Multi-tasking",
       "Action": "Show 20",
       "RegistryKey": "Show_20_Tabs_In_Alt_Tab.reg",
-      "ApplyText": "> Enable showing 20 tabs from apps when snapping or pressing Alt+Tab...",
+      "ApplyText": "Enable showing 20 tabs from apps when snapping or pressing Alt+Tab...",
       "UndoAction": null,
       "RegistryUndoKey": null,
       "MinVersion": 22000,
@@ -816,7 +883,7 @@
       "Priority": 1,
       "Action": "Left",
       "RegistryKey": "Align_Taskbar_Left.reg",
-      "ApplyText": "> Aligning taskbar buttons to the left...",
+      "ApplyText": "Aligning taskbar buttons to the left...",
       "UndoAction": "Center",
       "RegistryUndoKey": "Align_Taskbar_Center.reg",
       "MinVersion": 22000,
@@ -828,7 +895,7 @@
       "Category": "Taskbar",
       "Action": "Hide Search",
       "RegistryKey": "Hide_Search_Taskbar.reg",
-      "ApplyText": "> Hiding the search icon from the taskbar...",
+      "ApplyText": "Hiding the search icon from the taskbar...",
       "UndoAction": "Show Search Box",
       "RegistryUndoKey": "Show_Search_Box.reg",
       "MinVersion": 22000,
@@ -839,8 +906,8 @@
       "Label": "Show search icon on the taskbar",
       "Category": "Taskbar",
       "Action": "Show Search Icon",
-      "RegistryKey": "Show_Search_Box.reg",
-      "ApplyText": "> Changing taskbar search to icon only...",
+      "RegistryKey": "Show_Search_Icon.reg",
+      "ApplyText": "Changing taskbar search to icon only...",
       "UndoAction": "Show Search Box",
       "RegistryUndoKey": "Show_Search_Box.reg",
       "MinVersion": 22000,
@@ -851,8 +918,8 @@
       "Label": "Show search icon with label on the taskbar",
       "Category": "Taskbar",
       "Action": "Show Search Label",
-      "RegistryKey": "Show_Search_Box.reg",
-      "ApplyText": "> Changing taskbar search to icon with label...",
+      "RegistryKey": "Show_Search_Icon_And_Label.reg",
+      "ApplyText": "Changing taskbar search to icon with label...",
       "UndoAction": "Show Search Box",
       "RegistryUndoKey": "Show_Search_Box.reg",
       "MinVersion": 22000,
@@ -864,7 +931,7 @@
       "Category": "Taskbar",
       "Action": "Show Search Box",
       "RegistryKey": "Show_Search_Box.reg",
-      "ApplyText": "> Changing taskbar search to search box...",
+      "ApplyText": "Changing taskbar search to search box...",
       "UndoAction": null,
       "RegistryUndoKey": null,
       "MinVersion": 22000,
@@ -878,7 +945,7 @@
       "Priority": 3,
       "Action": "Hide",
       "RegistryKey": "Hide_Taskview_Taskbar.reg",
-      "ApplyText": "> Hiding the taskview button from the taskbar...",
+      "ApplyText": "Hiding the taskview button from the taskbar...",
       "UndoAction": "Show",
       "RegistryUndoKey": "Show_Taskview_Taskbar.reg",
       "MinVersion": 22000,
@@ -887,12 +954,12 @@
     {
       "FeatureId": "DisableWidgets",
       "Label": "widgets on the taskbar & lock screen",
-      "ToolTip": "This will disable the widgets features in Windows, including the widgets button on the taskbar and the widgets that can appear on the lock screen. This feature uses policies, some settings will be locked.",
+      "ToolTip": "This will disable the widgets features in Windows, including the widgets button on the taskbar and the widgets that can appear on the lock screen. This feature uses policies, which will lock down certain settings.",
       "Category": "Taskbar",
       "Priority": 4,
       "Action": "Disable",
       "RegistryKey": "Disable_Widgets_Service.reg",
-      "ApplyText": "> Disabling widgets on the taskbar & lock screen...",
+      "ApplyText": "Disabling widgets on the taskbar & lock screen...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Widgets_Service.reg",
       "MinVersion": null,
@@ -906,12 +973,25 @@
       "Priority": 5,
       "Action": "Hide",
       "RegistryKey": "Disable_Chat_Taskbar.reg",
-      "ApplyText": "> Hiding the chat icon from the taskbar...",
+      "ApplyText": "Hiding the chat icon from the taskbar...",
       "UndoAction": "Show",
       "RegistryUndoKey": "Enable_Chat_Taskbar.reg",
       "MinVersion": null,
       "MaxVersion": 22621
     },
+    {
+      "FeatureId": "DisableStorageSense",
+      "Label": "Storage Sense automatic disk cleanup",
+      "ToolTip": "This will disable Storage Sense, which automatically frees up disk space by deleting temporary files, emptying the recycle bin and cleaning up files in the Downloads folder.",
+      "Category": "System",
+      "Action": "Disable",
+      "RegistryKey": "Disable_Storage_Sense.reg",
+      "ApplyText": "Disabling Storage Sense automatic disk cleanup...",
+      "UndoAction": "Enable",
+      "RegistryUndoKey": "Enable_Storage_Sense.reg",
+      "MinVersion": 22000,
+      "MaxVersion": null
+    },
     {
       "FeatureId": "DisableFastStartup",
       "Label": "fast start-up",
@@ -919,7 +999,7 @@
       "Category": "System",
       "Action": "Disable",
       "RegistryKey": "Disable_Fast_Startup.reg",
-      "ApplyText": "> Disabling Fast Start-up...",
+      "ApplyText": "Disabling Fast Start-up...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Fast_Startup.reg",
       "MinVersion": null,
@@ -932,7 +1012,7 @@
       "Category": "System",
       "Action": "Disable",
       "RegistryKey": "Disable_Bitlocker_Auto_Encryption.reg",
-      "ApplyText": "> Disabling BitLocker automatic device encryption...",
+      "ApplyText": "Disabling BitLocker automatic device encryption...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Bitlocker_Auto_Encryption.reg",
       "MinVersion": 22000,
@@ -945,7 +1025,7 @@
       "Category": "System",
       "Action": "Disable",
       "RegistryKey": "Disable_Modern_Standby_Networking.reg",
-      "ApplyText": "> Disabling network connectivity during Modern Standby...",
+      "ApplyText": "Disabling network connectivity during Modern Standby...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Modern_Standby_Networking.reg",
       "MinVersion": 22000,
@@ -959,7 +1039,7 @@
       "Priority": 6,
       "Action": "Show",
       "RegistryKey": "Enable_End_Task.reg",
-      "ApplyText": "> Enabling the 'End Task' option in the taskbar right click menu...",
+      "ApplyText": "Enabling the 'End Task' option in the taskbar right click menu...",
       "UndoAction": "Hide",
       "RegistryUndoKey": "Disable_End_Task.reg",
       "MinVersion": 22631,
@@ -973,7 +1053,7 @@
       "Priority": 7,
       "Action": "Enable",
       "RegistryKey": "Enable_Last_Active_Click.reg",
-      "ApplyText": "> Enabling the 'Last Active Click' behavior in the taskbar app area...",
+      "ApplyText": "Enabling the 'Last Active Click' behavior in the taskbar app area...",
       "UndoAction": "Disable",
       "RegistryUndoKey": "Disable_Last_Active_Click.reg",
       "MinVersion": 22000,
@@ -985,7 +1065,7 @@
       "Category": "Taskbar",
       "Action": "Combine Taskbar Always",
       "RegistryKey": "Combine_Taskbar_Always.reg",
-      "ApplyText": "> Setting the taskbar on the main display to always combine buttons and hide labels...",
+      "ApplyText": "Setting the taskbar on the main display to always combine buttons and hide labels...",
       "UndoAction": null,
       "RegistryUndoKey": null,
       "MinVersion": 22000,
@@ -997,7 +1077,7 @@
       "Category": "Taskbar",
       "Action": "Combine Multi-Monitor Taskbar Always",
       "RegistryKey": "Combine_MMTaskbar_Always.reg",
-      "ApplyText": "> Setting the taskbar on secondary displays to always combine buttons and hide labels...",
+      "ApplyText": "Setting the taskbar on secondary displays to always combine buttons and hide labels...",
       "UndoAction": null,
       "RegistryUndoKey": null,
       "MinVersion": 22000,
@@ -1009,7 +1089,7 @@
       "Category": "Taskbar",
       "Action": "Combine Taskbar When Full",
       "RegistryKey": "Combine_Taskbar_When_Full.reg",
-      "ApplyText": "> Setting the taskbar on the main display to only combine buttons and hide labels when the taskbar is full...",
+      "ApplyText": "Setting the taskbar on the main display to only combine buttons and hide labels when the taskbar is full...",
       "UndoAction": "Combine Taskbar Always",
       "RegistryUndoKey": "Combine_Taskbar_Always.reg",
       "MinVersion": 22000,
@@ -1021,7 +1101,7 @@
       "Category": "Taskbar",
       "Action": "Combine Multi-Monitor Taskbar When Full",
       "RegistryKey": "Combine_MMTaskbar_When_Full.reg",
-      "ApplyText": "> Setting the taskbar on secondary displays to only combine buttons and hide labels when the taskbar is full...",
+      "ApplyText": "Setting the taskbar on secondary displays to only combine buttons and hide labels when the taskbar is full...",
       "UndoAction": "Combine Multi-Monitor Taskbar Always",
       "RegistryUndoKey": "Combine_MMTaskbar_Always.reg",
       "MinVersion": 22000,
@@ -1033,7 +1113,7 @@
       "Category": "Taskbar",
       "Action": "Never Combine Taskbar",
       "RegistryKey": "Combine_Taskbar_Never.reg",
-      "ApplyText": "> Setting the taskbar on the main display to never combine buttons or hide labels...",
+      "ApplyText": "Setting the taskbar on the main display to never combine buttons or hide labels...",
       "UndoAction": "Combine Taskbar Always",
       "RegistryUndoKey": "Combine_Taskbar_Always.reg",
       "MinVersion": 22000,
@@ -1045,7 +1125,7 @@
       "Category": "Taskbar",
       "Action": "Never Combine Multi-Monitor Taskbar",
       "RegistryKey": "Combine_MMTaskbar_Never.reg",
-      "ApplyText": "> Setting the taskbar on secondary displays to never combine buttons or hide labels...",
+      "ApplyText": "Setting the taskbar on secondary displays to never combine buttons or hide labels...",
       "UndoAction": "Combine Multi-Monitor Taskbar Always",
       "RegistryUndoKey": "Combine_MMTaskbar_Always.reg",
       "MinVersion": 22000,
@@ -1057,7 +1137,7 @@
       "Category": "Taskbar",
       "Action": "Show All Taskbar Icons",
       "RegistryKey": "MMTaskbarMode_All.reg",
-      "ApplyText": "> Setting the taskbar to show app icons on all taskbars...",
+      "ApplyText": "Setting the taskbar to show app icons on all taskbars...",
       "UndoAction": null,
       "RegistryUndoKey": null,
       "MinVersion": 22000,
@@ -1069,7 +1149,7 @@
       "Category": "Taskbar",
       "Action": "Show Taskbar Icons Main + Active",
       "RegistryKey": "MMTaskbarMode_Main_Active.reg",
-      "ApplyText": "> Setting the taskbar to show app icons on main taskbar and on taskbar where the windows is open...",
+      "ApplyText": "Setting the taskbar to show app icons on main taskbar and on taskbar where the windows is open...",
       "UndoAction": "Show All Taskbar Icons",
       "RegistryUndoKey": "MMTaskbarMode_All.reg",
       "MinVersion": 22000,
@@ -1081,7 +1161,7 @@
       "Category": "Taskbar",
       "Action": "Show Taskbar Icons Active Only",
       "RegistryKey": "MMTaskbarMode_Active.reg",
-      "ApplyText": "> Setting the taskbar to only show app icons on the taskbar where the window is open...",
+      "ApplyText": "Setting the taskbar to only show app icons on the taskbar where the window is open...",
       "UndoAction": "Show All Taskbar Icons",
       "RegistryUndoKey": "MMTaskbarMode_All.reg",
       "MinVersion": 22000,
@@ -1093,7 +1173,7 @@
       "Category": "File Explorer",
       "Action": "Explorer to Home",
       "RegistryKey": "Launch_File_Explorer_To_Home.reg",
-      "ApplyText": "> Changing the default location that File Explorer opens to, to 'Home'...",
+      "ApplyText": "Changing the default location that File Explorer opens to, to 'Home'...",
       "UndoAction": null,
       "RegistryUndoKey": null,
       "MinVersion": null,
@@ -1105,7 +1185,7 @@
       "Category": "File Explorer",
       "Action": "Explorer to This PC",
       "RegistryKey": "Launch_File_Explorer_To_This_PC.reg",
-      "ApplyText": "> Changing the default location that File Explorer opens to, to 'This PC'...",
+      "ApplyText": "Changing the default location that File Explorer opens to, to 'This PC'...",
       "UndoAction": "Explorer to Home",
       "RegistryUndoKey": "Launch_File_Explorer_To_Home.reg",
       "MinVersion": null,
@@ -1117,7 +1197,7 @@
       "Category": "File Explorer",
       "Action": "Explorer to Downloads",
       "RegistryKey": "Launch_File_Explorer_To_Downloads.reg",
-      "ApplyText": "> Changing the default location that File Explorer opens to, to 'Downloads'...",
+      "ApplyText": "Changing the default location that File Explorer opens to, to 'Downloads'...",
       "UndoAction": "Explorer to Home",
       "RegistryUndoKey": "Launch_File_Explorer_To_Home.reg",
       "MinVersion": null,
@@ -1129,7 +1209,7 @@
       "Category": "File Explorer",
       "Action": "Explorer to OneDrive",
       "RegistryKey": "Launch_File_Explorer_To_OneDrive.reg",
-      "ApplyText": "> Changing the default location that File Explorer opens to, to 'OneDrive'...",
+      "ApplyText": "Changing the default location that File Explorer opens to, to 'OneDrive'...",
       "UndoAction": "Explorer to Home",
       "RegistryUndoKey": "Launch_File_Explorer_To_Home.reg",
       "MinVersion": null,
@@ -1142,7 +1222,7 @@
       "Category": "File Explorer",
       "Action": "Show",
       "RegistryKey": "Show_Extensions_For_Known_File_Types.reg",
-      "ApplyText": "> Enabling file extensions for known file types...",
+      "ApplyText": "Enabling file extensions for known file types...",
       "UndoAction": "Hide",
       "RegistryUndoKey": "Hide_Extensions_For_Known_File_Types.reg",
       "MinVersion": null,
@@ -1155,7 +1235,7 @@
       "Category": "File Explorer",
       "Action": "Show",
       "RegistryKey": "Show_Hidden_Folders.reg",
-      "ApplyText": "> Unhiding hidden files, folders and drives...",
+      "ApplyText": "Unhiding hidden files, folders and drives...",
       "UndoAction": "Hide",
       "RegistryUndoKey": "Hide_Hidden_Folders.reg",
       "MinVersion": null,
@@ -1168,7 +1248,7 @@
       "Category": "File Explorer",
       "Action": "Hide",
       "RegistryKey": "Hide_Home_from_Explorer.reg",
-      "ApplyText": "> Hiding the home section from the File Explorer navigation pane...",
+      "ApplyText": "Hiding the home section from the File Explorer navigation pane...",
       "UndoAction": "Show",
       "RegistryUndoKey": "Show_Home_in_Explorer.reg",
       "MinVersion": 22000,
@@ -1181,7 +1261,7 @@
       "Category": "File Explorer",
       "Action": "Hide",
       "RegistryKey": "Hide_Gallery_from_Explorer.reg",
-      "ApplyText": "> Hiding the gallery section from the File Explorer navigation pane...",
+      "ApplyText": "Hiding the gallery section from the File Explorer navigation pane...",
       "UndoAction": "Show",
       "RegistryUndoKey": "Show_Gallery_in_Explorer.reg",
       "MinVersion": 22000,
@@ -1194,7 +1274,7 @@
       "Category": "File Explorer",
       "Action": "Hide",
       "RegistryKey": "Hide_duplicate_removable_drives_from_navigation_pane_of_File_Explorer.reg",
-      "ApplyText": "> Hiding duplicate removable drive entries from the File Explorer navigation pane...",
+      "ApplyText": "Hiding duplicate removable drive entries from the File Explorer navigation pane...",
       "UndoAction": "Show",
       "RegistryUndoKey": "Show_duplicate_removable_drives_in_navigation_pane_of_File_Explorer.reg",
       "MinVersion": null,
@@ -1207,7 +1287,7 @@
       "Category": "File Explorer",
       "Action": "Add",
       "RegistryKey": "Add_All_Folders_Under_This_PC.reg",
-      "ApplyText": "> Adding all common folders (Desktop, Downloads, etc.) back to 'This PC' in File Explorer...",
+      "ApplyText": "Adding all common folders (Desktop, Downloads, etc.) back to 'This PC' in File Explorer...",
       "UndoAction": "Remove",
       "RegistryUndoKey": "Remove_All_Folders_Under_This_PC.reg",
       "MinVersion": 22000,
@@ -1220,7 +1300,7 @@
       "Category": "Appearance",
       "Action": "Disable",
       "RegistryKey": "Disable_Transparency.reg",
-      "ApplyText": "> Disabling transparency effects...",
+      "ApplyText": "Disabling transparency effects...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Transparency.reg",
       "MinVersion": null,
@@ -1233,9 +1313,10 @@
       "Category": "Appearance",
       "Action": "Disable",
       "RegistryKey": "Disable_Animations.reg",
-      "ApplyText": "> Disabling animations and visual effects...",
+      "ApplyText": "Disabling animations and visual effects...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Animations.reg",
+      "RequiresReboot": true,
       "MinVersion": null,
       "MaxVersion": null
     },
@@ -1246,7 +1327,7 @@
       "Category": "Windows Update",
       "Action": "Prevent getting",
       "RegistryKey": "Disable_Update_ASAP.reg",
-      "ApplyText": "> Preventing Windows from getting updates as soon as they are available...",
+      "ApplyText": "Preventing Windows from getting updates as soon as they are available...",
       "UndoAction": "Get",
       "RegistryUndoKey": "Enable_Update_ASAP.reg",
       "MinVersion": null,
@@ -1259,7 +1340,7 @@
       "Category": "Windows Update",
       "Action": "Prevent",
       "RegistryKey": "Prevent_Auto_Reboot.reg",
-      "ApplyText": "> Preventing automatic restarts after updates while signed in...",
+      "ApplyText": "Preventing automatic restarts after updates while signed in...",
       "UndoAction": "Allow",
       "RegistryUndoKey": "Allow_Auto_Reboot.reg",
       "MinVersion": null,
@@ -1272,7 +1353,7 @@
       "Category": "Windows Update",
       "Action": "Disable",
       "RegistryKey": "Disable_Delivery_Optimization.reg",
-      "ApplyText": "> Disabling sharing of downloaded updates with other PCs...",
+      "ApplyText": "Disabling sharing of downloaded updates with other PCs...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Delivery_Optimization.reg",
       "MinVersion": null,
@@ -1297,7 +1378,7 @@
       "Category": "File Explorer",
       "Action": "Hide",
       "RegistryKey": "Disable_Include_in_library_from_context_menu.reg",
-      "ApplyText": "> Hiding 'Include in library' in the context menu...",
+      "ApplyText": "Hiding 'Include in library' in the context menu...",
       "UndoAction": "Show",
       "RegistryUndoKey": "Enable_Include_in_library_in_context_menu.reg",
       "MinVersion": null,
@@ -1310,7 +1391,7 @@
       "Category": "File Explorer",
       "Action": "Hide",
       "RegistryKey": "Disable_Give_access_to_context_menu.reg",
-      "ApplyText": "> Hiding 'Give access to' in the context menu...",
+      "ApplyText": "Hiding 'Give access to' in the context menu...",
       "UndoAction": "Show",
       "RegistryUndoKey": "Enable_Give_access_to_context_menu.reg",
       "MinVersion": null,
@@ -1323,7 +1404,7 @@
       "Category": "File Explorer",
       "Action": "Hide",
       "RegistryKey": "Disable_Share_from_context_menu.reg",
-      "ApplyText": "> Hiding 'Share' in the context menu...",
+      "ApplyText": "Hiding 'Share' in the context menu...",
       "UndoAction": "Show",
       "RegistryUndoKey": "Enable_Share_in_context_menu.reg",
       "MinVersion": null,
@@ -1336,7 +1417,7 @@
       "Category": "File Explorer",
       "Action": "Hide",
       "RegistryKey": "Hide_Onedrive_Folder.reg",
-      "ApplyText": "> Hiding the OneDrive folder from the File Explorer navigation pane...",
+      "ApplyText": "Hiding the OneDrive folder from the File Explorer navigation pane...",
       "UndoAction": "Show",
       "RegistryUndoKey": "Show_Onedrive_Folder.reg",
       "MinVersion": null,
@@ -1349,7 +1430,7 @@
       "Category": "File Explorer",
       "Action": "Hide",
       "RegistryKey": "Hide_3D_Objects_Folder.reg",
-      "ApplyText": "> Hiding the 3D objects folder from the File Explorer navigation pane...",
+      "ApplyText": "Hiding the 3D objects folder from the File Explorer navigation pane...",
       "UndoAction": "Show",
       "RegistryUndoKey": "Show_3D_Objects_Folder.reg",
       "MinVersion": null,
@@ -1362,7 +1443,7 @@
       "Category": "File Explorer",
       "Action": "Hide",
       "RegistryKey": "Hide_Music_Folder.reg",
-      "ApplyText": "> Hiding the music folder from the File Explorer navigation pane...",
+      "ApplyText": "Hiding the music folder from the File Explorer navigation pane...",
       "UndoAction": "Show",
       "RegistryUndoKey": "Show_Music_Folder.reg",
       "MinVersion": null,
@@ -1371,11 +1452,11 @@
     {
       "FeatureId": "DisableBraveBloat",
       "Label": "bloat in Brave browser (AI, Crypto, etc.)",
-      "ToolTip": "This will disable Brave's built-in AI features, Crypto wallet, News, Rewards, Talk and VPN.",
+      "ToolTip": "This will disable Brave's built-in AI features, Crypto wallet, News, Rewards, Talk and VPN. This feature uses policies, which will lock down certain settings.",
       "Category": "Other",
       "Action": "Disable",
       "RegistryKey": "Disable_Brave_Bloat.reg",
-      "ApplyText": "> Disabling Brave AI, Crypto, News, Rewards, Talk and VPN in Brave browser...",
+      "ApplyText": "Disabling Brave AI, Crypto, News, Rewards, Talk and VPN in Brave browser...",
       "UndoAction": "Enable",
       "RegistryUndoKey": "Enable_Brave_Bloat.reg",
       "MinVersion": null,
@@ -1384,13 +1465,14 @@
     {
       "FeatureId": "EnableWindowsSandbox",
       "Label": "Windows Sandbox",
-       "ToolTip": "Windows Sandbox is a lightweight desktop environment for safely running applications in isolation. Software installed inside the Windows Sandbox environment remains 'sandboxed' and runs separately from the host machine. Only supported on Windows 11 Pro, Workstation, and Enterprise editions.",
+      "ToolTip": "Windows Sandbox is a lightweight desktop environment for safely running applications in isolation. Software installed inside the Windows Sandbox environment remains 'sandboxed' and runs separately from the host machine. Only supported on Windows 11 Pro, Workstation, and Enterprise editions.",
       "Category": "Optional Windows Features",
       "Action": "Enable",
       "RegistryKey": null,
-      "ApplyText": "> Enabling Windows Sandbox...",
+      "ApplyText": "Enabling Windows Sandbox...",
       "UndoAction": null,
       "RegistryUndoKey": null,
+      "RequiresReboot": true,
       "MinVersion": 22483,
       "MaxVersion": null
     },
@@ -1401,9 +1483,10 @@
       "Category": "Optional Windows Features",
       "Action": "Enable",
       "RegistryKey": null,
-      "ApplyText": "> Enabling Windows Subsystem for Linux...",
+      "ApplyText": "Enabling Windows Subsystem for Linux...",
       "UndoAction": null,
       "RegistryUndoKey": null,
+      "RequiresReboot": true,
       "MinVersion": 22000,
       "MaxVersion": null
     }

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)
 
@@ -88,7 +88,7 @@ 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 local Windows search history.
+- 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,21 +97,23 @@ Below is an overview of the key features and functionality offered by Win11Deblo
 #### AI Features
 
 - Disable & remove Microsoft Copilot.
-- Disable Windows Recall. (W11 only)
-- Disable Click to Do, AI text & image analysis tool. (W11 only)
-- Disable AI Features in Edge. (W11 only)
-- Disable AI Features in Paint. (W11 only)
-- Disable AI Features in Notepad. (W11 only)
+- Disable Windows Recall.
+- Disable Click to Do, AI text & image analysis tool.
+- Prevent AI service (WSAIFabricSvc) from starting automatically.
+- Disable AI Features in Edge.
+- Disable AI Features in Paint.
+- Disable AI Features in Notepad.
 
 #### System
 
-- Disable the Drag Tray for sharing & moving files. (W11 only)
-- Restore the old Windows 10 style context menu. (W11 only)
+- Disable the Drag Tray for sharing & moving files.
+- Restore the old Windows 10 style context menu.
 - Turn off Enhance Pointer Precision, also known as mouse acceleration.
-- Disable the Sticky Keys keyboard shortcut. (W11 only)
+- Disable the Sticky Keys keyboard shortcut.
+- 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)
+- Disable network connectivity during Modern Standby to reduce battery drain.
 
 #### Windows Update
 
@@ -125,47 +127,51 @@ 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)
+- Remove or replace all pinned apps from the start menu.
+- Hide the recommended section in the start menu.
+- Hide the 'All Apps' section in the start menu.
+- Disable the Phone Link mobile devices integration in the start menu.
 - Disable Bing web search & Copilot integration in Windows search.
-- Disable the Phone Link mobile devices integration in the start menu. (W11 only)
+- Disable Microsoft Store app suggestions in Windows search.
+- Disable Search Highlights (dynamic/branded content) in the taskbar search box.
+- Disable local Windows search history.
 
 #### Taskbar
 
-- Align taskbar icons to the left. (W11 only)
-- Hide or change the search icon/box on the taskbar. (W11 only)
-- Hide the taskview button from the taskbar. (W11 only)
+- Align taskbar icons to the left.
+- Hide or change the search icon/box on the taskbar.
+- Hide the taskview button from the taskbar.
 - Disable widgets on the taskbar & lock screen.
-- Hide the chat (meet now) icon from the taskbar. (W10 only)
-- Enable the 'End Task' option in the taskbar right click menu. (W11 only)
+- Hide the chat (meet now) icon from the taskbar.
+- Enable the 'End Task' option in the taskbar right click menu.
 - Enable the 'Last Active Click' behavior in the taskbar app area. This allows you to repeatedly click on an application's icon in the taskbar to switch focus between the open windows of that application.
-- Choose how app icons are shown on the taskbar when using multiple monitors. (W11 only)
-- Choose combine mode for taskbar buttons and labels. (W11 only)
+- Choose how app icons are shown on the taskbar when using multiple monitors.
+- Choose combine mode for taskbar buttons and labels.
 
 #### File Explorer
 
 - Change the default location that File Explorer opens to.
 - Show file extensions for known file types.
 - Show hidden files, folders and drives.
-- Hide the Home or Gallery section from the File Explorer navigation pane. (W11 only)
+- Hide the Home or Gallery section from the File Explorer navigation pane.
 - Hide duplicate removable drive entries from the File Explorer navigation pane, so only the entry under 'This PC' remains.
-- Add all common folders (Desktop, Downloads, etc.) back to 'This PC' in File Explorer. (W11 only)
-- Hide the 3D objects, music or OneDrive folder from the File Explorer navigation pane. (W10 only)
-- Hide the 'Include in library', 'Give access to' and 'Share' options from the context menu. (W10 only)
+- Add all common folders (Desktop, Downloads, etc.) back to 'This PC' in File Explorer.
+- Hide the 3D objects, music or OneDrive folder from the File Explorer navigation pane.
+- Hide the 'Include in library', 'Give access to' and 'Share' options from the context menu.
 
 #### Multi-tasking
 
-- Disable window snapping. (W11 only)
-- Disable Snap Assist suggestions when snapping a window. (W11 only)
-- 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)
+- Disable window snapping.
+- Disable Snap Assist suggestions when snapping a window.
+- Disable Snap Layout suggestions when dragging windows to the top of screen and when hovering on the maximize button.
+- Change if tabs are shown when snapping or pressing Alt+Tab.
 
 #### 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)
+- Enable Windows Sandbox, a lightweight desktop environment for safely running applications in isolation.
+- Enable Windows Subsystem for Linux which allows you to run a Linux environment directly on Windows.
 
 #### Other
 
@@ -177,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_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_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_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_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_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_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
+

Schemas/AboutWindow.xaml

@@ -4,96 +4,12 @@
         Width="500"
         SizeToContent="Height"
         ResizeMode="NoResize"
-        WindowStartupLocation="CenterScreen"
+        WindowStartupLocation="CenterOwner"
         WindowStyle="None"
         AllowsTransparency="True"
         Background="Transparent"
         Topmost="True"
         ShowInTaskbar="False">
-    
-    <Window.Resources>
-        <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>
-        
-        <!-- Button Style -->
-        <Style x:Key="MessageBoxButton" TargetType="Button">
-            <Setter Property="Background" Value="{DynamicResource SecondaryButtonBg}"/>
-            <Setter Property="Foreground" Value="{DynamicResource FgColor}"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderColor}"/>
-            <Setter Property="Padding" Value="0"/>
-            <Setter Property="FontSize" Value="14"/>
-            <Setter Property="Height" Value="32"/>
-            <Setter Property="MinWidth" Value="80"/>
-            <Setter Property="Margin" Value="4,0"/>
-            <Setter Property="FontWeight" Value="Normal"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border x:Name="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.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Border" Property="Background" Value="{DynamicResource SecondaryButtonHover}"/>
-                            </Trigger>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter TargetName="Border" Property="Background" Value="{DynamicResource SecondaryButtonPressed}"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-        <!-- Primary Button Style -->
-        <Style x:Key="PrimaryMessageBoxButton" TargetType="Button" BasedOn="{StaticResource MessageBoxButton}">
-            <Setter Property="Background" Value="{DynamicResource ButtonBg}"/>
-            <Setter Property="Foreground" Value="white"/>
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonBg}"/>
-            <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 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>
-    </Window.Resources>
 
     <Border BorderBrush="{DynamicResource BorderColor}" 
             BorderThickness="1" 
@@ -183,7 +99,7 @@
                             Grid.Row="2" Grid.Column="1"
                             Text="https://github.com/Raphire/Win11Debloat" 
                             FontSize="14"
-                            Style="{StaticResource HyperlinkStyle}"
+                            Style="{DynamicResource HyperlinkStyle}"
                             Margin="0,0,0,0"/>
                 </Grid>
 
@@ -212,7 +128,7 @@
                         <TextBlock x:Name="KofiLinkIcon"
                                 Grid.Column="0"
                                 FontSize="16"
-                                Style="{StaticResource HyperlinkStyle}"
+                                Style="{DynamicResource HyperlinkStyle}"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
                                 FontWeight="SemiBold"
@@ -224,7 +140,7 @@
                         <TextBlock x:Name="KofiLink"
                                 Grid.Column="1"
                                 FontSize="16"
-                                Style="{StaticResource HyperlinkStyle}"
+                                Style="{DynamicResource HyperlinkStyle}"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
                                 FontWeight="SemiBold"
@@ -245,7 +161,8 @@
                             HorizontalAlignment="Right">
                     <Button x:Name="CloseButton" 
                             Content="Close" 
-                            Style="{StaticResource MessageBoxButton}"/>
+                            Height="32" MinWidth="80" Margin="4,0"
+                            Style="{DynamicResource SecondaryButtonStyle}"/>
                 </StackPanel>
             </Border>
         </Grid>

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">
@@ -276,8 +161,8 @@
                         <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>

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/BubbleHint.xaml

@@ -0,0 +1,41 @@
+<Grid xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      Name="BubblePanel"
+      SnapsToDevicePixels="True">
+    <Grid.RowDefinitions>
+        <RowDefinition Height="Auto"/>
+        <RowDefinition Height="Auto"/>
+    </Grid.RowDefinitions>
+
+    <Border Name="BubbleBorder"
+            Grid.Row="0"
+            Background="{DynamicResource CardBgColor}"
+            BorderBrush="{DynamicResource ButtonBorderColor}"
+            BorderThickness="1"
+            CornerRadius="8"
+            Padding="10,7,10,7">
+        <TextBlock Name="BubbleText"
+                   Text="View the selected changes here"
+                   TextWrapping="Wrap"
+                   MaxWidth="260"
+                   Foreground="{DynamicResource FgColor}"/>
+    </Border>
+
+    <Grid Grid.Row="1"
+          HorizontalAlignment="Center"
+          Margin="0,-1,0,0"
+          Width="12"
+          Height="8">
+        <Polygon Name="BubblePointer"
+                 Points="0,0 12,0 6,7"
+                 Fill="{DynamicResource CardBgColor}"
+                 Stroke="{DynamicResource ButtonBorderColor}"
+                 StrokeThickness="1"
+                 Stretch="Fill"/>
+
+        <Rectangle VerticalAlignment="Top"
+                   Height="2"
+                   Margin="1,-1,1,0"
+                   Fill="{DynamicResource CardBgColor}"/>
+    </Grid>
+</Grid>

Schemas/MainWindow.xaml

@@ -1,7 +1,7 @@
 <Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="Win11Debloat" 
-        MinWidth="1080" MinHeight="600"
+        MinWidth="1130" MinHeight="600"
         MaxWidth="1400"
         ResizeMode="CanResize" 
         SnapsToDevicePixels="True"
@@ -11,43 +11,16 @@
         Background="Transparent"
         Foreground="{DynamicResource FgColor}">
     <Window.Resources>
-        <!-- ScrollBar Style -->
-        <Style TargetType="{x:Type ScrollBar}">
+        <!-- Sort column header hover style -->
+        <Style x:Key="SortHeaderBtnStyle" TargetType="StackPanel">
+            <Setter Property="Opacity" Value="1.0"/>
             <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.Triggers>
+                <Trigger Property="IsMouseOver" Value="True">
+                    <Setter Property="Opacity" Value="0.75"/>
+                </Trigger>
+            </Style.Triggers>
         </Style>
-
         <!-- ComboBox Style -->
         <Style TargetType="ComboBox">
             <Setter Property="Background" Value="{DynamicResource ComboBgColor}"/>
@@ -136,13 +109,16 @@
                                 PlacementTarget="{Binding ElementName=ToggleButton}"
                                 VerticalOffset="1"
                                 HorizontalOffset="0">
-                                <Grid x:Name="DropDown" MinWidth="{TemplateBinding ActualWidth}" MaxHeight="{TemplateBinding MaxDropDownHeight}">
+                                <Grid x:Name="DropDown" MinWidth="{TemplateBinding ActualWidth}" MaxHeight="{TemplateBinding MaxDropDownHeight}" Margin="12">
                                     <Border x:Name="DropDownBorder"
                                             Background="{DynamicResource ComboItemBgColor}"
                                             BorderBrush="{DynamicResource BorderColor}"
                                             BorderThickness="1"
                                             CornerRadius="4"
                                             Padding="5,4,5,1">
+                                        <Border.Effect>
+                                            <DropShadowEffect BlurRadius="12" Opacity="0.25" ShadowDepth="4"/>
+                                        </Border.Effect>
                                         <ScrollViewer Margin="0,2,0,0"
                                                     VerticalScrollBarVisibility="Auto"
                                                     HorizontalScrollBarVisibility="Disabled">
@@ -375,7 +351,10 @@
                                     <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 Fluent Icons" FontSize="12" Foreground="{DynamicResource ButtonBg}" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="Collapsed"/>
+                                    <Grid>
+                                        <TextBlock x:Name="CheckMark" Text="&#xE73E;" FontFamily="Segoe Fluent Icons" FontSize="12" Foreground="{DynamicResource ButtonBg}" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="Collapsed"/>
+                                        <TextBlock x:Name="IndeterminateMark" Text="&#xE738;" FontFamily="Segoe Fluent Icons" FontSize="11" Foreground="{DynamicResource ButtonBg}" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="Collapsed" Margin="1,1,0,0" />
+                                    </Grid>
                                 </Border>
                                 <ContentPresenter Grid.Column="1" VerticalAlignment="Center" Margin="0,0,0,2"/>
                             </Grid>
@@ -390,6 +369,13 @@
                                 <Setter TargetName="CheckBoxBorder" Property="BorderBrush" Value="{DynamicResource ButtonBg}"/>
                                 <Setter TargetName="CheckMark" Property="Foreground" Value="White"/>
                             </Trigger>
+                            <Trigger Property="IsChecked" Value="{x:Null}">
+                                <Setter TargetName="IndeterminateMark" Property="Visibility" Value="Visible"/>
+                                <Setter TargetName="CheckBoxBorder" Property="Background" Value="{DynamicResource ButtonBg}"/>
+                                <Setter TargetName="CheckBoxBorder" Property="BorderBrush" Value="{DynamicResource ButtonBg}"/>
+                                <Setter TargetName="CheckBoxBorder" Property="Opacity" Value="0.8"/>
+                                <Setter TargetName="IndeterminateMark" Property="Foreground" Value="White"/>
+                            </Trigger>
                             <Trigger Property="IsEnabled" Value="False">
                                 <Setter TargetName="CheckBoxBorder" Property="Background" Value="{DynamicResource ButtonDisabled}"/>
                                 <Setter TargetName="CheckBoxBorder" Property="BorderBrush" Value="{DynamicResource BorderColor}"/>
@@ -405,6 +391,15 @@
                                 <Setter TargetName="CheckBoxBorder" Property="Background" Value="{DynamicResource ButtonHover}"/>
                                 <Setter TargetName="CheckBoxBorder" Property="BorderBrush" Value="{DynamicResource ButtonHover}"/>
                             </MultiTrigger>
+                            <MultiTrigger>
+                                <MultiTrigger.Conditions>
+                                    <Condition Property="IsMouseOver" Value="True"/>
+                                    <Condition Property="IsChecked" Value="{x:Null}"/>
+                                </MultiTrigger.Conditions>
+                                <Setter TargetName="CheckBoxBorder" Property="Background" Value="{DynamicResource ButtonHover}"/>
+                                <Setter TargetName="CheckBoxBorder" Property="BorderBrush" Value="{DynamicResource ButtonHover}"/>
+                                <Setter TargetName="CheckBoxBorder" Property="Opacity" Value="0.8"/>
+                            </MultiTrigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
                 </Setter.Value>
@@ -444,89 +439,38 @@
             <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>
+        <!-- Column widths for the app table rows and header (dot | name | description | id) -->
+        <GridLength x:Key="AppTableDotColWidth">16</GridLength>
+        <GridLength x:Key="AppTableNameColWidth">151</GridLength>
+        <GridLength x:Key="AppTableDescColWidth">1*</GridLength>
+        <GridLength x:Key="AppTableIdColWidth">261</GridLength>
 
-        <!-- 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>
+        <!-- Recommendation dot shape style for app table rows -->
+        <Style x:Key="AppRecommendationDotStyle" TargetType="Ellipse">
+            <Setter Property="Width" Value="9"/>
+            <Setter Property="Height" Value="9"/>
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
         </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>
+        <!-- Container style for each dynamically-created app table row -->
+        <Style x:Key="AppTableRowStyle" TargetType="Grid">
+            <Setter Property="Margin" Value="0,1,0,0"/>
         </Style>
 
+        <!-- Style for dynamically-created preset checkboxes in the Quick Select popup -->
+        <Style x:Key="PresetCheckBoxStyle" TargetType="CheckBox" BasedOn="{StaticResource {x:Type CheckBox}}">
+            <Setter Property="Margin" Value="8,4"/>
+        </Style>
+
+        <!-- Progress step indicator fill colors -->
+        <SolidColorBrush x:Key="ProgressActiveColor" Color="#0067c0"/>
+        <SolidColorBrush x:Key="ProgressInactiveColor" Color="#808080"/>
+
+        <!-- Validation feedback colors for username input -->
+        <SolidColorBrush x:Key="ValidationErrorColor" Color="#c42b1c"/>
+        <SolidColorBrush x:Key="ValidationSuccessColor" Color="#28a745"/>
+
         <!-- Title Bar Button Style -->
         <Style x:Key="TitleBarButton" TargetType="Button">
             <Setter Property="Background" Value="Transparent"/>
@@ -565,10 +509,10 @@
             </Setter>
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource SecondaryButtonHover}"/>
+                    <Setter Property="Background" Value="{DynamicResource TitlebarButtonHover}"/>
                 </Trigger>
                 <Trigger Property="IsPressed" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource SecondaryButtonPressed}"/>
+                    <Setter Property="Background" Value="{DynamicResource TitlebarButtonPressed}"/>
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -595,15 +539,22 @@
             <Setter Property="BorderThickness" Value="1"/>
             <Setter Property="Padding" Value="4"/>
             <Setter Property="HasDropShadow" Value="True"/>
+            <Setter Property="HorizontalOffset" Value="-12"/>
+            <Setter Property="VerticalOffset" Value="-12"/>
             <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 Margin="12">
+                            <Border Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    CornerRadius="4"
+                                    Padding="{TemplateBinding Padding}">
+                                <Border.Effect>
+                                    <DropShadowEffect BlurRadius="12" Opacity="0.25" ShadowDepth="4"/>
+                                </Border.Effect>
+                                <StackPanel IsItemsHost="True"/>
+                            </Border>
                         </Border>
                     </ControlTemplate>
                 </Setter.Value>
@@ -789,13 +740,13 @@
                             
                             <!-- Action Buttons -->
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,20,0,0">
-                                <Button x:Name="HomeDefaultModeBtn" Width="180" Height="50" Style="{StaticResource PrimaryButtonStyle}" Margin="0,0,12,0" AutomationProperties.Name="Default Mode">
+                                <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="{StaticResource SecondaryButtonStyle}" AutomationProperties.Name="Custom Setup">
+                                <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"/>
@@ -825,9 +776,60 @@
                                     </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 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="{StaticResource 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="{StaticResource SecondaryButtonStyle}" Height="32"  Padding="10,0" Margin="0,0,10,0" AutomationProperties.Name="Clear Selection"/>
+                                        <ToggleButton x:Name="PresetsBtn" ToolTip="Select or clear app presets" Height="32" Padding="10,0" Margin="0,0,10,0" AutomationProperties.Name="App Presets">
+                                            <ToggleButton.Style>
+                                                <Style TargetType="ToggleButton">
+                                                    <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="FontSize" Value="14"/>
+                                                    <Setter Property="Cursor" Value="Hand"/>
+                                                    <Setter Property="Template">
+                                                        <Setter.Value>
+                                                            <ControlTemplate TargetType="ToggleButton">
+                                                                <Border x:Name="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="IsMouseOver" Value="True">
+                                                            <Setter Property="Background" Value="{DynamicResource SecondaryButtonHover}"/>
+                                                        </Trigger>
+                                                        <Trigger Property="IsPressed" Value="True">
+                                                            <Setter Property="Background" Value="{DynamicResource SecondaryButtonPressed}"/>
+                                                        </Trigger>
+                                                        <Trigger Property="IsChecked" Value="True">
+                                                            <Setter Property="Background" Value="{DynamicResource SecondaryButtonHover}"/>
+                                                        </Trigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </ToggleButton.Style>
+                                            <StackPanel Orientation="Horizontal">
+                                                <TextBlock Text="Quick Select" FontSize="13" VerticalAlignment="Center" Margin="0,0,6,0"/>
+                                                <TextBlock x:Name="PresetsArrow" Text="&#xE70D;" FontFamily="Segoe Fluent Icons" FontSize="10" VerticalAlignment="Center" RenderTransformOrigin="0.5,0.5">
+                                                    <TextBlock.RenderTransform>
+                                                        <RotateTransform x:Name="PresetsArrowRotation" Angle="0"/>
+                                                    </TextBlock.RenderTransform>
+                                                </TextBlock>
+                                            </StackPanel>
+                                        </ToggleButton>
+                                        <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"/>
+                                        <Popup x:Name="PresetsPopup" PlacementTarget="{Binding ElementName=PresetsBtn}" Placement="Bottom" StaysOpen="True" AllowsTransparency="True" VerticalOffset="2">
+                                            <Border Background="{DynamicResource CardBgColor}" BorderBrush="{DynamicResource BorderColor}" BorderThickness="1" CornerRadius="6" Padding="4,6" Margin="12">
+                                                <Border.Effect>
+                                                    <DropShadowEffect BlurRadius="12" Opacity="0.25" ShadowDepth="4"/>
+                                                </Border.Effect>
+                                                <StackPanel x:Name="PresetsPanel" MinWidth="220">
+                                                    <CheckBox x:Name="PresetDefaultApps" Content="Default selection" IsThreeState="True" Foreground="{DynamicResource FgColor}" Margin="8,4" AutomationProperties.Name="Default selection"/>
+                                                    <CheckBox x:Name="PresetLastUsed" Content="Last used selection" IsThreeState="True" Foreground="{DynamicResource FgColor}" Margin="8,4" AutomationProperties.Name="Last used selection"/>
+                                                    <Separator Margin="4,6" Background="{DynamicResource BorderColor}"/>
+                                                    <StackPanel x:Name="JsonPresetsPanel"/>
+                                                </StackPanel>
+                                            </Border>
+                                        </Popup>
                                     </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"/>
@@ -869,25 +871,60 @@
                                 </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 Margin="42,6,23,8">
                                         <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="160"/>
-                                            <ColumnDefinition Width="*"/>
-                                            <ColumnDefinition Width="300"/>
+                                            <ColumnDefinition Width="{StaticResource AppTableDotColWidth}"/>
+                                            <ColumnDefinition Width="{StaticResource AppTableNameColWidth}"/>
+                                            <ColumnDefinition Width="{StaticResource AppTableDescColWidth}"/>
+                                            <ColumnDefinition Width="{StaticResource AppTableIdColWidth}"/>
                                         </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}"/>
+                                        <StackPanel x:Name="HeaderNameBtn" Grid.Column="1" Orientation="Horizontal" Cursor="Hand" VerticalAlignment="Center" Style="{StaticResource SortHeaderBtnStyle}">
+                                            <TextBlock Text="Name" FontWeight="SemiBold" FontSize="16" Foreground="{DynamicResource FgColor}"/>
+                                            <TextBlock x:Name="SortArrowName" Text="&#xE70E;" FontFamily="Segoe Fluent Icons" FontSize="11" Foreground="{DynamicResource FgColor}" VerticalAlignment="Center" Margin="5,1,0,0" Opacity="0.3" RenderTransformOrigin="0.5,0.5">
+                                                <TextBlock.RenderTransform><RotateTransform Angle="0"/></TextBlock.RenderTransform>
+                                            </TextBlock>
+                                        </StackPanel>
+                                        <StackPanel x:Name="HeaderDescriptionBtn" Grid.Column="2" Orientation="Horizontal" Cursor="Hand" VerticalAlignment="Center" Margin="8,0,0,0" Style="{StaticResource SortHeaderBtnStyle}">
+                                            <TextBlock Text="Description" FontWeight="SemiBold" FontSize="16" Foreground="{DynamicResource FgColor}"/>
+                                            <TextBlock x:Name="SortArrowDescription" Text="&#xE70E;" FontFamily="Segoe Fluent Icons" FontSize="11" Foreground="{DynamicResource FgColor}" VerticalAlignment="Center" Margin="5,1,0,0" Opacity="0.3" RenderTransformOrigin="0.5,0.5">
+                                                <TextBlock.RenderTransform><RotateTransform Angle="0"/></TextBlock.RenderTransform>
+                                            </TextBlock>
+                                        </StackPanel>
+                                        <StackPanel x:Name="HeaderAppIdBtn" Grid.Column="3" Orientation="Horizontal" Cursor="Hand" VerticalAlignment="Center" Style="{StaticResource SortHeaderBtnStyle}">
+                                            <TextBlock Text="App ID" FontWeight="SemiBold" FontSize="16" Foreground="{DynamicResource FgColor}"/>
+                                            <TextBlock x:Name="SortArrowAppId" Text="&#xE70E;" FontFamily="Segoe Fluent Icons" FontSize="11" Foreground="{DynamicResource FgColor}" VerticalAlignment="Center" Margin="5,1,0,0" Opacity="0.3" RenderTransformOrigin="0.5,0.5">
+                                                <TextBlock.RenderTransform><RotateTransform Angle="0"/></TextBlock.RenderTransform>
+                                            </TextBlock>
+                                        </StackPanel>
                                     </Grid>
                                 </Border>
                                 <!-- Apps content -->
-                                <Border Grid.Row="1" BorderBrush="{DynamicResource BorderColor}" CornerRadius="0,0,4,4" BorderThickness="1" Background="{DynamicResource CardBgColor}">
+                                <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"/>
+                                            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                                                <TextBlock Text="&#xF16A;" FontFamily="Segoe Fluent Icons" FontSize="28" Foreground="{DynamicResource FgColor}" HorizontalAlignment="Center" Margin="0,0,0,8" RenderTransformOrigin="0.5,0.5">
+                                                    <TextBlock.RenderTransform>
+                                                        <RotateTransform Angle="0"/>
+                                                    </TextBlock.RenderTransform>
+                                                    <TextBlock.Triggers>
+                                                        <EventTrigger RoutedEvent="Loaded">
+                                                            <BeginStoryboard>
+                                                                <Storyboard>
+                                                                    <DoubleAnimation Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
+                                                                                     From="0" To="360"
+                                                                                     Duration="0:0:1.5"
+                                                                                     RepeatBehavior="Forever"/>
+                                                                </Storyboard>
+                                                            </BeginStoryboard>
+                                                        </EventTrigger>
+                                                    </TextBlock.Triggers>
+                                                </TextBlock>
+                                                <TextBlock Text="Loading apps..." FontSize="16" FontWeight="SemiBold" Foreground="{DynamicResource FgColor}" HorizontalAlignment="Center"/>
+                                            </StackPanel>
                                         </Border>
                                     </Grid>
                                 </Border>
@@ -918,9 +955,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 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="{StaticResource 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="{StaticResource SecondaryButtonStyle}" 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">
@@ -988,167 +1025,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 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>
-                                    </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 PrimaryButtonStyle}" 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 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>
-                            </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,10" 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,8">
-                            <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 PrimaryButtonStyle}" Margin="0" IsEnabled="False" AutomationProperties.Name="Finish">
-                                        <TextBlock x:Name="FinishBtnText" Text="Applying changes..." VerticalAlignment="Center" FontSize="18" FontWeight="SemiBold" Margin="0,0,0,1"/>
-                                    </Button>
-                                </StackPanel>
-                            </Grid>
-                        </Border>
-                    </Grid>
-                </TabItem>
             </TabControl>
 
             <!-- Bottom Navigation Buttons -->
@@ -1159,15 +1175,15 @@
                         <ColumnDefinition Width="*"/>
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
-                    <Button x:Name="PreviousBtn" Grid.Column="0" Width="120" Height="36" Style="{StaticResource SecondaryButtonStyle}" 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 Fluent Icons" FontSize="12" Margin="0,0,8,0" VerticalAlignment="Center"/>
-                            <TextBlock Text="Previous" VerticalAlignment="Center" FontSize="14" Margin="0,0,0,1"/>
+                            <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 PrimaryButtonStyle}" 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 Fluent Icons" FontSize="12" Margin="8,0,0,0" VerticalAlignment="Center"/>
@@ -1180,7 +1196,7 @@
                 <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>
             

Schemas/MessageBoxWindow.xaml

@@ -3,87 +3,14 @@
         Title="MessageBox" 
         Width="440"
         SizeToContent="Height"
+        MaxHeight="501"
         ResizeMode="NoResize"
-        WindowStartupLocation="CenterScreen"
+        WindowStartupLocation="CenterOwner"
         WindowStyle="None"
         AllowsTransparency="True"
         Background="Transparent"
         Topmost="True"
         ShowInTaskbar="False">
-    
-    <Window.Resources>
-        <!-- Button Style -->
-        <Style x:Key="MessageBoxButton" TargetType="Button">
-            <Setter Property="Background" Value="{DynamicResource SecondaryButtonBg}"/>
-            <Setter Property="Foreground" Value="{DynamicResource FgColor}"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderColor}"/>
-            <Setter Property="Padding" Value="0"/>
-            <Setter Property="FontSize" Value="14"/>
-            <Setter Property="Height" Value="32"/>
-            <Setter Property="MinWidth" Value="80"/>
-            <Setter Property="Margin" Value="4,0"/>
-            <Setter Property="FontWeight" Value="Normal"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border x:Name="Border" 
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="4"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Border" Property="Background" Value="{DynamicResource SecondaryButtonHover}"/>
-                            </Trigger>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter TargetName="Border" Property="Background" Value="{DynamicResource SecondaryButtonPressed}"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-        <!-- Primary Button Style -->
-        <Style x:Key="PrimaryMessageBoxButton" TargetType="Button" BasedOn="{StaticResource MessageBoxButton}">
-            <Setter Property="Background" Value="{DynamicResource ButtonBg}"/>
-            <Setter Property="Foreground" Value="white"/>
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonBg}"/>
-            <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 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>
-    </Window.Resources>
 
     <Border BorderBrush="{DynamicResource BorderColor}" 
             BorderThickness="1" 
@@ -117,32 +44,34 @@
             </Grid>
 
             <!-- Message Content -->
-            <Grid Grid.Row="1" Margin="24,12,24,20">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
+            <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="0,2,14,0"
-                           Visibility="Collapsed"/>
+                    <!-- 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>
+                    <!-- 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" 
@@ -156,10 +85,12 @@
                             HorizontalAlignment="Right">
                     <Button x:Name="Button1" 
                             Content="OK" 
-                            Style="{StaticResource PrimaryMessageBoxButton}"/>
+                            Height="32" MinWidth="80" Margin="4,0"
+                            Style="{DynamicResource PrimaryButtonStyle}"/>
                     <Button x:Name="Button2" 
                             Content="Cancel" 
-                            Style="{StaticResource MessageBoxButton}"
+                            Height="32" MinWidth="80" Margin="4,0"
+                            Style="{DynamicResource SecondaryButtonStyle}"
                             Visibility="Collapsed"/>
                 </StackPanel>
             </Border>

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/GetInstalledAppsViaWinget.ps1

@@ -0,0 +1,31 @@
+
+# Run winget list and return installed apps.
+# Use -NonBlocking to keep the UI responsive (GUI mode) via Invoke-NonBlocking.
+function GetInstalledAppsViaWinget {
+    param (
+        [int]$TimeOut = 10,
+        [switch]$NonBlocking
+    )
+
+    if (-not $script:WingetInstalled) { return $null }
+
+    $fetchBlock = {
+        param($timeOut)
+        $job = Start-Job { return winget list --accept-source-agreements --disable-interactivity }
+        $done = $job | Wait-Job -Timeout $timeOut
+        if ($done) {
+            $result = Receive-Job -Job $job
+            Remove-Job -Job $job -ErrorAction SilentlyContinue
+            return $result
+        }
+        Remove-Job -Job $job -Force -ErrorAction SilentlyContinue
+        return $null
+    }
+
+    if ($NonBlocking) {
+        return Invoke-NonBlocking -ScriptBlock $fetchBlock -ArgumentList $TimeOut
+    }
+    else {
+        return & $fetchBlock $TimeOut
+    }
+}

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/Features/CreateSystemRestorePoint.ps1

@@ -0,0 +1,95 @@
+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') {
+            try {
+                $enableResult = Invoke-NonBlocking -TimeoutSeconds 20 -ScriptBlock {
+                    try {
+                        Enable-ComputerRestore -Drive "$env:SystemDrive"
+                        return $null
+                    }
+                    catch {
+                        return "Error: Failed to enable System Restore: $_"
+                    }
+                }
+            }
+            catch {
+                $enableResult = "Error: Failed to enable System Restore: $_"
+            }
+
+            if ($enableResult) {
+                Write-Host $enableResult -ForegroundColor Red
+                $failed = $true
+            }
+        }
+        else {
+            Write-Host ""
+            $failed = $true
+        }
+    }
+
+    if (-not $failed) {
+        try {
+            $result = Invoke-NonBlocking -TimeoutSeconds 20 -ScriptBlock {
+                try {
+                    $recentRestorePoints = Get-ComputerRestorePoint | Where-Object { (Get-Date) - [System.Management.ManagementDateTimeConverter]::ToDateTime($_.CreationTime) -le (New-TimeSpan -Hours 24) }
+                }
+                catch {
+                    return [PSCustomObject]@{ 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 [PSCustomObject]@{ Success = $true; Message = "System restore point created successfully" }
+                    }
+                    catch {
+                        return [PSCustomObject]@{ Success = $false; Message = "Error: Unable to create restore point: $_" }
+                    }
+                }
+                else {
+                    return [PSCustomObject]@{ Success = $true; Message = "A recent restore point already exists, no new restore point was created" }
+                }
+            }
+        }
+        catch {
+            $result = [PSCustomObject]@{ Success = $false; Message = "Error: Failed to create system restore point: $_" }
+        }
+
+        if ($result -and $result.Success) {
+            Write-Host $result.Message
+        }
+        elseif ($result) {
+            Write-Host $result.Message -ForegroundColor Red
+            $failed = $true
+        }
+        else {
+            Write-Host "Error: Failed to create system restore point" -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/ExecuteChanges.ps1

@@ -0,0 +1,196 @@
+# Executes a single parameter/feature based on its key
+# Parameters:
+#   $paramKey - The parameter name to execute
+function ExecuteParameter {
+    param (
+        [string]$paramKey
+    )
+    
+    # Check if this feature has metadata in Features.json
+    $feature = $null
+    if ($script:Features.ContainsKey($paramKey)) {
+        $feature = $script:Features[$paramKey]
+    }
+    
+    # If feature has RegistryKey and ApplyText, use dynamic ImportRegistryFile
+    if ($feature -and $feature.RegistryKey -and $feature.ApplyText) {
+        ImportRegistryFile "> $($feature.ApplyText)" $feature.RegistryKey
+        
+        # Handle special cases that have additional logic after ImportRegistryFile
+        switch ($paramKey) {
+            'DisableBing' {
+                # Also remove the app package for Bing search
+                RemoveApps 'Microsoft.BingSearch'
+            }
+            'DisableCopilot' {
+                # Also remove the app package for Copilot
+                RemoveApps 'Microsoft.Copilot'
+            }
+            'DisableWidgets' {
+                # Also remove the app package for Widgets
+                RemoveApps 'Microsoft.StartExperiencesApp'
+            }
+        }
+        return
+    }
+    
+    # Handle features without RegistryKey or with special logic
+    switch ($paramKey) {
+        'RemoveApps' {
+            Write-Host "> Removing selected apps for $(GetFriendlyTargetUserName)..."
+            $appsList = GenerateAppsList
+
+            if ($appsList.Count -eq 0) {
+                Write-Host "No valid apps were selected for removal" -ForegroundColor Yellow
+                Write-Host ""
+                return
+            }
+
+            Write-Host "$($appsList.Count) apps selected for removal"
+            RemoveApps $appsList
+        }
+        'RemoveAppsCustom' {
+            Write-Host "> Removing selected apps..."
+            $appsList = LoadAppsFromFile $script:CustomAppsListFilePath
+
+            if ($appsList.Count -eq 0) {
+                Write-Host "No valid apps were selected for removal" -ForegroundColor Yellow
+                Write-Host ""
+                return
+            }
+
+            Write-Host "$($appsList.Count) apps selected for removal"
+            RemoveApps $appsList
+        }
+        'RemoveCommApps' {
+            $appsList = 'Microsoft.windowscommunicationsapps', 'Microsoft.People'
+            Write-Host "> Removing Mail, Calendar and People apps..."
+            RemoveApps $appsList
+            return
+        }
+        'RemoveW11Outlook' {
+            $appsList = 'Microsoft.OutlookForWindows'
+            Write-Host "> Removing new Outlook for Windows app..."
+            RemoveApps $appsList
+            return
+        }
+        'RemoveGamingApps' {
+            $appsList = 'Microsoft.GamingApp', 'Microsoft.XboxGameOverlay', 'Microsoft.XboxGamingOverlay'
+            Write-Host "> Removing gaming related apps..."
+            RemoveApps $appsList
+            return
+        }
+        'RemoveHPApps' {
+            $appsList = 'AD2F1837.HPAIExperienceCenter', 'AD2F1837.HPJumpStarts', 'AD2F1837.HPPCHardwareDiagnosticsWindows', 'AD2F1837.HPPowerManager', 'AD2F1837.HPPrivacySettings', 'AD2F1837.HPSupportAssistant', 'AD2F1837.HPSureShieldAI', 'AD2F1837.HPSystemInformation', 'AD2F1837.HPQuickDrop', 'AD2F1837.HPWorkWell', 'AD2F1837.myHP', 'AD2F1837.HPDesktopSupportUtilities', 'AD2F1837.HPQuickTouch', 'AD2F1837.HPEasyClean', 'AD2F1837.HPConnectedMusic', 'AD2F1837.HPFileViewer', 'AD2F1837.HPRegistration', 'AD2F1837.HPWelcome', 'AD2F1837.HPConnectedPhotopoweredbySnapfish', 'AD2F1837.HPPrinterControl'
+            Write-Host "> Removing HP apps..."
+            RemoveApps $appsList
+            return
+        }
+        "EnableWindowsSandbox" {
+            Write-Host "> Enabling Windows Sandbox..."
+            EnableWindowsFeature "Containers-DisposableClientVM"
+            Write-Host ""
+            return
+        }
+        "EnableWindowsSubsystemForLinux" {
+            Write-Host "> Enabling Windows Subsystem for Linux..."
+            EnableWindowsFeature "VirtualMachinePlatform"
+            EnableWindowsFeature "Microsoft-Windows-Subsystem-Linux"
+            Write-Host ""
+            return
+        }
+        'ClearStart' {
+            Write-Host "> Removing all pinned apps from the start menu for user $(GetUserName)..."
+            ReplaceStartMenu
+            Write-Host ""
+            return
+        }
+        'ReplaceStart' {
+            Write-Host "> Replacing the start menu for user $(GetUserName)..."
+            ReplaceStartMenu $script:Params.Item("ReplaceStart")
+            Write-Host ""
+            return
+        }
+        'ClearStartAllUsers' {
+            ReplaceStartMenuForAllUsers
+            return
+        }
+        'ReplaceStartAllUsers' {
+            ReplaceStartMenuForAllUsers $script:Params.Item("ReplaceStartAllUsers")
+            return
+        }
+        'DisableStoreSearchSuggestions' {
+            if ($script:Params.ContainsKey("Sysprep")) {
+                Write-Host "> Disabling Microsoft Store search suggestions in the start menu for all users..."
+                DisableStoreSearchSuggestionsForAllUsers
+                Write-Host ""
+                return
+            }
+
+            Write-Host "> Disabling Microsoft Store search suggestions for user $(GetUserName)..."
+            DisableStoreSearchSuggestions
+            Write-Host ""
+            return
+        }
+    }
+}
+
+
+# Executes all selected parameters/features
+function ExecuteAllChanges {    
+    # Build list of actionable parameters (skip control params and data-only params)
+    $actionableKeys = @()
+    foreach ($paramKey in $script:Params.Keys) {
+        if ($script:ControlParams -contains $paramKey) { continue }
+        if ($paramKey -eq 'Apps') { continue }
+        if ($paramKey -eq 'CreateRestorePoint') { continue }
+        $actionableKeys += $paramKey
+    }
+    
+    $totalSteps = $actionableKeys.Count
+    if ($script:Params.ContainsKey("CreateRestorePoint")) { $totalSteps++ }
+    $currentStep = 0
+    
+    # Create restore point if requested (CLI only - GUI handles this separately)
+    if ($script:Params.ContainsKey("CreateRestorePoint")) {
+        $currentStep++
+        if ($script:ApplyProgressCallback) {
+            & $script:ApplyProgressCallback $currentStep $totalSteps "Creating system restore point"
+        }
+        Write-Host "> Attempting to create a system restore point..."
+        CreateSystemRestorePoint
+        Write-Host ""
+    }
+    
+    # Execute all parameters
+    foreach ($paramKey in $actionableKeys) {
+        if ($script:CancelRequested) { 
+            return
+        }
+
+        $currentStep++
+        
+        # Get friendly name for the step
+        $stepName = $paramKey
+        if ($script:Features.ContainsKey($paramKey)) {
+            $feature = $script:Features[$paramKey]
+            if ($feature.ApplyText) {
+                # Prefer explicit ApplyText when provided
+                $stepName = $feature.ApplyText
+            } elseif ($feature.Label) {
+                # Fallback: construct a name from Action and Label, or just Label
+                if ($feature.Action) {
+                    $stepName = "$($feature.Action) $($feature.Label)"
+                } else {
+                    $stepName = $feature.Label
+                }
+            }
+        }
+        
+        if ($script:ApplyProgressCallback) {
+            & $script:ApplyProgressCallback $currentStep $totalSteps $stepName
+        }
+        
+        ExecuteParameter -paramKey $paramKey
+    }
+}

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/LoadAppPresetsFromJson.ps1

@@ -0,0 +1,22 @@
+# Read Apps.json and return the list of preset objects (Name + AppIds).
+# Returns an empty array if the file cannot be read or contains no presets.
+function LoadAppPresetsFromJson {
+    try {
+        $jsonContent = Get-Content -Path $script:AppsListFilePath -Raw | ConvertFrom-Json
+    }
+    catch {
+        Write-Warning "Failed to read Apps.json: $_"
+        return @()
+    }
+
+    if (-not $jsonContent.Presets) {
+        return @()
+    }
+
+    return @($jsonContent.Presets | ForEach-Object {
+        [PSCustomObject]@{
+            Name   = $_.Name
+            AppIds = @($_.AppIds)
+        }
+    })
+}

Scripts/FileIO/LoadAppsDetailsFromJson.ps1

@@ -39,6 +39,7 @@ function LoadAppsDetailsFromJson {
             IsChecked = $isChecked
             Description = $appData.Description
             SelectedByDefault = $appData.SelectedByDefault
+            Recommendation = $appData.Recommendation
         }
     }
 

Scripts/GUI/ApplySettingsToUiControls.ps1

@@ -11,67 +11,64 @@ function ApplySettingsToUiControls {
         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
+    if (-not $uiControlMappings) {
+        return $true
+    }
+
+    # Build control cache and reverse index (featureId -> control info) in a single pass
+    $controlCache = @{}
+    $featureIdIndex = @{}
+
+    foreach ($comboName in $uiControlMappings.Keys) {
+        $control = $window.FindName($comboName)
+        if (-not $control) { continue }
+        $controlCache[$comboName] = $control
+
+        $mapping = $uiControlMappings[$comboName]
+        if ($mapping.Type -eq 'group') {
+            $i = 1
+            foreach ($val in $mapping.Values) {
+                foreach ($fid in $val.FeatureIds) {
+                    $featureIdIndex[$fid] = @{ ComboName = $comboName; Control = $control; Index = $i; MappingType = 'group' }
+                }
+                $i++
             }
         }
+        elseif ($mapping.Type -eq 'feature') {
+            $featureIdIndex[$mapping.FeatureId] = @{ ComboName = $comboName; Control = $control; MappingType = 'feature' }
+        }
+
+        # Reset control to default state
+        if ($control -is [System.Windows.Controls.CheckBox]) {
+            $control.IsChecked = $false
+        }
+        elseif ($control -is [System.Windows.Controls.ComboBox]) {
+            $control.SelectedIndex = 0
+        }
     }
     
-    # Also uncheck RestorePointCheckBox
-    $restorePointCheckBox = $window.FindName('RestorePointCheckBox')
-    if ($restorePointCheckBox) {
-        $restorePointCheckBox.IsChecked = $false
-    }
-    
-    # Apply settings from JSON
+    # Apply settings using O(1) lookups
     foreach ($setting in $settingsJson.Settings) {
         if ($setting.Value -ne $true) { continue }
-        $paramName = $setting.Name
+        if ($setting.Name -eq 'CreateRestorePoint') { continue }
 
-        # Handle RestorePointCheckBox separately
-        if ($paramName -eq 'CreateRestorePoint') {
-            if ($restorePointCheckBox) { $restorePointCheckBox.IsChecked = $true }
-            continue
+        $entry = $featureIdIndex[$setting.Name]
+        if (-not $entry) { continue }
+
+        $control = $entry.Control
+        if (-not $control -or $control.Visibility -ne 'Visible') { continue }
+
+        if ($entry.MappingType -eq 'group') {
+            if ($control -is [System.Windows.Controls.ComboBox]) {
+                $control.SelectedIndex = $entry.Index
+            }
         }
-
-        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
-                            }
-                        }
-                    }
-                }
+        else {
+            if ($control -is [System.Windows.Controls.CheckBox]) {
+                $control.IsChecked = $true
+            }
+            elseif ($control -is [System.Windows.Controls.ComboBox]) {
+                $control.SelectedIndex = 1
             }
         }
     }

Scripts/GUI/SetWindowThemeResources.ps1

@@ -30,6 +30,8 @@ function SetWindowThemeResources {
         $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("TitlebarButtonHover", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#2d2d2d")))
+        $window.Resources.Add("TitlebarButtonPressed", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#292929")))
         $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")))
@@ -60,6 +62,8 @@ function SetWindowThemeResources {
         $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("TitlebarButtonHover", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#e1e1e1")))
+        $window.Resources.Add("TitlebarButtonPressed", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#e6e6e6")))
         $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")))
@@ -74,4 +78,17 @@ function SetWindowThemeResources {
     $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-AppSelectionWindow.ps1

@@ -143,7 +143,7 @@ function Show-AppSelectionWindow {
 
     # Load apps after window is shown (allows UI to render first)
     $window.Add_ContentRendered({ 
-        $window.Dispatcher.Invoke([System.Windows.Threading.DispatcherPriority]::Background, [action]{ LoadApps })
+        $window.Dispatcher.Invoke([System.Windows.Threading.DispatcherPriority]::Background, [action]{ LoadApps }) | Out-Null
     })
 
     # Show the window and return dialog 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
+        }
+    }) | Out-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-Bubble.ps1

@@ -0,0 +1,115 @@
+function Hide-Bubble {
+    param (
+        [Parameter(Mandatory=$false)]
+        [switch]$Immediate
+    )
+
+    if ($script:BubbleTimer) {
+        $script:BubbleTimer.Stop()
+        $script:BubbleTimer = $null
+    }
+
+    if (-not $script:BubblePopup) { return }
+
+    if ($Immediate -or -not $script:BubblePopup.Child) {
+        $script:BubblePopup.IsOpen = $false
+        $script:BubblePopup = $null
+        $script:BubbleIsClosing = $false
+        return
+    }
+
+    if ($script:BubbleIsClosing) { return }
+    $script:BubbleIsClosing = $true
+
+    $bubblePanel = $script:BubblePopup.Child
+    $fadeOut = New-Object System.Windows.Media.Animation.DoubleAnimation
+    $fadeOut.From = [double]$bubblePanel.Opacity
+    $fadeOut.To = 0
+    $fadeOut.Duration = [System.Windows.Duration]::new([TimeSpan]::FromMilliseconds(220))
+    $fadeOut.Add_Completed({
+        if ($script:BubblePopup) {
+            $script:BubblePopup.IsOpen = $false
+            $script:BubblePopup = $null
+        }
+        $script:BubbleIsClosing = $false
+    })
+
+    $bubblePanel.BeginAnimation([System.Windows.UIElement]::OpacityProperty, $fadeOut)
+}
+
+function Show-Bubble {
+    param (
+        [Parameter(Mandatory=$true)]
+        [System.Windows.Controls.Control]$TargetControl,
+
+        [Parameter(Mandatory=$false)]
+        [string]$Message = 'View the selected changes here',
+
+        [Parameter(Mandatory=$false)]
+        [int]$DurationSeconds = 5
+    )
+
+    Add-Type -AssemblyName PresentationFramework,PresentationCore,WindowsBase | Out-Null
+
+    if (-not $TargetControl) { return }
+
+    Hide-Bubble -Immediate
+
+    $xaml = Get-Content -Path $script:BubbleHintSchema -Raw
+    $reader = [System.Xml.XmlReader]::Create([System.IO.StringReader]::new($xaml))
+    try {
+        $bubblePanel = [System.Windows.Markup.XamlReader]::Load($reader)
+    }
+    finally {
+        $reader.Close()
+    }
+
+    $bubbleText = $bubblePanel.FindName('BubbleText')
+    if ($bubbleText) {
+        $bubbleText.Text = $Message
+    }
+
+    $bubblePanel.BeginAnimation([System.Windows.UIElement]::OpacityProperty, $null)
+    $bubblePanel.Opacity = 0
+
+    $popup = New-Object System.Windows.Controls.Primitives.Popup
+    $popup.AllowsTransparency = $true
+    $popup.PopupAnimation = 'None'
+    $popup.StaysOpen = $true
+    $popup.PlacementTarget = $TargetControl
+    $popup.Placement = [System.Windows.Controls.Primitives.PlacementMode]::Top
+    $popup.VerticalOffset = -1
+    $popup.Child = $bubblePanel
+
+    $popup.Add_Opened({
+        param($sender, $e)
+
+        if (-not $sender) { return }
+        $panel = $sender.Child
+        $target = $sender.PlacementTarget
+        if (-not $panel -or -not $target) { return }
+
+        $panel.Measure([System.Windows.Size]::new([double]::PositiveInfinity, [double]::PositiveInfinity))
+        $bubbleWidth = $panel.DesiredSize.Width
+        $targetWidth = $target.ActualWidth
+        $sender.HorizontalOffset = ($targetWidth - $bubbleWidth) / 2
+
+        $fadeIn = New-Object System.Windows.Media.Animation.DoubleAnimation
+        $fadeIn.From = 0
+        $fadeIn.To = 1
+        $fadeIn.BeginTime = [TimeSpan]::FromMilliseconds(30)
+        $fadeIn.Duration = [System.Windows.Duration]::new([TimeSpan]::FromMilliseconds(320))
+        $panel.BeginAnimation([System.Windows.UIElement]::OpacityProperty, $fadeIn)
+    })
+
+    $script:BubbleIsClosing = $false
+    $script:BubblePopup = $popup
+    $script:BubblePopup.IsOpen = $true
+
+    $script:BubbleTimer = New-Object System.Windows.Threading.DispatcherTimer
+    $script:BubbleTimer.Interval = [TimeSpan]::FromSeconds([Math]::Max(1, $DurationSeconds))
+    $script:BubbleTimer.Add_Tick({
+        Hide-Bubble
+    })
+    $script:BubbleTimer.Start()
+}

Scripts/GUI/Show-MainWindow.ps1

@@ -1,4 +1,4 @@
-function Show-MainWindow {    
+function Show-MainWindow {
     Add-Type -AssemblyName PresentationFramework,PresentationCore,WindowsBase,System.Windows.Forms | Out-Null
 
     # Get current Windows build version
@@ -210,29 +210,113 @@ function Show-MainWindow {
     $onlyInstalledAppsBox = $window.FindName('OnlyInstalledAppsBox')
     $loadingAppsIndicator = $window.FindName('LoadingAppsIndicator')
     $appSelectionStatus = $window.FindName('AppSelectionStatus')
-    $defaultAppsBtn = $window.FindName('DefaultAppsBtn')
+    $headerNameBtn = $window.FindName('HeaderNameBtn')
+    $headerDescriptionBtn = $window.FindName('HeaderDescriptionBtn')
+    $headerAppIdBtn = $window.FindName('HeaderAppIdBtn')
+    $sortArrowName = $window.FindName('SortArrowName')
+    $sortArrowDescription = $window.FindName('SortArrowDescription')
+    $sortArrowAppId = $window.FindName('SortArrowAppId')
+    $presetsBtn = $window.FindName('PresetsBtn')
+    $presetsPopup = $window.FindName('PresetsPopup')
+    $presetDefaultApps = $window.FindName('PresetDefaultApps')
+    $presetLastUsed = $window.FindName('PresetLastUsed')
+    $jsonPresetsPanel = $window.FindName('JsonPresetsPanel')
+    $presetsArrow = $window.FindName('PresetsArrow')
     $clearAppSelectionBtn = $window.FindName('ClearAppSelectionBtn')
+
+    # Load JSON-defined presets and build dynamic preset checkboxes
+    $script:JsonPresetCheckboxes = @()
+    foreach ($preset in (LoadAppPresetsFromJson)) {
+        $checkbox = New-Object System.Windows.Controls.CheckBox
+        $checkbox.Content = $preset.Name
+        $checkbox.IsThreeState = $true
+        $checkbox.Style = $window.Resources['PresetCheckBoxStyle']
+        $checkbox.SetValue([System.Windows.Automation.AutomationProperties]::NameProperty, $preset.Name)
+        Add-Member -InputObject $checkbox -MemberType NoteProperty -Name 'PresetAppIds' -Value $preset.AppIds
+        $jsonPresetsPanel.Children.Add($checkbox) | Out-Null
+        $script:JsonPresetCheckboxes += $checkbox
+
+        $checkbox.Add_Click({
+            if ($script:UpdatingPresets) { return }
+            $check = ($this.IsChecked -eq $true)
+            if ($this.IsChecked -eq $null) { $this.IsChecked = $false; $check = $false }
+            $presetIds = $this.PresetAppIds
+            ApplyPresetToApps -MatchFilter { param($c) $presetIds -contains $c.Tag }.GetNewClosure() -Check $check
+        })
+    }
     
     # Track the last selected checkbox for shift-click range selection
     $script:MainWindowLastSelectedCheckbox = $null
     
-    # Track current app loading operation to prevent race conditions
-    $script:CurrentAppLoadTimer = $null
-    $script:CurrentAppLoadJob = $null
-    $script:CurrentAppLoadJobStartTime = $null
+    # Guard flag: true while a load is in progress; prevents concurrent loads
+    $script:IsLoadingApps = $false
+    # Flag set when Default Mode is clicked before apps have finished loading
+    $script:PendingDefaultMode = $false
+    # Holds apps data preloaded before ShowDialog() so the first load skips the background job
+    $script:PreloadedAppData = $null
     
-    # Apply Tab UI Elements
-    $consoleOutput = $window.FindName('ConsoleOutput')
-    $consoleScrollViewer = $window.FindName('ConsoleScrollViewer')
-    $finishBtn = $window.FindName('FinishBtn')
-    $finishBtnText = $window.FindName('FinishBtnText')
-    
-    # Set script-level variables for Write-ToConsole function
-    $script:GuiConsoleOutput = $consoleOutput
-    $script:GuiConsoleScrollViewer = $consoleScrollViewer
+    # Set script-level variable for GUI window reference
     $script:GuiWindow = $window
 
-    # Updates app selection status text in the App Selection tab
+    # Guard flag to prevent preset handlers from firing when we update their state programmatically
+    $script:UpdatingPresets = $false
+
+    # Sort state for the app table
+    $script:SortColumn = 'Name'
+    $script:SortAscending = $true
+
+    function UpdateSortArrows {
+        $ease = New-Object System.Windows.Media.Animation.CubicEase
+        $ease.EasingMode = 'EaseOut'
+        $arrows = @{
+            'Name'        = $sortArrowName
+            'Description' = $sortArrowDescription
+            'AppId'       = $sortArrowAppId
+        }
+        foreach ($col in $arrows.Keys) {
+            $tb = $arrows[$col]
+            # Active column: full opacity, rotate to indicate direction (0 = up/asc, 180 = down/desc)
+            # Inactive columns: dim, reset to 0
+            if ($col -eq $script:SortColumn) {
+                $targetAngle = if ($script:SortAscending) { 0 } else { 180 }
+                $tb.Opacity = 1.0
+            } else {
+                $targetAngle = 0
+                $tb.Opacity = 0.3
+            }
+            $anim = New-Object System.Windows.Media.Animation.DoubleAnimation
+            $anim.To = $targetAngle
+            $anim.Duration = [System.Windows.Duration]::new([System.TimeSpan]::FromMilliseconds(200))
+            $anim.EasingFunction = $ease
+            $tb.RenderTransform.BeginAnimation([System.Windows.Media.RotateTransform]::AngleProperty, $anim)
+        }
+    }
+
+    function SortApps {
+        $children = @($appsPanel.Children)
+        $key = switch ($script:SortColumn) {
+            'Name'        { { $_.AppName } }
+            'Description' { { $_.AppDescription } }
+            'AppId'       { { $_.Tag } }
+        }
+        $sorted = $children | Sort-Object $key -Descending:(-not $script:SortAscending)
+        $appsPanel.Children.Clear()
+        foreach ($checkbox in $sorted) {
+            $appsPanel.Children.Add($checkbox) | Out-Null
+        }
+        UpdateSortArrows
+    }
+
+    function SetSortColumn($column) {
+        if ($script:SortColumn -eq $column) {
+            $script:SortAscending = -not $script:SortAscending
+        } else {
+            $script:SortColumn = $column
+            $script:SortAscending = $true
+        }
+        SortApps
+    }
+
     function UpdateAppSelectionStatus {
         $selectedCount = 0
         foreach ($child in $appsPanel.Children) {
@@ -243,6 +327,80 @@ function Show-MainWindow {
         $appSelectionStatus.Text = "$selectedCount app(s) selected for removal"
     }
 
+    # Applies a preset by checking/unchecking apps that match the given filter
+    # When -Exclusive is set, all apps are unchecked first so only matching apps end up selected
+    function ApplyPresetToApps {
+        param ( 
+            [scriptblock]$MatchFilter,
+            [bool]$Check,
+            [switch]$Exclusive
+        )
+        foreach ($child in $appsPanel.Children) {
+            if ($child -is [System.Windows.Controls.CheckBox]) {
+                if ($Exclusive) {
+                    $child.IsChecked = (& $MatchFilter $child)
+                } elseif (& $MatchFilter $child) {
+                    $child.IsChecked = $Check
+                }
+            }
+        }
+        UpdatePresetStates
+    }
+
+    # Update preset checkboxes to reflect checked/indeterminate/unchecked state
+    function UpdatePresetStates {
+        $script:UpdatingPresets = $true
+        try {
+            # Build a set of currently checked app tags for fast lookup
+            $checkedTags = @{}
+            foreach ($child in $appsPanel.Children) {
+                if ($child -is [System.Windows.Controls.CheckBox] -and $child.IsChecked) {
+                    $checkedTags[$child.Tag] = $true
+                }
+            }
+
+            # Helper: count matching and checked apps, set checkbox state
+            function SetPresetState($checkbox, [scriptblock]$MatchFilter) {
+                $total = 0; $checked = 0
+                foreach ($child in $appsPanel.Children) {
+                    if ($child -is [System.Windows.Controls.CheckBox]) {
+                        if (& $MatchFilter $child) {
+                            $total++
+                            if ($checkedTags.ContainsKey($child.Tag)) { $checked++ }
+                        }
+                    }
+                }
+                if ($total -eq 0) {
+                    $checkbox.IsChecked = $false
+                    $checkbox.IsEnabled = $false
+                } else {
+                    $checkbox.IsEnabled = $true
+                    if ($checked -eq 0) {
+                        $checkbox.IsChecked = $false
+                    } elseif ($checked -eq $total) {
+                        $checkbox.IsChecked = $true
+                    } else {
+                        $checkbox.IsChecked = [System.Nullable[bool]]$null
+                    }
+                }
+            }
+
+            SetPresetState $presetDefaultApps { param($c) $c.SelectedByDefault -eq $true }
+            foreach ($jsonCb in $script:JsonPresetCheckboxes) {
+                $localIds = $jsonCb.PresetAppIds
+                SetPresetState $jsonCb { param($c) $localIds -contains $c.Tag }.GetNewClosure()
+            }
+
+            # Last used preset: only update if it's visible (has saved apps)
+            if ($presetLastUsed.Visibility -ne 'Collapsed' -and $script:SavedAppIds) {
+                SetPresetState $presetLastUsed { param($c) $script:SavedAppIds -contains $c.Tag }
+            }
+        }
+        finally {
+            $script:UpdatingPresets = $false
+        }
+    }
+
     # Dynamically builds Tweaks UI from Features.json
     function BuildDynamicTweaks {
         $featuresJson = LoadJsonFile -filePath $script:FeaturesFilePath -expectedVersion "1.0"
@@ -317,7 +475,7 @@ function Show-MainWindow {
             $combo = New-Object System.Windows.Controls.ComboBox
             $combo.Name = $comboName
             $combo.SetValue([System.Windows.Automation.AutomationProperties]::NameProperty, $labelText)
-            foreach ($it in $items) { $cbItem = New-Object System.Windows.Controls.ComboBoxItem; $cbItem.Content = $it; $combo.Items.Add($cbItem) | Out-Null }
+            foreach ($item in $items) { $comboItem = New-Object System.Windows.Controls.ComboBoxItem; $comboItem.Content = $item; $combo.Items.Add($comboItem) | Out-Null }
             $combo.SelectedIndex = 0
             $parent.Children.Add($combo) | Out-Null
             
@@ -520,189 +678,243 @@ function Show-MainWindow {
                         try { $lblBorderObj = $window.FindName("$comboName`_LabelBorder") } catch {}
                         if ($lblBorderObj) { $lblBorderObj.ToolTip = $tipBlock }
                     }
-                    $script:UiControlMappings[$comboName] = @{ Type='feature'; FeatureId = $feature.FeatureId; Action = $feature.Action }
+                    $script:UiControlMappings[$comboName] = @{ Type='feature'; FeatureId = $feature.FeatureId; Action = $feature.Action; Label = $feature.Label }
                 }
             }
         }
+
+        # Build a feature-label lookup so GenerateOverview can resolve feature IDs without reloading JSON
+        $script:FeatureLabelLookup = @{}
+        foreach ($f in $featuresJson.Features) {
+            $script:FeatureLabelLookup[$f.FeatureId] = $f.Action + ' ' + $f.Label
+        }
     }
 
-    # Helper function to complete app loading with the WinGet list
+    # Helper function to load apps and populate the app list panel
     function script:LoadAppsWithList($listOfApps) {
-        $appsToAdd = LoadAppsDetailsFromJson -OnlyInstalled:$onlyInstalledAppsBox.IsChecked -InstalledList $listOfApps -InitialCheckedFromJson:$false
-
-        # Reset the last selected checkbox when loading a new list
         $script:MainWindowLastSelectedCheckbox = $null
 
-        # Sort apps alphabetically and add to panel
-        $appsToAdd | Sort-Object -Property FriendlyName | ForEach-Object {
-            $checkbox = New-Object System.Windows.Controls.CheckBox
-            $checkbox.SetValue([System.Windows.Automation.AutomationProperties]::NameProperty, $_.FriendlyName)
-            $checkbox.Tag = $_.AppId
-            $checkbox.IsChecked = $_.IsChecked
-            $checkbox.Style = $window.Resources["AppsPanelCheckBoxStyle"]
+        $loaderScriptPath = $script:LoadAppsDetailsScriptPath
+        $appsFilePath  = $script:AppsListFilePath
+        $onlyInstalled = [bool]$onlyInstalledAppsBox.IsChecked
 
-            # Build table row content: App Name | Description | App ID
-            $row = New-Object System.Windows.Controls.Grid
-            $c0 = New-Object System.Windows.Controls.ColumnDefinition; $c0.Width = [System.Windows.GridLength]::new(160)
-            $c1 = New-Object System.Windows.Controls.ColumnDefinition; $c1.Width = [System.Windows.GridLength]::new(1, [System.Windows.GridUnitType]::Star)
-            $c2 = New-Object System.Windows.Controls.ColumnDefinition; $c2.Width = [System.Windows.GridLength]::new(286)
-            $row.ColumnDefinitions.Add($c0); $row.ColumnDefinitions.Add($c1); $row.ColumnDefinitions.Add($c2)
-
-            $tbName = New-Object System.Windows.Controls.TextBlock
-            $tbName.Text = $_.FriendlyName
-            $tbName.Style = $window.Resources["AppNameTextStyle"]
-            [System.Windows.Controls.Grid]::SetColumn($tbName, 0)
-
-            $tbDesc = New-Object System.Windows.Controls.TextBlock
-            $tbDesc.Text = $_.Description
-            $tbDesc.Style = $window.Resources["AppDescTextStyle"]
-            $tbDesc.ToolTip = $_.Description
-            [System.Windows.Controls.Grid]::SetColumn($tbDesc, 1)
-
-            $tbId = New-Object System.Windows.Controls.TextBlock
-            $tbId.Text = $_.AppId
-            $tbId.Style = $window.Resources["AppIdTextStyle"]
-            $tbId.ToolTip = $_.AppId
-            [System.Windows.Controls.Grid]::SetColumn($tbId, 2)
-
-            $row.Children.Add($tbName) | Out-Null
-            $row.Children.Add($tbDesc) | Out-Null
-            $row.Children.Add($tbId) | Out-Null
-            $checkbox.Content = $row
-
-            # Store metadata in checkbox for later use
-            Add-Member -InputObject $checkbox -MemberType NoteProperty -Name "AppName" -Value $_.FriendlyName
-            Add-Member -InputObject $checkbox -MemberType NoteProperty -Name "AppDescription" -Value $_.Description
-            Add-Member -InputObject $checkbox -MemberType NoteProperty -Name "SelectedByDefault" -Value $_.SelectedByDefault
-            
-            # Add event handler to update status
-            $checkbox.Add_Checked({ UpdateAppSelectionStatus })
-            $checkbox.Add_Unchecked({ UpdateAppSelectionStatus })
-            
-            # Attach shift-click behavior for range selection
-            AttachShiftClickBehavior -checkbox $checkbox -appsPanel $appsPanel -lastSelectedCheckboxRef ([ref]$script:MainWindowLastSelectedCheckbox) -updateStatusCallback { UpdateAppSelectionStatus }
-            
-            $appsPanel.Children.Add($checkbox) | Out-Null
+        # Use preloaded data if available; otherwise load in background job
+        if (-not $onlyInstalled -and $script:PreloadedAppData) {
+            $rawAppData = $script:PreloadedAppData
+            $script:PreloadedAppData = $null
+        } else {
+            # Load apps details in a background job to keep the UI responsive
+            $rawAppData = Invoke-NonBlocking -ScriptBlock {
+                param($loaderScript, $appsListFilePath, $installedList, $onlyInstalled)
+                $script:AppsListFilePath = $appsListFilePath
+                . $loaderScript
+                LoadAppsDetailsFromJson -OnlyInstalled:$onlyInstalled -InstalledList $installedList -InitialCheckedFromJson:$false
+            } -ArgumentList $loaderScriptPath, $appsFilePath, $listOfApps, $onlyInstalled
         }
 
-        # Hide loading indicator and navigation blocker, update status
+        $appsToAdd = @($rawAppData | Where-Object { $_ -and ($_.AppId -or $_.FriendlyName) } | Sort-Object -Property FriendlyName)
+
         $loadingAppsIndicator.Visibility = 'Collapsed'
 
+        if ($appsToAdd.Count -eq 0) {
+            $window.FindName('DeploymentApplyBtn').IsEnabled = $true
+            return
+        }
+
+        $brushSafe    = [System.Windows.Media.BrushConverter]::new().ConvertFromString('#4CAF50')
+        $brushUnsafe  = [System.Windows.Media.BrushConverter]::new().ConvertFromString('#F44336')
+        $brushDefault = [System.Windows.Media.BrushConverter]::new().ConvertFromString('#FFC107')
+        $brushSafe.Freeze(); $brushUnsafe.Freeze(); $brushDefault.Freeze()
+
+        # Create WPF controls; pump the Dispatcher every batch so the spinner keeps animating.
+        $batchSize = 20
+        for ($i = 0; $i -lt $appsToAdd.Count; $i++) {
+            $app = $appsToAdd[$i]
+
+            $checkbox = New-Object System.Windows.Controls.CheckBox
+            $automationName = if ($app.FriendlyName) { $app.FriendlyName } elseif ($app.AppId) { $app.AppId } else { $null }
+            if ($automationName) { $checkbox.SetValue([System.Windows.Automation.AutomationProperties]::NameProperty, $automationName) }
+            $checkbox.Tag       = $app.AppId
+            $checkbox.IsChecked = $app.IsChecked
+            $checkbox.Style     = $window.Resources['AppsPanelCheckBoxStyle']
+
+            # Build table row: Recommendation dot | Name | Description | App ID
+            $row = New-Object System.Windows.Controls.Grid
+            $row.Style = $window.Resources['AppTableRowStyle']
+            $c0 = New-Object System.Windows.Controls.ColumnDefinition; $c0.Width = $window.Resources['AppTableDotColWidth']
+            $c1 = New-Object System.Windows.Controls.ColumnDefinition; $c1.Width = $window.Resources['AppTableNameColWidth']
+            $c2 = New-Object System.Windows.Controls.ColumnDefinition; $c2.Width = $window.Resources['AppTableDescColWidth']
+            $c3 = New-Object System.Windows.Controls.ColumnDefinition; $c3.Width = $window.Resources['AppTableIdColWidth']
+            $row.ColumnDefinitions.Add($c0); $row.ColumnDefinitions.Add($c1)
+            $row.ColumnDefinitions.Add($c2); $row.ColumnDefinitions.Add($c3)
+
+            $dot = New-Object System.Windows.Shapes.Ellipse
+            $dot.Style = $window.Resources['AppRecommendationDotStyle']
+            $dot.Fill  = switch ($app.Recommendation) { 'safe' { $brushSafe } 'unsafe' { $brushUnsafe } default { $brushDefault } }
+            $dot.ToolTip = switch ($app.Recommendation) {
+                'safe'   { '[Recommended] Safe to remove for most users' }
+                'unsafe' { '[Not Recommended] Only remove if you know what you are doing' }
+                default  { "[Optional] Remove if you don't need this app" }
+            }
+            [System.Windows.Controls.Grid]::SetColumn($dot, 0)
+
+            $tbName = New-Object System.Windows.Controls.TextBlock
+            $tbName.Text  = $app.FriendlyName
+            $tbName.Style = $window.Resources['AppNameTextStyle']
+            [System.Windows.Controls.Grid]::SetColumn($tbName, 1)
+
+            $tbDesc = New-Object System.Windows.Controls.TextBlock
+            $tbDesc.Text    = $app.Description
+            $tbDesc.Style   = $window.Resources['AppDescTextStyle']
+            $tbDesc.ToolTip = $app.Description
+            [System.Windows.Controls.Grid]::SetColumn($tbDesc, 2)
+
+            $tbId = New-Object System.Windows.Controls.TextBlock
+            $tbId.Text    = $app.AppId
+            $tbId.Style   = $window.Resources['AppIdTextStyle']
+            $tbId.ToolTip = $app.AppId
+            [System.Windows.Controls.Grid]::SetColumn($tbId, 3)
+
+            $row.Children.Add($dot)    | Out-Null
+            $row.Children.Add($tbName) | Out-Null
+            $row.Children.Add($tbDesc) | Out-Null
+            $row.Children.Add($tbId)   | Out-Null
+            $checkbox.Content = $row
+
+            Add-Member -InputObject $checkbox -MemberType NoteProperty -Name 'AppName'          -Value $app.FriendlyName
+            Add-Member -InputObject $checkbox -MemberType NoteProperty -Name 'AppDescription'   -Value $app.Description
+            Add-Member -InputObject $checkbox -MemberType NoteProperty -Name 'SelectedByDefault' -Value $app.SelectedByDefault
+
+            $checkbox.Add_Checked({ UpdateAppSelectionStatus })
+            $checkbox.Add_Unchecked({ UpdateAppSelectionStatus })
+            AttachShiftClickBehavior -checkbox $checkbox -appsPanel $appsPanel `
+                -lastSelectedCheckboxRef ([ref]$script:MainWindowLastSelectedCheckbox) `
+                -updateStatusCallback { UpdateAppSelectionStatus }
+
+            $appsPanel.Children.Add($checkbox) | Out-Null
+
+            if (($i + 1) % $batchSize -eq 0) { DoEvents }
+        }
+
+        SortApps
+
+        # If Default Mode was clicked while apps were still loading, apply defaults now
+        if ($script:PendingDefaultMode) {
+            $script:PendingDefaultMode = $false
+            ApplyPresetToApps -MatchFilter { param($c) $c.SelectedByDefault -eq $true } -Exclusive
+        }
+        
         UpdateAppSelectionStatus
+
+        # Re-enable Apply button now that the full, correctly-checked app list is ready
+        $window.FindName('DeploymentApplyBtn').IsEnabled = $true
     }
 
     # Loads apps into the UI
     function LoadAppsIntoMainUI {
-        # Cancel any existing load operation to prevent race conditions
-        if ($script:CurrentAppLoadTimer -and $script:CurrentAppLoadTimer.IsEnabled) {
-            $script:CurrentAppLoadTimer.Stop()
-        }
-        if ($script:CurrentAppLoadJob) {
-            Remove-Job -Job $script:CurrentAppLoadJob -Force -ErrorAction SilentlyContinue
-        }
-        $script:CurrentAppLoadTimer = $null
-        $script:CurrentAppLoadJob = $null
-        $script:CurrentAppLoadJobStartTime = $null
-        
-        # Show loading indicator and navigation blocker, clear existing apps immediately
+        # Prevent concurrent loads
+        if ($script:IsLoadingApps) { return }
+        $script:IsLoadingApps = $true
+
+        # Show loading indicator and clear existing apps
         $loadingAppsIndicator.Visibility = 'Visible'
         $appsPanel.Children.Clear()
-        
+
+        # Disable Apply button while apps are loading so it can't be clicked with a partial list
+        $window.FindName('DeploymentApplyBtn').IsEnabled = $false
+
         # Update navigation buttons to disable Next/Previous
         UpdateNavigationButtons
-        
-        # Force UI to update and render all changes (loading indicator, blocker, disabled buttons)
-        $window.Dispatcher.Invoke([System.Windows.Threading.DispatcherPriority]::Render, [action]{})
-        
-        # Schedule the actual loading work to run after UI has updated
-        $window.Dispatcher.BeginInvoke([System.Windows.Threading.DispatcherPriority]::Background, [action]{
-            $listOfApps = ""
 
-            if ($onlyInstalledAppsBox.IsChecked -and ($script:WingetInstalled -eq $true)) {
-                # Start job to get list of installed apps via WinGet (async helper)
-                $asyncJob = GetInstalledAppsViaWinget -Async
-                $script:CurrentAppLoadJob = $asyncJob.Job
-                $script:CurrentAppLoadJobStartTime = $asyncJob.StartTime
-                
-                # Create timer to poll job status without blocking UI
-                $script:CurrentAppLoadTimer = New-Object System.Windows.Threading.DispatcherTimer
-                $script:CurrentAppLoadTimer.Interval = [TimeSpan]::FromMilliseconds(100)
-                
-                $script:CurrentAppLoadTimer.Add_Tick({
-                    # Check if this timer was cancelled (another load started)
-                    if (-not $script:CurrentAppLoadJob -or -not $script:CurrentAppLoadTimer -or -not $script:CurrentAppLoadJobStartTime) {
-                        if ($script:CurrentAppLoadTimer) { $script:CurrentAppLoadTimer.Stop() }
-                        return
-                    }
-                    
-                    $elapsed = (Get-Date) - $script:CurrentAppLoadJobStartTime
-                    
-                    # Check if job is complete or timed out (10 seconds)
-                    if ($script:CurrentAppLoadJob.State -eq 'Completed') {
-                        $script:CurrentAppLoadTimer.Stop()
-                        $listOfApps = Receive-Job -Job $script:CurrentAppLoadJob
-                        Remove-Job -Job $script:CurrentAppLoadJob -ErrorAction SilentlyContinue
-                        $script:CurrentAppLoadJob = $null
-                        $script:CurrentAppLoadTimer = $null
-                        $script:CurrentAppLoadJobStartTime = $null
-                        
-                        # Continue with loading apps
-                        LoadAppsWithList $listOfApps
-                    }
-                    elseif ($elapsed.TotalSeconds -gt 10 -or $script:CurrentAppLoadJob.State -eq 'Failed') {
-                        $script:CurrentAppLoadTimer.Stop()
-                        Remove-Job -Job $script:CurrentAppLoadJob -Force -ErrorAction SilentlyContinue
-                        $script:CurrentAppLoadJob = $null
-                        $script:CurrentAppLoadTimer = $null
-                        $script:CurrentAppLoadJobStartTime = $null
-                        
-                        # Show error that the script was unable to get list of apps from WinGet
+        # Force a render so the loading indicator is visible, then schedule the
+        # actual loading at Background priority so this call returns immediately.
+        # This is critical when called from Add_Loaded: the window must finish
+        # its initialization before we start a nested message pump via DoEvents.
+        $window.Dispatcher.Invoke([System.Windows.Threading.DispatcherPriority]::Render, [action]{})
+        $window.Dispatcher.BeginInvoke([System.Windows.Threading.DispatcherPriority]::Background, [action]{
+            try {
+                $listOfApps = ""
+
+                if ($onlyInstalledAppsBox.IsChecked -and ($script:WingetInstalled -eq $true)) {
+                    $listOfApps = GetInstalledAppsViaWinget -TimeOut 10 -NonBlocking
+
+                    if ($null -eq $listOfApps) {
                         Show-MessageBox -Message 'Unable to load list of installed apps via WinGet.' -Title 'Error' -Button 'OK' -Icon 'Error' | Out-Null
                         $onlyInstalledAppsBox.IsChecked = $false
-                        
-                        # Continue with loading all apps (unchecked now)
-                        LoadAppsWithList ""
                     }
-                })
-                
-                $script:CurrentAppLoadTimer.Start()
-                return  # Exit here, timer will continue the work
-            }
+                }
 
-            # If checkbox is not checked or winget not installed, load all apps immediately
-            LoadAppsWithList $listOfApps
+                LoadAppsWithList $listOfApps
+            }
+            finally {
+                $script:IsLoadingApps = $false
+            }
         }) | Out-Null
     }
 
     # Event handlers for app selection
     $onlyInstalledAppsBox.Add_Checked({
-        LoadAppsIntoMainUI 
+        LoadAppsIntoMainUI
     })
     $onlyInstalledAppsBox.Add_Unchecked({
-        LoadAppsIntoMainUI 
+        LoadAppsIntoMainUI
     })
 
-    # Quick selection buttons - only select apps actually in those categories
-    $defaultAppsBtn.Add_Click({
-        foreach ($child in $appsPanel.Children) {
-            if ($child -is [System.Windows.Controls.CheckBox]) {
-                if ($child.SelectedByDefault -eq $true) {
-                    $child.IsChecked = $true
-                } else {
-                    $child.IsChecked = $false
-                }
-            }
+    # Animate arrow when popup opens/closes, and lazily update preset states
+    $presetsPopup.Add_Opened({
+        UpdatePresetStates
+        $animation = New-Object System.Windows.Media.Animation.DoubleAnimation
+        $animation.To = 180
+        $animation.Duration = [System.Windows.Duration]::new([System.TimeSpan]::FromMilliseconds(200))
+        $animation.EasingFunction = New-Object System.Windows.Media.Animation.CubicEase
+        $animation.EasingFunction.EasingMode = 'EaseOut'
+        $presetsArrow.RenderTransform.BeginAnimation([System.Windows.Media.RotateTransform]::AngleProperty, $animation)
+    })
+    $presetsPopup.Add_Closed({
+        $animation = New-Object System.Windows.Media.Animation.DoubleAnimation
+        $animation.To = 0
+        $animation.Duration = [System.Windows.Duration]::new([System.TimeSpan]::FromMilliseconds(200))
+        $animation.EasingFunction = New-Object System.Windows.Media.Animation.CubicEase
+        $animation.EasingFunction.EasingMode = 'EaseOut'
+        $presetsArrow.RenderTransform.BeginAnimation([System.Windows.Media.RotateTransform]::AngleProperty, $animation)
+        $presetsBtn.IsChecked = $false
+    })
+
+    # Close popup when clicking anywhere outside the popup or the presets button.
+    $window.Add_PreviewMouseDown({
+        if (-not $presetsPopup.IsOpen) { return }
+        if ($presetsPopup.Child -ne $null -and $presetsPopup.Child.IsMouseOver) { return }
+        $src = $_.OriginalSource -as [System.Windows.DependencyObject]
+        if ($src -ne $null) {
+            $inBtn = $presetsBtn.IsAncestorOf($src) -or [System.Object]::ReferenceEquals($presetsBtn, $src)
+            if (-not $inBtn) { $presetsPopup.IsOpen = $false }
         }
     })
 
+    # Toggle popup on button click
+    $presetsBtn.Add_Click({
+        $presetsPopup.IsOpen = -not $presetsPopup.IsOpen
+        $presetsBtn.IsChecked = $presetsPopup.IsOpen
+    })
+
+    # Preset: Default selection
+    $presetDefaultApps.Add_Click({
+        if ($script:UpdatingPresets) { return }
+        $check = ($this.IsChecked -eq $true)
+        if ($this.IsChecked -eq $null) { $this.IsChecked = $false; $check = $false }
+        ApplyPresetToApps -MatchFilter { param($c) $c.SelectedByDefault -eq $true } -Check $check
+    })
+
+    # Clear selection button + reset all preset checkboxes
     $clearAppSelectionBtn.Add_Click({
-        foreach ($child in $appsPanel.Children) {
-            if ($child -is [System.Windows.Controls.CheckBox]) {
-                $child.IsChecked = $false
-            }
-        }
+        ApplyPresetToApps -MatchFilter { param($c) $true } -Check $false
     })
 
+    # Column header sort handlers
+    $headerNameBtn.Add_MouseLeftButtonUp({ SetSortColumn 'Name' })
+    $headerDescriptionBtn.Add_MouseLeftButtonUp({ SetSortColumn 'Description' })
+    $headerAppIdBtn.Add_MouseLeftButtonUp({ SetSortColumn 'AppId' })
+
     # Helper function to scroll to an item if it's not visible, centering it in the viewport
     function ScrollToItemIfNotVisible {
         param (
@@ -838,7 +1050,7 @@ function Show-MainWindow {
             # The 17px accounts for the scrollbar width + some padding
             $tweakSearchBorder.Margin = [System.Windows.Thickness]::new(0, 0, 17, 0)
         } else {
-            $tweakSearchBorder.Margin = [System.Windows.Thickness]::new(0, 0, 0, 0)
+            $tweakSearchBorder.Margin = [System.Windows.Thickness]::new(0)
         }
     })
     
@@ -972,8 +1184,7 @@ function Show-MainWindow {
         $totalTabs = $tabControl.Items.Count
         
         $homeIndex = 0
-        $overviewIndex = $totalTabs - 2
-        $applyIndex = $totalTabs - 1
+        $overviewIndex = $totalTabs - 1
 
         # Navigation button visibility
         if ($currentIndex -eq $homeIndex) {
@@ -982,26 +1193,20 @@ function Show-MainWindow {
         } elseif ($currentIndex -eq $overviewIndex) {
             $nextBtn.Visibility = 'Collapsed'
             $previousBtn.Visibility = 'Visible'
-        } elseif ($currentIndex -eq $applyIndex) {
-            $nextBtn.Visibility = 'Collapsed'
-            $previousBtn.Visibility = 'Collapsed'
         } else {
             $nextBtn.Visibility = 'Visible'
             $previousBtn.Visibility = 'Visible'
         }
         
         # Update progress indicators
-        # Tab indices: 0=Home, 1=App Removal, 2=Tweaks, 3=Overview, 4=Apply
-        $blueColor = "#0067c0"
-        $greyColor = "#808080"
-        
+        # Tab indices: 0=Home, 1=App Removal, 2=Tweaks, 3=Deployment Settings
         $progressIndicator1 = $window.FindName('ProgressIndicator1') # App Removal
         $progressIndicator2 = $window.FindName('ProgressIndicator2') # Tweaks
-        $progressIndicator3 = $window.FindName('ProgressIndicator3') # Overview
+        $progressIndicator3 = $window.FindName('ProgressIndicator3') # Deployment Settings
         $bottomNavGrid = $window.FindName('BottomNavGrid')
         
-        # Hide bottom navigation on home page and apply tab
-        if ($currentIndex -eq 0 -or $currentIndex -eq $applyIndex) {
+        # Hide bottom navigation on home page
+        if ($currentIndex -eq 0) {
             $bottomNavGrid.Visibility = 'Collapsed'
         } else {
             $bottomNavGrid.Visibility = 'Visible'
@@ -1010,23 +1215,23 @@ function Show-MainWindow {
         # Update indicator colors based on current tab
         # Indicator 1 (App Removal) - tab index 1
         if ($currentIndex -ge 1) {
-            $progressIndicator1.Fill = $blueColor
+            $progressIndicator1.Fill = $window.Resources['ProgressActiveColor']
         } else {
-            $progressIndicator1.Fill = $greyColor
+            $progressIndicator1.Fill = $window.Resources['ProgressInactiveColor']
         }
         
         # Indicator 2 (Tweaks) - tab index 2
         if ($currentIndex -ge 2) {
-            $progressIndicator2.Fill = $blueColor
+            $progressIndicator2.Fill = $window.Resources['ProgressActiveColor']
         } else {
-            $progressIndicator2.Fill = $greyColor
+            $progressIndicator2.Fill = $window.Resources['ProgressInactiveColor']
         }
         
-        # Indicator 3 (Overview) - tab index 3
+        # Indicator 3 (Deployment Settings) - tab index 3
         if ($currentIndex -ge 3) {
-            $progressIndicator3.Fill = $blueColor
+            $progressIndicator3.Fill = $window.Resources['ProgressActiveColor']
         } else {
-            $progressIndicator3.Fill = $greyColor
+            $progressIndicator3.Fill = $window.Resources['ProgressInactiveColor']
         }
     }
 
@@ -1045,7 +1250,7 @@ function Show-MainWindow {
                 $appRemovalScopeCombo.SelectedIndex = 0
             }
             1 { 
-                $userSelectionDescription.Text = "Changes will be applied to a different user profile on this system."
+                $userSelectionDescription.Text = "Changes will be applied to a different user profile on this system. Note: changes may not apply correctly if the target user is currently logged in."
                 $otherUserPanel.Visibility = 'Visible'
                 $usernameValidationMessage.Text = ""
                 # Hide "Current user only" option, show "Target user only" option
@@ -1111,8 +1316,8 @@ function Show-MainWindow {
 
         $username = $otherUsernameTextBox.Text.Trim()
 
-        $errorBrush = [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#c42b1c"))
-        $successBrush = [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#28a745"))
+        $errorBrush   = $window.Resources['ValidationErrorColor']
+        $successBrush = $window.Resources['ValidationSuccessColor']
 
         if ($username.Length -eq 0) {
             $usernameValidationMessage.Text = "[X] Please enter a username"
@@ -1140,11 +1345,6 @@ function Show-MainWindow {
     }
 
     function GenerateOverview {
-        # Load Features.json
-        $featuresJson = LoadJsonFile -filePath $script:FeaturesFilePath -expectedVersion "1.0"
-        $overviewChangesPanel = $window.FindName('OverviewChangesPanel')
-        $overviewChangesPanel.Children.Clear()
-        
         $changesList = @()
         
         # Collect selected apps
@@ -1155,7 +1355,7 @@ function Show-MainWindow {
             }
         }
         if ($selectedAppsCount -gt 0) {
-            $changesList += "Remove $selectedAppsCount selected application(s)"
+            $changesList += "Remove $selectedAppsCount application(s)"
         }
         
         # Update app removal scope section based on whether apps are selected
@@ -1194,45 +1394,45 @@ function Show-MainWindow {
                         # For combobox: SelectedIndex 0 = No Change, so subtract 1 to index into Values
                         $selectedValue = $mapping.Values[$control.SelectedIndex - 1]
                         foreach ($fid in $selectedValue.FeatureIds) {
-                            $feature = $featuresJson.Features | Where-Object { $_.FeatureId -eq $fid }
-                            if ($feature) { $changesList += ($feature.Action + ' ' + $feature.Label) }
+                            $label = $script:FeatureLabelLookup[$fid]
+                            if ($label) { $changesList += $label }
                         }
                     }
                     elseif ($mapping.Type -eq 'feature') {
-                        $feature = $featuresJson.Features | Where-Object { $_.FeatureId -eq $mapping.FeatureId }
-                        if ($feature) { $changesList += ($feature.Action + ' ' + $feature.Label) }
+                        $label = $script:FeatureLabelLookup[$mapping.FeatureId]
+                        if (-not $label) { $label = $mapping.Action + ' ' + $mapping.Label }
+                        $changesList += $label
                     }
                 }
             }
         }
         
-        if ($changesList.Count -eq 0) {
-            $textBlock = New-Object System.Windows.Controls.TextBlock
-            $textBlock.Text = "No changes selected"
-            $textBlock.Style = $window.Resources["OverviewNoChangesTextStyle"]
-            $overviewChangesPanel.Children.Add($textBlock) | Out-Null
-        }
-        else {
-            foreach ($change in $changesList) {
-                $bullet = New-Object System.Windows.Controls.TextBlock
-                $bullet.Text = "- $change"
-                $bullet.Style = $window.Resources["OverviewChangeBulletStyle"]
-                $overviewChangesPanel.Children.Add($bullet) | Out-Null
-            }
-        }
+        return $changesList
     }
 
-    $previousBtn.Add_Click({        
+    function ShowChangesOverview {
+        $changesList = GenerateOverview
+
+        if ($changesList.Count -eq 0) {
+            Show-MessageBox -Message 'No changes have been selected.' -Title 'Selected Changes' -Button 'OK' -Icon 'Information'
+            return
+        }
+
+        $message = ($changesList | ForEach-Object { "$([char]0x2022) $_" }) -join "`n"
+        Show-MessageBox -Message $message -Title 'Selected Changes' -Button 'OK' -Icon 'None' -Width 600
+    }
+
+    $previousBtn.Add_Click({
+        Hide-Bubble -Immediate
         if ($tabControl.SelectedIndex -gt 0) {
             $tabControl.SelectedIndex--
             UpdateNavigationButtons
         }
     })
 
-    $nextBtn.Add_Click({        
+    $nextBtn.Add_Click({
         if ($tabControl.SelectedIndex -lt ($tabControl.Items.Count - 1)) {
             $tabControl.SelectedIndex++
-            
             UpdateNavigationButtons
         }
     })
@@ -1254,26 +1454,40 @@ function Show-MainWindow {
             ApplySettingsToUiControls -window $window -settingsJson $defaultsJson -uiControlMappings $script:UiControlMappings
         }
 
-        # Select default apps
-        foreach ($child in $appsPanel.Children) {
-            if ($child -is [System.Windows.Controls.CheckBox]) {
-                $child.IsChecked = ($child.SelectedByDefault -eq $true)
-            }
+        # Deselect all apps, then select default apps (defer if apps are still loading in the background)
+        if ($script:IsLoadingApps) {
+            $script:PendingDefaultMode = $true
+        } else {
+            ApplyPresetToApps -MatchFilter { param($c) $c.SelectedByDefault -eq $true } -Exclusive
         }
 
-        # Navigate directly to the Overview tab
+        # Navigate directly to the Deployment Settings tab
         $tabControl.SelectedIndex = 3
         UpdateNavigationButtons
+
+        # Show contextual hint bubble for the Review Changes link
+        $window.Dispatcher.BeginInvoke([System.Windows.Threading.DispatcherPriority]::Loaded, [action]{
+            Show-Bubble -TargetControl $reviewChangesBtn -Message 'View the selected changes here'
+        }) | Out-Null
     })
 
-    # Handle Overview Apply Changes button - validates and immediately starts applying changes
-    $overviewApplyBtn = $window.FindName('OverviewApplyBtn')
-    $overviewApplyBtn.Add_Click({
+    # Handle Review Changes link button
+    $reviewChangesBtn = $window.FindName('ReviewChangesBtn')
+    $reviewChangesBtn.Add_Click({
+        Hide-Bubble
+        ShowChangesOverview
+    })
+
+    # Handle Apply Changes button - validates and immediately starts applying changes
+    $deploymentApplyBtn = $window.FindName('DeploymentApplyBtn')
+    $deploymentApplyBtn.Add_Click({
         if (-not (ValidateOtherUsername)) {
             Show-MessageBox -Message "Please enter a valid username." -Title "Invalid Username" -Button 'OK' -Icon 'Warning' | Out-Null
             return
         }
 
+        Hide-Bubble -Immediate
+
         # App Removal - collect selected apps from integrated UI
         $selectedApps = @()
         foreach ($child in $appsPanel.Children) {
@@ -1375,53 +1589,30 @@ function Show-MainWindow {
         
         # Store selected user mode
         switch ($userSelectionCombo.SelectedIndex) {
-            1 { AddParameter User ($otherUsernameTextBox.Text.Trim()) }
-            2 { AddParameter Sysprep }
+            0 { 
+                Write-Host "Selected user mode: current user ($(GetUserName))"
+            }
+            1 { 
+                Write-Host "Selected user mode: $($otherUsernameTextBox.Text.Trim())"
+                AddParameter User ($otherUsernameTextBox.Text.Trim()) 
+            }
+            2 {
+                Write-Host "Selected user mode: default user profile (Sysprep)"
+                AddParameter Sysprep
+            }
         }
 
         SaveSettings
 
-        # Navigate to Apply tab (last tab) and start applying changes
-        $tabControl.SelectedIndex = $tabControl.Items.Count - 1
-        
-        # Clear console and set initial status
-        $consoleOutput.Text = ""
+        # Check if user wants to restart explorer
+        $restartExplorerCheckBox = $window.FindName('RestartExplorerCheckBox')
+        $shouldRestartExplorer = $restartExplorerCheckBox -and $restartExplorerCheckBox.IsChecked
 
-        Write-ToConsole "Applying changes to $(if ($script:Params.ContainsKey("Sysprep")) { "default user template" } else { "user $(GetUserName)" })"
-        Write-ToConsole "Total changes to apply: $totalChanges"
-        Write-ToConsole ""
-        
-        # Run changes in background to keep UI responsive
-        $window.Dispatcher.BeginInvoke([System.Windows.Threading.DispatcherPriority]::Background, [action]{
-            try {
-                ExecuteAllChanges
-                
-                # Check if user wants to restart explorer (from checkbox)
-                $restartExplorerCheckBox = $window.FindName('RestartExplorerCheckBox')
-                if ($restartExplorerCheckBox -and $restartExplorerCheckBox.IsChecked -and -not $script:CancelRequested) {
-                    RestartExplorer
-                }
-                
-                Write-ToConsole ""
-                if ($script:CancelRequested) {
-                    Write-ToConsole "Script execution was cancelled by the user. Some changes may not have been applied."
-                } else {
-                    Write-ToConsole "All changes have been applied. Please check the output above for any errors."
-                }
-                
-                $finishBtn.Dispatcher.Invoke([action]{
-                    $finishBtn.IsEnabled = $true
-                    $finishBtnText.Text = "Close Win11Debloat"
-                })
-            }
-            catch {
-                Write-ToConsole "Error: $($_.Exception.Message)"
-                $finishBtn.Dispatcher.Invoke([action]{
-                    $finishBtn.IsEnabled = $true
-                    $finishBtnText.Text = "Close Win11Debloat"
-                })
-            }
-        })
+        # Show the apply changes window
+        Show-ApplyModal -Owner $window -RestartExplorer $shouldRestartExplorer
+
+        # Close the main window after the apply dialog closes
+        $window.Close()
     })
 
     # Initialize UI elements on window load
@@ -1484,7 +1675,6 @@ function Show-MainWindow {
 
     # Handle Load Last Used settings and Load Last Used apps
     $loadLastUsedBtn = $window.FindName('LoadLastUsedBtn')
-    $loadLastUsedAppsBtn = $window.FindName('LoadLastUsedAppsBtn')
 
     $lastUsedSettingsJson = LoadJsonFile -filePath $script:SavedSettingsFilePath -expectedVersion "1.0" -optionalFile
 
@@ -1513,28 +1703,24 @@ function Show-MainWindow {
         $loadLastUsedBtn.Visibility = 'Collapsed'
     }
 
-    # Show option to load last used apps if they exist
+    # Preset: Last used selection (wired to PresetLastUsed checkbox)
     if ($appsSetting -and $appsSetting.ToString().Trim().Length -gt 0) {
-        $loadLastUsedAppsBtn.Add_Click({
-            try {
-                $savedApps = @()
-                if ($appsSetting -is [string]) { $savedApps = $appsSetting.Split(',') }
-                elseif ($appsSetting -is [array]) { $savedApps = $appsSetting }
-                $savedApps = $savedApps | ForEach-Object { $_.Trim() } | Where-Object { $_ -ne '' }
+        # Parse and store saved app IDs for UpdatePresetStates
+        $script:SavedAppIds = @()
+        if ($appsSetting -is [string]) { $script:SavedAppIds = $appsSetting.Split(',') }
+        elseif ($appsSetting -is [array]) { $script:SavedAppIds = $appsSetting }
+        $script:SavedAppIds = $script:SavedAppIds | ForEach-Object { $_.Trim() } | Where-Object { $_ -ne '' }
 
-                foreach ($child in $appsPanel.Children) {
-                    if ($child -is [System.Windows.Controls.CheckBox]) {
-                        if ($savedApps -contains $child.Tag) { $child.IsChecked = $true } else { $child.IsChecked = $false }
-                    }
-                }
-            }
-            catch {
-                Show-MessageBox -Message "Failed to load last used app selection: $_" -Title "Error" -Button 'OK' -Icon 'Error'
-            }
+        $presetLastUsed.Add_Click({
+            if ($script:UpdatingPresets) { return }
+            $check = ($this.IsChecked -eq $true)
+            if ($this.IsChecked -eq $null) { $this.IsChecked = $false; $check = $false }
+            ApplyPresetToApps -MatchFilter { param($c) $script:SavedAppIds -contains $c.Tag } -Check $check
         })
     }
     else {
-        $loadLastUsedAppsBtn.Visibility = 'Collapsed'
+        $script:SavedAppIds = $null
+        $presetLastUsed.Visibility = 'Collapsed'
     }
 
     # Clear All Tweaks button
@@ -1551,19 +1737,16 @@ function Show-MainWindow {
                     $control.SelectedIndex = 0
                 }
             }
-        } 
-
-        # Also uncheck RestorePointCheckBox
-        $restorePointCheckBox = $window.FindName('RestorePointCheckBox')
-        if ($restorePointCheckBox) {
-            $restorePointCheckBox.IsChecked = $false
         }
     })
-    
-    # Finish (Close Win11Debloat) button handler
-    $finishBtn.Add_Click({
-        $window.Close()
-    })
+
+    # Preload app data to speed up loading when user navigates to App Removal tab
+    try {
+        $script:PreloadedAppData = LoadAppsDetailsFromJson -OnlyInstalled:$false -InstalledList '' -InitialCheckedFromJson:$false
+    }
+    catch {
+        Write-Warning "Failed to preload apps list: $_"
+    }
 
     # Show the window
     return $window.ShowDialog()

Scripts/GUI/Show-MessageBox.ps1

@@ -16,7 +16,10 @@ function Show-MessageBox {
         [string]$Icon = 'None',
         
         [Parameter(Mandatory=$false)]
-        [System.Windows.Window]$Owner = $null
+        [System.Windows.Window]$Owner = $null,
+        
+        [Parameter(Mandatory=$false)]
+        [int]$Width = 0
     )
     
     Add-Type -AssemblyName PresentationFramework,PresentationCore,WindowsBase | Out-Null
@@ -28,11 +31,15 @@ function Show-MessageBox {
     
     # Show overlay if owner window exists
     $overlay = $null
+    $overlayWasAlreadyVisible = $false
     if ($ownerWindow) {
         try {
             $overlay = $ownerWindow.FindName('ModalOverlay')
             if ($overlay) {
-                $ownerWindow.Dispatcher.Invoke([action]{ $overlay.Visibility = 'Visible' })
+                $overlayWasAlreadyVisible = ($overlay.Visibility -eq 'Visible')
+                if (-not $overlayWasAlreadyVisible) {
+                    $ownerWindow.Dispatcher.Invoke([action]{ $overlay.Visibility = 'Visible' })
+                }
             }
         }
         catch { }
@@ -56,6 +63,11 @@ function Show-MessageBox {
         catch { }
     }
     
+    # Apply custom width if specified
+    if ($Width -gt 0) {
+        $msgWindow.Width = $Width
+    }
+    
     # Apply theme resources
     SetWindowThemeResources -window $msgWindow -usesDarkMode $usesDarkMode
     
@@ -142,8 +154,8 @@ function Show-MessageBox {
     # Show dialog and return result from Tag
     $msgWindow.ShowDialog() | Out-Null
     
-    # Hide overlay after dialog closes
-    if ($overlay) {
+    # 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' })
         }

Scripts/Get.ps1

@@ -29,14 +29,17 @@ param (
     [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,
@@ -54,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,
@@ -121,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,Logs | 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 ""
@@ -140,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) {
@@ -161,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
 
@@ -175,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,Logs | Remove-Item -Recurse -Force
+    Get-ChildItem -Path "$env:TEMP/Win11Debloat" -Exclude CustomAppsList,LastUsedSettings.json,Win11Debloat.log,Win11Debloat-Run.log,Config,Logs | Remove-Item -Recurse -Force
 }
 
 Write-Output ""

Scripts/Helpers/AddParameter.ps1

@@ -0,0 +1,15 @@
+# Add parameter to script and write to file
+function AddParameter {
+    param (
+        $parameterName,
+        $value = $true
+    )
+
+    # Add parameter or update its value if key already exists
+    if (-not $script:Params.ContainsKey($parameterName)) {
+        $script:Params.Add($parameterName, $value)
+    }
+    else {
+        $script:Params[$parameterName] = $value
+    }
+}

Scripts/Helpers/CheckIfUserExists.ps1

@@ -0,0 +1,32 @@
+function CheckIfUserExists {
+    param (
+        $userName
+    )
+
+    if ($userName -match '[<>:"|?*]') {
+        return $false
+    }
+
+    if ([string]::IsNullOrWhiteSpace($userName)) {
+        return $false
+    }
+
+    try {
+        $userExists = Test-Path "$env:SystemDrive\Users\$userName"
+
+        if ($userExists) {
+            return $true
+        }
+
+        $userExists = Test-Path ($env:USERPROFILE -Replace ('\\' + $env:USERNAME + '$'), "\$userName")
+
+        if ($userExists) {
+            return $true
+        }
+    }
+    catch {
+        Write-Error "Something went wrong when trying to find the user directory path for user $userName. Please ensure the user exists on this system"
+    }
+
+    return $false
+}

Scripts/Helpers/CheckModernStandbySupport.ps1

@@ -0,0 +1,27 @@
+# Check if this machine supports S0 Modern Standby power state. Returns true if S0 Modern Standby is supported, false otherwise.
+function CheckModernStandbySupport {
+    $count = 0
+
+    try {
+        switch -Regex (powercfg /a) {
+            ':' {
+                $count += 1
+            }
+
+            '(.*S0.{1,}\))' {
+                if ($count -eq 1) {
+                    return $true
+                }
+            }
+        }
+    }
+    catch {
+        Write-Host "Error: Unable to check for S0 Modern Standby support, powercfg command failed" -ForegroundColor Red
+        Write-Host ""
+        Write-Host "Press any key to continue..."
+        $null = [System.Console]::ReadKey()
+        return $true
+    }
+
+    return $false
+}

Scripts/Helpers/GenerateAppsList.ps1

@@ -0,0 +1,20 @@
+# Generates a list of apps to remove based on the Apps parameter
+function GenerateAppsList {
+    if (-not ($script:Params["Apps"] -and $script:Params["Apps"] -is [string])) {
+        return @()
+    }
+
+    $appMode = $script:Params["Apps"].toLower()
+
+    switch ($appMode) {
+        'default' {
+            $appsList = LoadAppsFromFile $script:AppsListFilePath
+            return $appsList
+        }
+        default {
+            $appsList = $script:Params["Apps"].Split(',') | ForEach-Object { $_.Trim() }
+            $validatedAppsList = ValidateAppslist $appsList
+            return $validatedAppsList
+        }
+    }
+}

Scripts/Helpers/GetFriendlyTargetUserName.ps1

@@ -0,0 +1,9 @@
+function GetFriendlyTargetUserName {
+    $target = GetTargetUserForAppRemoval
+
+    switch ($target) {
+        "AllUsers" { return "all users" }
+        "CurrentUser" { return "the current user" }
+        default { return "user $target" }
+    }
+}

Scripts/Helpers/GetTargetUserForAppRemoval.ps1

@@ -0,0 +1,9 @@
+# Target is determined from $script:Params["AppRemovalTarget"] or defaults to "AllUsers"
+# Target values: "AllUsers" (removes for all users + from image), "CurrentUser", or a specific username
+function GetTargetUserForAppRemoval {
+    if ($script:Params.ContainsKey("AppRemovalTarget")) {
+        return $script:Params["AppRemovalTarget"]
+    }
+    
+    return "AllUsers"
+}

Scripts/Helpers/GetUserDirectory.ps1

@@ -0,0 +1,36 @@
+# Returns the directory path of the specified user, exits script if user path can't be found
+function GetUserDirectory {
+    param (
+        $userName,
+        $fileName = "",
+        $exitIfPathNotFound = $true
+    )
+
+    try {
+        if (-not (CheckIfUserExists -userName $userName) -and $userName -ne "*") {
+            Write-Error "User $userName does not exist on this system"
+            AwaitKeyToExit
+        }
+
+        $userDirectoryExists = Test-Path "$env:SystemDrive\Users\$userName"
+        $userPath = "$env:SystemDrive\Users\$userName\$fileName"
+
+        if ((Test-Path $userPath) -or ($userDirectoryExists -and (-not $exitIfPathNotFound))) {
+            return $userPath
+        }
+
+        $userDirectoryExists = Test-Path ($env:USERPROFILE -Replace ('\\' + $env:USERNAME + '$'), "\$userName")
+        $userPath = $env:USERPROFILE -Replace ('\\' + $env:USERNAME + '$'), "\$userName\$fileName"
+
+        if ((Test-Path $userPath) -or ($userDirectoryExists -and (-not $exitIfPathNotFound))) {
+            return $userPath
+        }
+    }
+    catch {
+        Write-Error "Something went wrong when trying to find the user directory path for user $userName. Please ensure the user exists on this system"
+        AwaitKeyToExit
+    }
+
+    Write-Error "Unable to find user directory path for user $userName"
+    AwaitKeyToExit
+}

Scripts/Helpers/GetUserName.ps1

@@ -0,0 +1,7 @@
+function GetUserName {
+    if ($script:Params.ContainsKey("User")) {
+        return $script:Params.Item("User")
+    }
+
+    return $env:USERNAME
+}

Scripts/Threading/DoEvents.ps1

@@ -0,0 +1,16 @@
+# Processes all pending WPF window messages (input, render, etc.) to keep the UI responsive
+# during long-running operations on the UI thread. Equivalent to Application.DoEvents().
+function DoEvents {
+    if (-not $script:GuiWindow) { return }
+    $frame = [System.Windows.Threading.DispatcherFrame]::new()
+    $null = [System.Windows.Threading.Dispatcher]::CurrentDispatcher.BeginInvoke(
+        [System.Windows.Threading.DispatcherPriority]::Background,
+        [System.Windows.Threading.DispatcherOperationCallback]{
+            param($f)
+            $f.Continue = $false
+            return $null
+        },
+        $frame
+    )
+    $null = [System.Windows.Threading.Dispatcher]::PushFrame($frame)
+}

Scripts/Threading/Invoke-NonBlocking.ps1

@@ -0,0 +1,55 @@
+# Runs a scriptblock in a background PowerShell runspace while keeping the UI responsive.
+# In GUI mode, the work executes on a separate thread and the UI thread pumps messages (~60fps).
+# In CLI mode, the scriptblock runs directly in the current session.
+function Invoke-NonBlocking {
+    param(
+        [scriptblock]$ScriptBlock,
+        [object[]]$ArgumentList = @(),
+        [int]$TimeoutSeconds = 0
+    )
+
+    # CLI mode without timeout: run directly in-process
+    if (-not $script:GuiWindow -and $TimeoutSeconds -eq 0) {
+        return (& $ScriptBlock @ArgumentList)
+    }
+
+    $ps = [powershell]::Create()
+    try {
+        $null = $ps.AddScript($ScriptBlock.ToString())
+        foreach ($arg in $ArgumentList) {
+            $null = $ps.AddArgument($arg)
+        }
+
+        $handle = $ps.BeginInvoke()
+
+        if ($script:GuiWindow) {
+            # GUI mode: pump UI messages while waiting
+            $stopwatch = if ($TimeoutSeconds -gt 0) { [System.Diagnostics.Stopwatch]::StartNew() } else { $null }
+
+            while (-not $handle.IsCompleted) {
+                if ($stopwatch -and $stopwatch.Elapsed.TotalSeconds -ge $TimeoutSeconds) {
+                    $ps.Stop()
+                    throw "Operation timed out after $TimeoutSeconds seconds"
+                }
+                DoEvents
+                Start-Sleep -Milliseconds 16
+            }
+        }
+        else {
+            # CLI mode with timeout: block until completion or timeout
+            if (-not $handle.AsyncWaitHandle.WaitOne($TimeoutSeconds * 1000)) {
+                $ps.Stop()
+                throw "Operation timed out after $TimeoutSeconds seconds"
+            }
+        }
+
+        $result = $ps.EndInvoke($handle)
+
+        if ($result.Count -eq 0) { return $null }
+        if ($result.Count -eq 1) { return $result[0] }
+        return @($result)
+    }
+    finally {
+        $ps.Dispose()
+    }
+}