Refactor feature handling, update format in Features.json

.github/CONTRIBUTING.md

@@ -77,7 +77,7 @@ Win11Debloat/
 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.
+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.

README.md

@@ -97,23 +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)
-- Prevent AI service (WSAIFabricSvc) from starting automatically. (W11 only)
-- Disable AI Features in Edge. (W11 only)
-- Disable AI Features in Paint. (W11 only)
-- Disable AI Features in Notepad. (W11 only)
+- 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
 
@@ -129,49 +129,49 @@ Below is an overview of the key features and functionality offered by Win11Deblo
 
 #### Start Menu & Search
 
-- Remove or replace all pinned apps from the start menu. (W11 only)
-- Hide the recommended section in the start menu. (W11 only)
-- Hide the 'All Apps' section in the start menu. (W11 only)
-- Disable the Phone Link mobile devices integration in the start menu. (W11 only)
+- 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 Microsoft Store app suggestions in Windows search. (W11 only)
-- Disable Search Highlights (dynamic/branded content) in the taskbar search box. (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
 

Schemas/AboutWindow.xaml

@@ -8,7 +8,7 @@
         WindowStyle="None"
         AllowsTransparency="True"
         Background="Transparent"
-        Topmost="True"
+        Topmost="False"
         ShowInTaskbar="False">
 
     <Border BorderBrush="{DynamicResource BorderColor}" 

Schemas/AppSelectionWindow.xaml

@@ -9,55 +9,6 @@
         Background="Transparent"
         Foreground="{DynamicResource FgColor}">
     <Window.Resources>
-        <!-- CheckBox Style -->
-        <Style TargetType="CheckBox">
-            <Setter Property="Foreground" Value="{DynamicResource FgColor}"/>
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="Padding" Value="4,2"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="CheckBox">
-                        <Border Background="{TemplateBinding Background}" BorderThickness="0" CornerRadius="4" Padding="{TemplateBinding Padding}">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="*"/>
-                                </Grid.ColumnDefinitions>
-                                <Border x:Name="CheckBoxBorder" Grid.Column="0" Width="18" Height="18" Background="{DynamicResource CheckBoxBgColor}" BorderBrush="{DynamicResource CheckBoxBorderColor}" BorderThickness="1" CornerRadius="4" Margin="0,0,8,0">
-                                    <TextBlock x:Name="CheckMark" Text="&#xE73E;" FontFamily="Segoe MDL2 Assets" FontSize="12" Foreground="{DynamicResource ButtonBg}" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="Collapsed"/>
-                                </Border>
-                                <ContentPresenter Grid.Column="1" VerticalAlignment="Center" Margin="0,0,0,1"/>
-                            </Grid>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="CheckBoxBorder" Property="Background" Value="{DynamicResource CheckBoxHoverColor}"/>
-                            </Trigger>
-                            <Trigger Property="IsChecked" Value="True">
-                                <Setter TargetName="CheckMark" Property="Visibility" Value="Visible"/>
-                                <Setter TargetName="CheckBoxBorder" Property="Background" Value="{DynamicResource ButtonBg}"/>
-                                <Setter TargetName="CheckBoxBorder" Property="BorderBrush" Value="{DynamicResource ButtonBg}"/>
-                                <Setter TargetName="CheckMark" Property="Foreground" Value="White"/>
-                            </Trigger>
-                            <MultiTrigger>
-                                <MultiTrigger.Conditions>
-                                    <Condition Property="IsMouseOver" Value="True"/>
-                                    <Condition Property="IsChecked" Value="True"/>
-                                </MultiTrigger.Conditions>
-                                <Setter TargetName="CheckBoxBorder" Property="Background" Value="{DynamicResource ButtonHover}"/>
-                                <Setter TargetName="CheckBoxBorder" Property="BorderBrush" Value="{DynamicResource ButtonHover}"/>
-                            </MultiTrigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-        <!-- CheckBox style for apps panels -->
-        <Style x:Key="AppsPanelCheckBoxStyle" TargetType="CheckBox" BasedOn="{StaticResource {x:Type CheckBox}}">
-            <Setter Property="Margin" Value="2,3,2,3"/>
-        </Style>
-        
         <!-- Title Bar Button Style -->
         <Style x:Key="TitleBarButton" TargetType="Button">
             <Setter Property="Background" Value="Transparent"/>

Schemas/ApplyChangesWindow.xaml

@@ -8,7 +8,7 @@
         WindowStyle="None"
         AllowsTransparency="True"
         Background="Transparent"
-        Topmost="True"
+        Topmost="False"
         ShowInTaskbar="False">
 
     <Border BorderBrush="{DynamicResource BorderColor}" 
@@ -180,20 +180,20 @@
                     <StackPanel x:Name="ButtonPanel"
                                 Orientation="Horizontal"
                                 HorizontalAlignment="Center">
-                        <Button x:Name="ApplyKofiBtn" Width="210" Height="32" 
+                        <Button x:Name="ApplyKofiBtn"
+                                Width="200" Height="32" Margin="4,0"
                                 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" 
+                        <Button x:Name="ApplyCloseBtn"
+                                Content="Close"
+                                Width="200" Height="32" Margin="4,0"
                                 Style="{DynamicResource PrimaryButtonStyle}"
-                                AutomationProperties.Name="Close">
-                            <TextBlock Text="Close" VerticalAlignment="Center" FontSize="14" Margin="0,0,0,1"/>
-                        </Button>
+                                AutomationProperties.Name="Close"/>
                     </StackPanel>
                 </Border>
             </StackPanel>

Schemas/BubbleHint.xaml

@@ -0,0 +1,51 @@
+<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>
+
+    <Grid Grid.Row="0"
+        Margin="10,10,10,8">
+      <Border Name="BubbleBorder"
+          Background="{DynamicResource CardBgColor}"
+          BorderBrush="{DynamicResource ButtonBorderColor}"
+          BorderThickness="1"
+          CornerRadius="8"
+          Padding="10,7,10,7">
+        <Border.Effect>
+          <DropShadowEffect BlurRadius="9"
+                    Opacity="0.16"
+                    ShadowDepth="2"
+                    Direction="270"
+                    Color="Black"/>
+        </Border.Effect>
+        <TextBlock Name="BubbleText"
+               Text="View the selected changes here"
+               TextWrapping="Wrap"
+               MaxWidth="260"
+               Foreground="{DynamicResource FgColor}"/>
+      </Border>
+    </Grid>
+
+    <Grid Grid.Row="1"
+          HorizontalAlignment="Center"
+        Margin="0,-9,0,0"
+        Panel.ZIndex="1"
+          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/ImportExportConfigWindow.xaml

@@ -0,0 +1,77 @@
+<Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="Select Settings to Import/Export"
+        Width="440"
+        SizeToContent="Height"
+        MaxHeight="501"
+        ResizeMode="NoResize"
+        WindowStartupLocation="CenterOwner"
+        WindowStyle="None"
+        AllowsTransparency="True"
+        Background="Transparent"
+        Topmost="False"
+        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="*"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+
+            <!-- Title Bar -->
+            <Grid Grid.Row="0" x:Name="TitleBar" Height="40" Background="Transparent">
+                <TextBlock x:Name="TitleText"
+                           Foreground="{DynamicResource FgColor}"
+                           FontSize="16"
+                           FontWeight="SemiBold"
+                           VerticalAlignment="Center"
+                           Margin="16,0,0,0"/>
+            </Grid>
+
+            <!-- Content -->
+            <StackPanel Grid.Row="1" x:Name="ContentPanel" Margin="20,12,20,9">
+                <TextBlock x:Name="PromptText"
+                           TextWrapping="Wrap"
+                           FontSize="14"
+                           LineHeight="20"
+                           Foreground="{DynamicResource FgColor}"
+                           Margin="0,0,0,14"/>
+                <!-- Checkboxes are added dynamically at runtime -->
+                <StackPanel x:Name="CheckboxPanel"/>
+            </StackPanel>
+
+            <!-- Button Footer -->
+            <Border Grid.Row="2"
+                    Background="{DynamicResource BgColor}"
+                    BorderBrush="{DynamicResource BorderColor}"
+                    BorderThickness="0,1,0,0"
+                    Padding="16,12"
+                    CornerRadius="0,0,8,8">
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                    <Button x:Name="OkButton"
+                            Content="OK"
+                            Height="32" MinWidth="80" Margin="4,0"
+                            Style="{DynamicResource PrimaryButtonStyle}"/>
+                    <Button x:Name="CancelButton"
+                            Content="Cancel"
+                            Height="32" MinWidth="80" Margin="4,0"
+                            Style="{DynamicResource SecondaryButtonStyle}"/>
+                </StackPanel>
+            </Border>
+        </Grid>
+    </Border>
+</Window>

Schemas/MainWindow.xaml

@@ -11,6 +11,16 @@
         Background="Transparent"
         Foreground="{DynamicResource FgColor}">
     <Window.Resources>
+        <!-- Sort column header hover style -->
+        <Style x:Key="SortHeaderBtnStyle" TargetType="StackPanel">
+            <Setter Property="Opacity" Value="1.0"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <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}"/>
@@ -99,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">
@@ -323,70 +336,6 @@
             </Style.Triggers>
         </Style>
 
-        <!-- CheckBox Style -->
-        <Style TargetType="CheckBox">
-            <Setter Property="Foreground" Value="{DynamicResource FgColor}"/>
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="Padding" Value="4,2"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="CheckBox">
-                        <Border Background="{TemplateBinding Background}" BorderThickness="0" CornerRadius="4" Padding="{TemplateBinding Padding}">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <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"/>
-                                </Border>
-                                <ContentPresenter Grid.Column="1" VerticalAlignment="Center" Margin="0,0,0,2"/>
-                            </Grid>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="CheckBoxBorder" Property="Background" Value="{DynamicResource CheckBoxHoverColor}"/>
-                            </Trigger>
-                            <Trigger Property="IsChecked" Value="True">
-                                <Setter TargetName="CheckMark" Property="Visibility" Value="Visible"/>
-                                <Setter TargetName="CheckBoxBorder" Property="Background" Value="{DynamicResource ButtonBg}"/>
-                                <Setter TargetName="CheckBoxBorder" Property="BorderBrush" Value="{DynamicResource ButtonBg}"/>
-                                <Setter TargetName="CheckMark" 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}"/>
-                                <Setter Property="Foreground" Value="{DynamicResource ButtonTextDisabled}"/>
-                                <Setter Property="Opacity" Value="0.6"/>
-                                <Setter TargetName="CheckMark" Property="Foreground" Value="{DynamicResource ButtonTextDisabled}"/>
-                            </Trigger>
-                            <MultiTrigger>
-                                <MultiTrigger.Conditions>
-                                    <Condition Property="IsMouseOver" Value="True"/>
-                                    <Condition Property="IsChecked" Value="True"/>
-                                </MultiTrigger.Conditions>
-                                <Setter TargetName="CheckBoxBorder" Property="Background" Value="{DynamicResource ButtonHover}"/>
-                                <Setter TargetName="CheckBoxBorder" Property="BorderBrush" Value="{DynamicResource ButtonHover}"/>
-                            </MultiTrigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-        <!-- CheckBox style for feature toggles -->
-        <Style x:Key="FeatureCheckboxStyle" TargetType="CheckBox" BasedOn="{StaticResource {x:Type CheckBox}}">
-            <Setter Property="Margin" Value="-4,-2,-4,10"/>
-            <Setter Property="Padding" Value="4,2"/>
-        </Style>
-
-        <!-- CheckBox style for apps panels -->
-        <Style x:Key="AppsPanelCheckBoxStyle" TargetType="CheckBox" BasedOn="{StaticResource {x:Type CheckBox}}">
-            <Setter Property="Margin" Value="2,3,2,3"/>
-            <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-            <Setter Property="VerticalContentAlignment" Value="Center"/>
-        </Style>
-
         <!-- TextBlock style for App ID column in apps table -->
         <Style x:Key="AppIdTextStyle" TargetType="TextBlock">
             <Setter Property="Foreground" Value="{DynamicResource AppIdColor}"/>
@@ -407,10 +356,32 @@
             <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>
+
+        <!-- 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>
+
+        <!-- Container style for each dynamically-created app table row -->
+        <Style x:Key="AppTableRowStyle" TargetType="Grid">
+            <Setter Property="Margin" Value="0,1,0,0"/>
+        </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">
@@ -450,10 +421,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>
@@ -480,16 +451,23 @@
             <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 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>
             </Setter>
@@ -583,6 +561,29 @@
                             <Button x:Name="MenuBtn" Content="&#xE700;" FontFamily="Segoe Fluent Icons" FontSize="15" Style="{StaticResource TitlebarButton}" ToolTip="Options" AutomationProperties.Name="Options">
                                 <Button.ContextMenu>
                                     <ContextMenu x:Name="MainMenu">
+                                        <ContextMenu.Resources>
+                                            <Style x:Key="{x:Static MenuItem.SeparatorStyleKey}" TargetType="Separator">
+                                                <Setter Property="Margin" Value="4,6"/>
+                                                <Setter Property="Template">
+                                                    <Setter.Value>
+                                                        <ControlTemplate TargetType="Separator">
+                                                            <Border Height="1" Background="{DynamicResource BorderColor}" SnapsToDevicePixels="True" HorizontalAlignment="Stretch"/>
+                                                        </ControlTemplate>
+                                                    </Setter.Value>
+                                                </Setter>
+                                            </Style>
+                                        </ContextMenu.Resources>
+                                        <MenuItem x:Name="ImportConfigBtn" Header="Import config" AutomationProperties.Name="Import configuration">
+                                            <MenuItem.Icon>
+                                                <TextBlock Text="&#xe838;" FontFamily="Segoe Fluent Icons" FontSize="16" Foreground="{DynamicResource FgColor}"/>
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                        <MenuItem x:Name="ExportConfigBtn" Header="Export config" AutomationProperties.Name="Export configuration">
+                                            <MenuItem.Icon>
+                                                <TextBlock Text="&#xe74e;" FontFamily="Segoe Fluent Icons" FontSize="16" Foreground="{DynamicResource FgColor}"/>
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                        <Separator />
                                         <MenuItem x:Name="MenuDocumentation" Header="Documentation" AutomationProperties.Name="Documentation">
                                             <MenuItem.Icon>
                                                 <TextBlock Text="&#xe736;" FontFamily="Segoe MDL2 Assets" FontSize="16" Foreground="{DynamicResource FgColor}"/>
@@ -687,6 +688,11 @@
                                     </StackPanel>
                                 </Button>
                             </StackPanel>
+
+                            <!-- Revert link -->
+                            <Button x:Name="HomeRevertLinkBtn" HorizontalAlignment="Center" Margin="0,11,0,0" Style="{DynamicResource ActionLinkButtonStyle}" AutomationProperties.Name="Revert previous changes">
+                                <TextBlock Text="Revert previous changes" Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Button}}"/>
+                            </Button>
                         </StackPanel>
                     </Grid>
                 </TabItem>
@@ -710,9 +716,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="{DynamicResource SecondaryButtonStyle}" Height="32" Padding="10,0" Margin="0,0,10,0" AutomationProperties.Name="Select Default Apps"/>
-                                        <Button x:Name="LoadLastUsedAppsBtn" Content="Select Last Used Selection" ToolTip="Select the apps that were selected the last time Win11Debloat was run" Style="{DynamicResource SecondaryButtonStyle}" Height="32" Padding="10,0" Margin="0,0,10,0" AutomationProperties.Name="Select Last Used Selection"/>
+                                        <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"/>
@@ -754,15 +811,31 @@
                                 </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 -->
@@ -772,7 +845,26 @@
                                             <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>
@@ -954,12 +1046,12 @@
 
                                                 <!-- 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)"/>
+                                                    <CheckBox x:Name="RestorePointCheckBox" Style="{DynamicResource 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"/>
+                                                    <CheckBox x:Name="RestartExplorerCheckBox" Style="{DynamicResource 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>
@@ -988,20 +1080,8 @@
 
                             <!-- Review & Apply Section -->
                             <StackPanel Grid.Row="1" HorizontalAlignment="Stretch" Background="{DynamicResource BgColor}">
-                                <Button x:Name="ReviewChangesBtn" Background="Transparent" BorderThickness="0" Cursor="Hand" HorizontalAlignment="Center" Margin="0,4,0,8" AutomationProperties.Name="Review selected changes">
-                                    <Button.Template>
-                                        <ControlTemplate TargetType="Button">
-                                            <TextBlock x:Name="LinkText" Text="Review selected changes" FontSize="14" Foreground="{DynamicResource ButtonBg}" FontWeight="SemiBold" HorizontalAlignment="Center"/>
-                                            <ControlTemplate.Triggers>
-                                                <Trigger Property="IsMouseOver" Value="True">
-                                                    <Setter TargetName="LinkText" Property="Foreground" Value="{DynamicResource ButtonHover}"/>
-                                                </Trigger>
-                                                <Trigger Property="IsPressed" Value="True">
-                                                    <Setter TargetName="LinkText" Property="Foreground" Value="{DynamicResource ButtonPressed}"/>
-                                                </Trigger>
-                                            </ControlTemplate.Triggers>
-                                        </ControlTemplate>
-                                    </Button.Template>
+                                <Button x:Name="ReviewChangesBtn" Style="{DynamicResource ActionLinkButtonStyle}" HorizontalAlignment="Center" Margin="0,4,0,10" AutomationProperties.Name="Review selected changes">
+                                    <TextBlock Text="Review selected changes" Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Button}}"/>
                                 </Button>
                                 <Button x:Name="DeploymentApplyBtn" Style="{DynamicResource PrimaryButtonStyle}" Width="190" Height="44" HorizontalAlignment="Center" AutomationProperties.Name="Apply Changes">
                                     <StackPanel Orientation="Horizontal" VerticalAlignment="Center">

Schemas/MessageBoxWindow.xaml

@@ -3,13 +3,13 @@
         Title="MessageBox" 
         Width="440"
         SizeToContent="Height"
-        MaxHeight="500"
+        MaxHeight="501"
         ResizeMode="NoResize"
         WindowStartupLocation="CenterOwner"
         WindowStyle="None"
         AllowsTransparency="True"
         Background="Transparent"
-        Topmost="True"
+        Topmost="False"
         ShowInTaskbar="False">
 
     <Border BorderBrush="{DynamicResource BorderColor}" 

Schemas/RevertSettingsWindow.xaml

@@ -0,0 +1,160 @@
+<Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="Revert Changes"
+        Width="620"
+        Height="620"
+        MinWidth="560"
+        MinHeight="420"
+        ResizeMode="CanResize"
+        WindowStartupLocation="CenterOwner"
+        WindowStyle="None"
+        AllowsTransparency="True"
+        Background="Transparent"
+        Topmost="False"
+        ShowInTaskbar="False">
+
+    <Window.Resources>
+        <Style x:Key="RevertItemBorderStyle" TargetType="Border">
+            <Setter Property="BorderThickness" Value="0,0,0,1"/>
+            <Setter Property="BorderBrush" Value="{DynamicResource BorderColor}"/>
+            <Setter Property="Padding" Value="4,6,4,6"/>
+        </Style>
+
+        <Style x:Key="RevertItemRowStyle" TargetType="StackPanel">
+            <Setter Property="Orientation" Value="Vertical"/>
+        </Style>
+
+        <Style x:Key="RevertItemUndoTextStyle" TargetType="TextBlock">
+            <Setter Property="Foreground" Value="{DynamicResource FgColor}"/>
+            <Setter Property="Opacity" Value="0.75"/>
+            <Setter Property="Margin" Value="26,-8,0,3"/>
+            <Setter Property="FontSize" Value="12"/>
+            <Setter Property="TextWrapping" Value="Wrap"/>
+        </Style>
+
+        <Style x:Key="RevertEmptyTextStyle" TargetType="TextBlock">
+            <Setter Property="Foreground" Value="{DynamicResource FgColor}"/>
+            <Setter Property="Opacity" Value="0.85"/>
+            <Setter Property="Margin" Value="6,0,6,0"/>
+            <Setter Property="TextWrapping" Value="Wrap"/>
+        </Style>
+    </Window.Resources>
+
+    <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="Auto"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+
+            <Grid Grid.Row="0" x:Name="TitleBar" Height="40" Background="Transparent">
+                <TextBlock x:Name="TitleText" 
+                           Text="Revert Changes" 
+                           Foreground="{DynamicResource FgColor}"
+                           FontSize="16"
+                           FontWeight="SemiBold"
+                           VerticalAlignment="Center" 
+                           Margin="16,0,0,0"/>
+            </Grid>
+
+            <StackPanel Grid.Row="1" Margin="20,12,1,12">
+                    <TextBlock x:Name="MessageText"
+                               Grid.Column="1"
+                               Text="Select which previously applied tweaks should be reverted to Windows defaults."
+                               TextWrapping="Wrap"
+                               FontSize="14"
+                               LineHeight="20"
+                               Foreground="{DynamicResource FgColor}"
+                               VerticalAlignment="Center"/>
+            </StackPanel>
+
+            <Grid Grid.Row="2" Margin="20,0,20,10">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+
+                <DockPanel Grid.Row="0" Margin="0,0,0,8">
+                    <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
+                        <Button x:Name="RevertSelectAllBtn"
+                                Content="Select All"
+                                Height="30"
+                                Padding="12,0"
+                                Style="{DynamicResource SecondaryButtonStyle}"
+                                Margin="0,0,8,0"
+                                AutomationProperties.Name="Select All"/>
+                        <Button x:Name="RevertClearBtn"
+                                Content="Clear"
+                                Height="30"
+                                Padding="12,0"
+                                Style="{DynamicResource SecondaryButtonStyle}"
+                                AutomationProperties.Name="Clear"/>
+                    </StackPanel>
+                    <TextBlock x:Name="RevertSelectionCount"
+                               Text="0 settings selected"
+                               Foreground="{DynamicResource FgColor}"
+                               VerticalAlignment="Center"
+                               HorizontalAlignment="Right"
+                               DockPanel.Dock="Right"
+                               Margin="0,0,6,0"/>
+                </DockPanel>
+
+                <Border Grid.Row="1"
+                        BorderThickness="1"
+                        BorderBrush="{DynamicResource BorderColor}"
+                        CornerRadius="6"
+                        Background="{DynamicResource BgColor}">
+                    <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" Padding="8" Margin="0,1,1,1">
+                        <StackPanel x:Name="RevertItemsPanel"/>
+                    </ScrollViewer>
+                </Border>
+
+                <CheckBox x:Name="RevertRestartExplorerCheckBox"
+                            Grid.Row="2"
+                            Content="Restart the Windows Explorer process to apply all changes immediately"
+                            IsChecked="False"
+                            Margin="2,10,0,0"
+                            AutomationProperties.Name="Restart the Windows Explorer process to apply all changes immediately"/>
+            </Grid>
+
+            <!-- Button Panel -->
+            <Border Grid.Row="3" 
+                    Background="{DynamicResource BgColor}"
+                    BorderBrush="{DynamicResource BorderColor}"
+                    BorderThickness="0,1,0,0"
+                    Padding="16,12"
+                    CornerRadius="0,0,8,8">
+                <StackPanel x:Name="ButtonPanel"
+                            Orientation="Horizontal"
+                            HorizontalAlignment="Right">
+                    <Button x:Name="RevertApplyBtn" 
+                            Content="Revert Selected Settings"
+                            Height="32" MinWidth="200" Margin="4,0"
+                            Style="{DynamicResource PrimaryButtonStyle}"
+                            IsEnabled="False"
+                            AutomationProperties.Name="Revert Selected Settings"/>
+                    <Button x:Name="RevertCancelBtn"
+                            Content="Cancel"
+                            Height="32" MinWidth="80" Margin="4,0"
+                            Style="{DynamicResource SecondaryButtonStyle}"
+                            AutomationProperties.Name="Cancel"/>
+                </StackPanel>
+            </Border>
+        </Grid>
+    </Border>
+</Window>

Schemas/SharedStyles.xaml

@@ -18,7 +18,7 @@
                             BorderThickness="{TemplateBinding BorderThickness}"
                             CornerRadius="4"
                             Padding="{TemplateBinding Padding}">
-                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,0,1"/>
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
@@ -90,6 +90,32 @@
         </Style.Triggers>
     </Style>
 
+    <!-- Shared link-style button used for text actions like review/revert links -->
+    <Style x:Key="ActionLinkButtonStyle" TargetType="Button">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Foreground" Value="{DynamicResource ButtonBg}"/>
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Foreground" Value="{DynamicResource ButtonHover}"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Foreground" Value="{DynamicResource ButtonPressed}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
     <!-- ProgressBar Style -->
     <Style x:Key="ApplyProgressBarStyle" TargetType="ProgressBar">
         <Setter Property="Background" Value="{DynamicResource ButtonBorderColor}"/>
@@ -125,6 +151,138 @@
         <Setter Property="TextAlignment" Value="Center"/>
     </Style>
 
+    <!-- Base CheckBox style used across windows -->
+    <Style TargetType="CheckBox">
+        <Setter Property="Foreground" Value="{DynamicResource FgColor}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Padding" Value="4,2"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CheckBox">
+                    <Border Background="{TemplateBinding Background}" BorderThickness="0" CornerRadius="4" Padding="{TemplateBinding Padding}">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <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">
+                                <Grid>
+                                    <TextBlock x:Name="CheckMark" Text="&#xE73E;" FontFamily="Segoe Fluent Icons" FontSize="12" Foreground="{DynamicResource ButtonBg}" HorizontalAlignment="Center" VerticalAlignment="Center" Opacity="0">
+                                        <TextBlock.Clip>
+                                            <RectangleGeometry x:Name="CheckMarkClip" Rect="0,0,0,16"/>
+                                        </TextBlock.Clip>
+                                    </TextBlock>
+                                    <TextBlock x:Name="IndeterminateMark" Text="&#xE738;" FontFamily="Segoe Fluent Icons" FontSize="11" Foreground="{DynamicResource ButtonBg}" HorizontalAlignment="Center" VerticalAlignment="Center" Opacity="0" Margin="1,1,0,0">
+                                        <TextBlock.Clip>
+                                            <RectangleGeometry x:Name="IndeterminateMarkClip" Rect="0,0,0,16"/>
+                                        </TextBlock.Clip>
+                                    </TextBlock>
+                                </Grid>
+                            </Border>
+                            <ContentPresenter Grid.Column="1" VerticalAlignment="Center" Margin="0,0,0,2"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="CheckBoxBorder" Property="Background" Value="{DynamicResource CheckBoxHoverColor}"/>
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="CheckBoxBorder" Property="Background" Value="{DynamicResource ButtonBg}"/>
+                            <Setter TargetName="CheckBoxBorder" Property="BorderBrush" Value="{DynamicResource ButtonBg}"/>
+                            <Setter TargetName="CheckMark" Property="Foreground" Value="White"/>
+                            <Setter TargetName="CheckMark" Property="Opacity" Value="1"/>
+                            <Setter TargetName="IndeterminateMark" Property="Opacity" Value="0"/>
+                            <Trigger.EnterActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="CheckMark" Storyboard.TargetProperty="Opacity" To="1" Duration="0:0:0.25" FillBehavior="HoldEnd"/>
+                                        <RectAnimation Storyboard.TargetName="CheckMarkClip" Storyboard.TargetProperty="Rect" From="0,0,0,16" To="0,0,16,16" Duration="0:0:0.25" FillBehavior="HoldEnd"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <RectAnimation Storyboard.TargetName="CheckMarkClip" Storyboard.TargetProperty="Rect" From="0,0,16,16" To="16,0,0,16" Duration="0:0:0.15" FillBehavior="HoldEnd"/>
+                                        <DoubleAnimation Storyboard.TargetName="CheckMark" Storyboard.TargetProperty="Opacity" To="0" Duration="0:0:0.15" FillBehavior="HoldEnd"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.ExitActions>
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="{x:Null}">
+                            <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"/>
+                            <Setter TargetName="IndeterminateMark" Property="Opacity" Value="1"/>
+                            <Setter TargetName="CheckMark" Property="Opacity" Value="0"/>
+                            <Trigger.EnterActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="IndeterminateMark" Storyboard.TargetProperty="Opacity" To="1" Duration="0:0:0.25" FillBehavior="HoldEnd"/>
+                                        <RectAnimation Storyboard.TargetName="IndeterminateMarkClip" Storyboard.TargetProperty="Rect" From="0,0,0,16" To="0,0,16,16" Duration="0:0:0.25" FillBehavior="HoldEnd"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <RectAnimation Storyboard.TargetName="IndeterminateMarkClip" Storyboard.TargetProperty="Rect" From="0,0,16,16" To="16,0,0,16" Duration="0:0:0.15" FillBehavior="HoldEnd"/>
+                                        <DoubleAnimation Storyboard.TargetName="IndeterminateMark" Storyboard.TargetProperty="Opacity" To="0" Duration="0:0:0.15" FillBehavior="HoldEnd"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.ExitActions>
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="False">
+                            <Setter TargetName="CheckMark" Property="Opacity" Value="0"/>
+                            <Setter TargetName="IndeterminateMark" Property="Opacity" Value="0"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="CheckBoxBorder" Property="Background" Value="{DynamicResource ButtonDisabled}"/>
+                            <Setter TargetName="CheckBoxBorder" Property="BorderBrush" Value="{DynamicResource BorderColor}"/>
+                            <Setter Property="Opacity" Value="0.4"/>
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsChecked" Value="True"/>
+                            </MultiTrigger.Conditions>
+                            <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>
+        </Setter>
+    </Style>
+
+    <!-- Shared checkbox style used for feature toggles across windows -->
+    <Style x:Key="FeatureCheckboxStyle" TargetType="CheckBox" BasedOn="{StaticResource {x:Type CheckBox}}">
+        <Setter Property="Margin" Value="-4,-2,-4,10"/>
+        <Setter Property="Padding" Value="4,2"/>
+    </Style>
+
+    <!-- Shared CheckBox style for app list items -->
+    <Style x:Key="AppsPanelCheckBoxStyle" TargetType="CheckBox" BasedOn="{StaticResource {x:Type CheckBox}}">
+        <Setter Property="Margin" Value="2,3,2,3"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+    </Style>
+
+    <!-- Shared CheckBox style for preset picker entries -->
+    <Style x:Key="PresetCheckBoxStyle" TargetType="CheckBox" BasedOn="{StaticResource {x:Type CheckBox}}">
+        <Setter Property="Margin" Value="8,4"/>
+    </Style>
+
     <!-- ScrollBar Style -->
     <Style TargetType="{x:Type ScrollBar}">
         <Setter Property="Background" Value="Transparent"/>

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

@@ -9,6 +9,9 @@ function RemoveApps {
 
     $appIndex = 0
     $appCount = @($appsList).Count
+    $edgeIds = @('Microsoft.Edge', 'XPFFTQ037JWMHS')
+    $edgeUninstallSucceeded = $false
+    $edgeScheduledTaskAdded = $false
 
     Foreach ($app in $appsList) {
         if ($script:CancelRequested) {
@@ -25,20 +28,27 @@ function RemoveApps {
         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 (($app -eq "Microsoft.OneDrive") -or ($edgeIds -contains $app)) {
             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 '\.', '_'
+            $isEdgeId = $edgeIds -contains $app
+            $appName = if ($isEdgeId) { 'Microsoft_Edge' } else { $app -replace '\.', '_' }
 
             # Uninstall app via WinGet, or create a scheduled task to uninstall it later
             if ($script:Params.ContainsKey("User")) {
+                if (-not ($isEdgeId -and $edgeScheduledTaskAdded)) {
                     ImportRegistryFile "Adding scheduled task to uninstall $app for user $(GetUserName)..." "Uninstall_$($appName).reg"
+                    if ($isEdgeId) { $edgeScheduledTaskAdded = $true }
+                }
             }
             elseif ($script:Params.ContainsKey("Sysprep")) {
+                if (-not ($isEdgeId -and $edgeScheduledTaskAdded)) {
                     ImportRegistryFile "Adding scheduled task to uninstall $app after for new users..." "Uninstall_$($appName).reg"
+                    if ($isEdgeId) { $edgeScheduledTaskAdded = $true }
+                }
             }
             else {
                 # Uninstall app via WinGet
@@ -47,7 +57,20 @@ function RemoveApps {
                     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")) {
+                $wingetFailed = Select-String -InputObject $wingetOutput -Pattern "Uninstall failed with exit code|No installed package found matching input criteria|No package found matching input criteria" -SimpleMatch:$false
+                if ($isEdgeId) {
+                    if (-not $wingetFailed) {
+                        $edgeUninstallSucceeded = $true
+                    }
+
+                    # Prompt immediately after the final selected Edge ID attempt (if all attempts failed)
+                    $hasRemainingEdgeIds = $false
+                    if ($appIndex -lt $appCount) {
+                        $remainingApps = @($appsList)[($appIndex)..($appCount - 1)]
+                        $hasRemainingEdgeIds = @($remainingApps | Where-Object { $edgeIds -contains $_ }).Count -gt 0
+                    }
+
+                    if (-not $hasRemainingEdgeIds -and -not $edgeUninstallSucceeded) {
                         Write-Host "Unable to uninstall Microsoft Edge via WinGet" -ForegroundColor Red
 
                         if ($script:GuiWindow) {
@@ -64,6 +87,7 @@ function RemoveApps {
                         }
                     }
                 }
+            }
 
             continue
         }

Scripts/CLI/PrintPendingChanges.ps1

@@ -1,14 +1,33 @@
 # Prints all pending changes that will be made by the script
 function PrintPendingChanges {
+    $skippedParams = @()
+    $undoChanges = $script:Params.ContainsKey('Undo')
+
+    if ($undoChanges) {
+        Write-Output "Win11Debloat will make the following changes to revert the selected settings to Windows defaults:"
+    }
+    else {
         Write-Output "Win11Debloat will make the following changes:"
+    }
 
     if ($script:Params['CreateRestorePoint']) {
-        Write-Output "- $($script:Features['CreateRestorePoint'].Label)"
+        Write-Output "- $($script:Features['CreateRestorePoint'].Action)"
     }
     foreach ($parameterName in $script:Params.Keys) {
         if ($script:ControlParams -contains $parameterName) {
             continue
         }
+        if ($parameterName -eq 'Apps' -or $parameterName -eq 'CreateRestorePoint') {
+            continue
+        }
+
+        if ($undoChanges) {
+            $undoFeature = GetUndoFeatureForParam -paramKey $parameterName
+            if (-not $undoFeature) {
+                $skippedParams += $parameterName
+                continue
+            }
+        }
 
         # Print parameter description
         switch ($parameterName) {
@@ -46,9 +65,18 @@ function PrintPendingChanges {
             }
             default {
                 if ($script:Features -and $script:Features.ContainsKey($parameterName)) {
-                    $action = $script:Features[$parameterName].Action
-                    $message = $script:Features[$parameterName].Label
-                    Write-Output "- $action $message"
+                    $message = if ($undoChanges -and $script:Features[$parameterName].UndoAction) {
+                        $script:Features[$parameterName].UndoAction
+                    }
+                    else {
+                        $script:Features[$parameterName].Action
+                    }
+                    if ($message) {
+                        Write-Output "- $message"
+                    }
+                    else {
+                        Write-Output "- $parameterName"
+                    }
                 }
                 else {
                     # Fallback: show the parameter name if no feature description is available
@@ -59,6 +87,16 @@ function PrintPendingChanges {
         }
     }
 
+    if ($undoChanges -and $skippedParams.Count -gt 0) {
+        Write-Output ""
+        Write-Output "The following changes cannot be automatically undone and will be skipped:"
+
+        $uniqueSkipped = $skippedParams | Sort-Object -Unique
+        foreach ($skippedParam in $uniqueSkipped) {
+            Write-Output "- $($script:Features[$skippedParam].Action)"
+        }
+    }
+
     Write-Output ""
     Write-Output ""
     Write-Output "Press enter to execute the script or press CTRL+C to quit..."

Scripts/CLI/ShowCLIDefaultModeOptions.ps1

@@ -17,7 +17,6 @@ function ShowCLIDefaultModeOptions {
 
     PrintHeader 'Default Mode'
 
-    # Add default settings based on user input
     try {
         # Select app removal options based on user input
         switch ($RemoveAppsInput) {
@@ -35,7 +34,6 @@ function ShowCLIDefaultModeOptions {
             }
         }
 
-        # Load settings from DefaultSettings.json and add to params
         LoadSettings -filePath $script:DefaultSettingsFilePath -expectedVersion "1.0"
     }
     catch {
@@ -45,8 +43,8 @@ function ShowCLIDefaultModeOptions {
 
     SaveSettings
 
-    # Skip change summary if Silent parameter was passed
     if ($Silent) {
+        # Skip change summary and confirmation prompt
         return
     }
 

Scripts/CLI/ShowCLILastUsedSettings.ps1

@@ -3,7 +3,6 @@ function ShowCLILastUsedSettings {
     PrintHeader 'Custom Mode'
 
     try {
-        # Load settings from LastUsedSettings.json and add to params
         LoadSettings -filePath $script:SavedSettingsFilePath -expectedVersion "1.0"
     }
     catch {
@@ -11,6 +10,11 @@ function ShowCLILastUsedSettings {
         AwaitKeyToExit
     }
 
+    if ($Silent) {
+        # Skip change summary and confirmation prompt
+        return
+    }
+
     PrintPendingChanges
     PrintHeader 'Custom Mode'
 }

Scripts/Features/CreateSystemRestorePoint.ps1

@@ -5,31 +5,25 @@ function CreateSystemRestorePoint {
     if ($SysRestore.RPSessionInterval -eq 0) {
         # In GUI mode, skip the prompt and just try to enable it
         if ($script:GuiWindow -or $Silent -or $( Read-Host -Prompt "System restore is disabled, would you like to enable it and create a restore point? (y/n)") -eq 'y') {
-            $enableSystemRestoreJob = Start-Job {
+            try {
+                $enableResult = Invoke-NonBlocking -TimeoutSeconds 20 -ScriptBlock {
                     try {
                         Enable-ComputerRestore -Drive "$env:SystemDrive"
+                        return $null
                     }
                     catch {
                         return "Error: Failed to enable System Restore: $_"
                     }
-                return $null
+                }
+            }
+            catch {
+                $enableResult = "Error: Failed to enable System Restore: $_"
             }
 
-            $enableSystemRestoreJobDone = $enableSystemRestoreJob | Wait-Job -TimeOut 20
-
-            if (-not $enableSystemRestoreJobDone) {
-                Remove-Job -Job $enableSystemRestoreJob -Force -ErrorAction SilentlyContinue
-                Write-Host "Error: Failed to enable system restore and create restore point, operation timed out" -ForegroundColor Red
+            if ($enableResult) {
+                Write-Host $enableResult -ForegroundColor Red
                 $failed = $true
             }
-            else {
-                $result = Receive-Job $enableSystemRestoreJob
-                Remove-Job -Job $enableSystemRestoreJob -ErrorAction SilentlyContinue
-                if ($result) {
-                    Write-Host $result -ForegroundColor Red
-                    $failed = $true
-                }
-            }
         }
         else {
             Write-Host ""
@@ -38,46 +32,43 @@ function CreateSystemRestorePoint {
     }
 
     if (-not $failed) {
-        $createRestorePointJob = Start-Job {
-            # Find existing restore points that are less than 24 hours old
+        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 @{ Success = $false; Message = "Error: Unable to retrieve existing restore points: $_" }
+                    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 @{ Success = $true; Message = "System restore point created successfully" }
+                        return [PSCustomObject]@{ Success = $true; Message = "System restore point created successfully" }
                     }
                     catch {
-                    return @{ Success = $false; Message = "Error: Unable to create restore point: $_" }
+                        return [PSCustomObject]@{ Success = $false; Message = "Error: Unable to create restore point: $_" }
                     }
                 }
                 else {
-                return @{ Success = $true; Message = "A recent restore point already exists, no new restore point was created" }
+                    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: $_" }
+        }
 
-        $createRestorePointJobDone = $createRestorePointJob | Wait-Job -TimeOut 20
-
-        if (-not $createRestorePointJobDone) {
-            Remove-Job -Job $createRestorePointJob -Force -ErrorAction SilentlyContinue
-            Write-Host "Error: Failed to create system restore point, operation timed out" -ForegroundColor Red
-            $failed = $true
-        }
-        else {
-            $result = Receive-Job $createRestorePointJob
-            Remove-Job -Job $createRestorePointJob -ErrorAction SilentlyContinue
-            if ($result.Success) {
+        if ($result -and $result.Success) {
             Write-Host $result.Message
         }
-            else {
+        elseif ($result) {
             Write-Host $result.Message -ForegroundColor Red
             $failed = $true
         }
+        else {
+            Write-Host "Error: Failed to create system restore point" -ForegroundColor Red
+            $failed = $true
         }
     }
 

Scripts/Features/ExecuteChanges.ps1

@@ -0,0 +1,238 @@
+# 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 exists in Features.json
+    $feature = $null
+    if ($script:Features.ContainsKey($paramKey)) {
+        $feature = $script:Features[$paramKey]
+    }
+
+    # Check if undo is requested and if this feature supports undo
+    $undoChanges = $script:Params.ContainsKey('Undo')
+
+    if ($undoChanges) {
+        $undoFeature = GetUndoFeatureForParam -paramKey $paramKey
+
+        if ($null -eq $undoFeature) {
+            # This parameter doesn't support undo, so skip it
+            return
+        }
+
+        $undoRegFile = $undoFeature.RegistryUndoKey
+        $undoFolderPath = Join-Path $script:RegfilesPath (Join-Path 'Undo' $undoRegFile)
+
+        if (Test-Path $undoFolderPath) {
+            $undoRegFile = Join-Path 'Undo' $undoRegFile
+        }
+
+        ImportRegistryFile "> $($undoFeature.UndoText)" $undoRegFile
+        return
+    }
+    
+    # If feature has RegistryKey and ApplyText, dynamically import the registry file for this feature
+    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)
+    $undoChanges = $script:Params.ContainsKey('Undo')
+    $actionableKeys = @()
+    $paramsToRemove = @()
+    foreach ($paramKey in $script:Params.Keys) {
+        if ($script:ControlParams -contains $paramKey) { continue }
+        if ($paramKey -eq 'Apps') { continue }
+        if ($paramKey -eq 'CreateRestorePoint') { continue }
+
+        if ($undoChanges) {
+            $undoFeature = GetUndoFeatureForParam -paramKey $paramKey
+            if (-not $undoFeature) {
+                $paramsToRemove += $paramKey
+                continue
+            }
+        }
+
+        $actionableKeys += $paramKey
+    }
+
+    if ($undoChanges -and $paramsToRemove.Count -gt 0) {
+        foreach ($paramKey in ($paramsToRemove | Sort-Object -Unique)) {
+            if ($script:Params.ContainsKey($paramKey)) {
+                $null = $script:Params.Remove($paramKey)
+            }
+        }
+    }
+
+    if ($undoChanges -and $actionableKeys.Count -eq 0) {
+        throw "Undo was requested but none of the selected parameters support undo. No changes were reverted."
+    }
+    
+    $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 ($undoChanges -and $feature.UndoText) {
+                $stepName = $feature.UndoText
+            }
+            elseif ($feature.ApplyText) {
+                $stepName = $feature.ApplyText
+            } elseif ($feature.Action) {
+                $stepName = $feature.Action
+            }
+        }
+        
+        if ($script:ApplyProgressCallback) {
+            & $script:ApplyProgressCallback $currentStep $totalSteps $stepName
+        }
+        
+        ExecuteParameter -paramKey $paramKey
+    }
+}

Scripts/Features/ImportRegistryFile.ps1

@@ -7,17 +7,25 @@ function ImportRegistryFile {
 
     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
+    $usesOfflineHive = $script:Params.ContainsKey("Sysprep") -or $script:Params.ContainsKey("User")
+    $regFilePath = if ($usesOfflineHive) {
+        "$script:RegfilesPath\Sysprep\$path"
+    }
+    else {
+        "$script:RegfilesPath\$path"
+    }
+
+    if (-not (Test-Path $regFilePath)) {
+        $errorMessage = "Unable to find registry file: $path ($regFilePath)"
+        Write-Host "Error: $errorMessage" -ForegroundColor Red
         Write-Host ""
-        return
+        throw $errorMessage
     }
 
     # Reset exit code before running reg.exe for reliable success detection
     $global:LASTEXITCODE = 0
 
-    if ($script:Params.ContainsKey("Sysprep") -or $script:Params.ContainsKey("User")) {
+    if ($usesOfflineHive) {
         # Sysprep targets Default user, User targets the specified user
         $hiveDatPath = if ($script:Params.ContainsKey("Sysprep")) {
             GetUserDirectory -userName "Default" -fileName "NTUSER.DAT"
@@ -26,26 +34,62 @@ function ImportRegistryFile {
         }
 
         $regResult = Invoke-NonBlocking -ScriptBlock {
-            param($datPath, $regFilePath)
+            param($hivePath, $targetRegFilePath)
+            $result = @{
+                Output = @()
+                ExitCode = 0
+                Error = $null
+            }
+
+            try {
+                $global:LASTEXITCODE = 0
+                reg load "HKU\Default" $hivePath | Out-Null
+                $loadExitCode = $LASTEXITCODE
+
+                if ($loadExitCode -ne 0) {
+                    throw "Failed to load user hive at '$hivePath' (exit code: $loadExitCode)"
+                }
+
+                $output = reg import $targetRegFilePath 2>&1
+                $importExitCode = $LASTEXITCODE
+
+                if ($output) {
+                    $result.Output = @($output)
+                }
+                $result.ExitCode = $importExitCode
+
+                if ($importExitCode -ne 0) {
+                    throw "Registry import failed with exit code $importExitCode for '$targetRegFilePath'"
+                }
+            }
+            catch {
+                $result.Error = $_.Exception.Message
+                $result.ExitCode = if ($LASTEXITCODE -ne 0) { $LASTEXITCODE } else { 1 }
+            }
+            finally {
                 $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")
+                $unloadExitCode = $LASTEXITCODE
+                if ($unloadExitCode -ne 0 -and -not $result.Error) {
+                    $result.Error = "Failed to unload temporary hive HKU\\Default (exit code: $unloadExitCode)"
+                    $result.ExitCode = $unloadExitCode
+                }
+            }
+
+            return $result
+        } -ArgumentList @($hiveDatPath, $regFilePath)
     }
     else {
         $regResult = Invoke-NonBlocking -ScriptBlock {
-            param($regFilePath)
+            param($targetRegFilePath)
             $global:LASTEXITCODE = 0
-            $output = reg import $regFilePath 2>&1
-            return @{ Output = $output; ExitCode = $LASTEXITCODE }
-        } -ArgumentList "$script:RegfilesPath\$path"
+            $output = reg import $targetRegFilePath 2>&1
+            return @{ Output = @($output); ExitCode = $LASTEXITCODE; Error = $null }
+        } -ArgumentList $regFilePath
     }
 
-    $regOutput = $regResult.Output
-    $hasSuccess = $regResult.ExitCode -eq 0
+    $regOutput = @($regResult.Output)
+    $hasSuccess = ($regResult.ExitCode -eq 0) -and -not $regResult.Error
     
     if ($regOutput) {
         foreach ($line in $regOutput) {
@@ -62,7 +106,11 @@ function ImportRegistryFile {
     }
 
     if (-not $hasSuccess) {
-        Write-Host "Failed importing registry file: $path" -ForegroundColor Red
+        $details = if ($regResult.Error) { $regResult.Error } else { "Exit code: $($regResult.ExitCode)" }
+        $errorMessage = "Failed importing registry file '$path'. $details"
+        Write-Host $errorMessage -ForegroundColor Red
+        Write-Host ""
+        throw $errorMessage
     }
 
     Write-Host ""

Scripts/Features/RestartExplorer.ps1

@@ -10,7 +10,7 @@ function RestartExplorer {
     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
+            Write-Host "Warning: '$($feature.Action)' requires a reboot to take full effect" -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

@@ -16,29 +16,42 @@ function LoadAppsDetailsFromJson {
     }
 
     foreach ($appData in $jsonContent.Apps) {
-        $appId = $appData.AppId.Trim()
-        if ($appId.length -eq 0) { continue }
+        # Handle AppId as array (could be single or multiple IDs)
+        $appIdArray = if ($appData.AppId -is [array]) { $appData.AppId } else { @($appData.AppId) }
+        $appIdArray = $appIdArray | ForEach-Object { $_.Trim() } | Where-Object { $_.length -gt 0 }
+        if ($appIdArray.Count -eq 0) { continue }
 
         if ($OnlyInstalled) {
-            if (-not ($InstalledList -like ("*$appId*")) -and -not (Get-AppxPackage -Name $appId)) {
-                continue
+            $isInstalled = $false
+            foreach ($appId in $appIdArray) {
+                if (($InstalledList -like ("*$appId*")) -or (Get-AppxPackage -Name $appId)) {
+                    $isInstalled = $true
+                    break
                 }
-            if (($appId -eq "Microsoft.Edge") -and -not ($InstalledList -like "* Microsoft.Edge *")) {
-                continue
+                if (($appId -eq "Microsoft.Edge") -and ($InstalledList -like "* Microsoft.Edge *")) {
+                    $isInstalled = $true
+                    break
                 }
             }
+            if (-not $isInstalled) { continue }
+        }
 
-        $friendlyName = if ($appData.FriendlyName) { $appData.FriendlyName } else { $appId }
-        $displayName = if ($appData.FriendlyName) { "$($appData.FriendlyName) ($appId)" } else { $appId }
+        # Use first AppId for fallback names, join all for display
+        $primaryAppId = $appIdArray[0]
+        $appIdDisplay = $appIdArray -join ', '
+        $friendlyName = if ($appData.FriendlyName) { $appData.FriendlyName } else { $primaryAppId }
+        $displayName = if ($appData.FriendlyName) { "$($appData.FriendlyName) ($appIdDisplay)" } else { $appIdDisplay }
         $isChecked = if ($InitialCheckedFromJson) { $appData.SelectedByDefault } else { $false }
 
         $apps += [PSCustomObject]@{
-            AppId = $appId
+            AppId = $appIdArray
+            AppIdDisplay = $appIdDisplay
             FriendlyName = $friendlyName
             DisplayName = $displayName
             IsChecked = $isChecked
             Description = $appData.Description
             SelectedByDefault = $appData.SelectedByDefault
+            Recommendation = $appData.Recommendation
         }
     }
 

Scripts/FileIO/LoadAppsFromFile.ps1

@@ -16,10 +16,12 @@ function LoadAppsFromFile {
             # JSON file format
             $jsonContent = Get-Content -Path $appsFilePath -Raw | ConvertFrom-Json
             Foreach ($appData in $jsonContent.Apps) {
-                $appId = $appData.AppId.Trim()
+                # Handle AppId as array (could be single or multiple IDs)
+                $appIdArray = if ($appData.AppId -is [array]) { $appData.AppId } else { @($appData.AppId) }
+                $appIdArray = $appIdArray | ForEach-Object { $_.Trim() } | Where-Object { $_.length -gt 0 }
                 $selectedByDefault = $appData.SelectedByDefault
-                if ($selectedByDefault -and $appId.length -gt 0) {
-                    $appsList += $appId
+                if ($selectedByDefault -and $appIdArray.Count -gt 0) {
+                    $appsList += $appIdArray
                 }
             }
         }

Scripts/FileIO/SaveSettings.ps1

@@ -16,10 +16,7 @@ function SaveSettings {
         }
     }
 
-    try {
-        $settings | ConvertTo-Json -Depth 10 | Set-Content $script:SavedSettingsFilePath
-    }
-    catch {
+    if (-not (SaveToFile -Config $settings -FilePath $script:SavedSettingsFilePath)) {
         Write-Output ""
         Write-Host "Error: Failed to save settings to LastUsedSettings.json file" -ForegroundColor Red
     }

Scripts/FileIO/SaveToFile.ps1

@@ -0,0 +1,19 @@
+# Saves configuration JSON to a file.
+# Returns $true on success, $false on failure.
+function SaveToFile {
+    param (
+        [Parameter(Mandatory=$true)]
+        [hashtable]$Config,
+
+        [Parameter(Mandatory=$true)]
+        [string]$FilePath
+    )
+
+    try {
+        $Config | ConvertTo-Json -Depth 10 | Set-Content -Path $FilePath -Encoding UTF8
+        return $true
+    }
+    catch {
+        return $false
+    }
+}

Scripts/FileIO/ValidateAppslist.ps1

@@ -4,7 +4,7 @@ function ValidateAppslist {
         $appsList
     )
 
-    $supportedAppsList = (LoadAppsDetailsFromJson | ForEach-Object { $_.AppId })
+    $supportedAppsList = @(LoadAppsDetailsFromJson | ForEach-Object { @($_.AppId) }) | ForEach-Object { $_.Trim() } | Where-Object { $_.Length -gt 0 }
     $validatedAppsList = @()
 
     # Validate provided appsList against supportedAppsList

Scripts/GUI/ApplySettingsToUiControls.ps1

@@ -11,10 +11,34 @@ function ApplySettingsToUiControls {
         return $false
     }
     
-    # First, reset all tweaks to "No Change" (index 0) or unchecked
-    if ($uiControlMappings) {
+    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
         }
@@ -22,40 +46,24 @@ function ApplySettingsToUiControls {
             $control.SelectedIndex = 0
         }
     }
-    }
     
-    # 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 }
 
-        # Skip RestorePointCheckBox, this is always checked by default
-        if ($paramName -eq 'CreateRestorePoint') {
-            continue
-        }
+        $entry = $featureIdIndex[$setting.Name]
+        if (-not $entry) { continue }
 
-        if ($uiControlMappings) {
-            foreach ($comboName in $uiControlMappings.Keys) {
-                $mapping = $uiControlMappings[$comboName]
-                if ($mapping.Type -eq 'group') {
-                    $i = 1
-                    foreach ($val in $mapping.Values) {
-                        if ($val.FeatureIds -contains $paramName) {
-                            $control = $window.FindName($comboName)
-                            if ($control -and $control.Visibility -eq 'Visible') {
+        $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 = $i
+                $control.SelectedIndex = $entry.Index
             }
         }
-                            break
-                        }
-                        $i++
-                    }
-                }
-                elseif ($mapping.Type -eq 'feature') {
-                    if ($mapping.FeatureId -eq $paramName) {
-                        $control = $window.FindName($comboName)
-                        if ($control -and $control.Visibility -eq 'Visible') {
+        else {
             if ($control -is [System.Windows.Controls.CheckBox]) {
                 $control.IsChecked = $true
             }
@@ -64,10 +72,6 @@ function ApplySettingsToUiControls {
             }
         }
     }
-                }
-            }
-        }
-    }
     
     return $true
 }

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

Scripts/GUI/Show-AboutDialog.ps1

@@ -83,8 +83,10 @@ function Show-AboutDialog {
     })
     
     # Show dialog
+    try {
         $aboutWindow.ShowDialog() | Out-Null
-    
+    }
+    finally {
         # Hide overlay after dialog closes
         if ($overlay) {
             try {
@@ -92,4 +94,5 @@ function Show-AboutDialog {
             }
             catch { }
         }
+    }
 }

Scripts/GUI/Show-AppSelectionWindow.ps1

@@ -75,7 +75,8 @@ function Show-AppSelectionWindow {
             $checkbox = New-Object System.Windows.Controls.CheckBox
             $checkbox.Content = $_.DisplayName
             $checkbox.SetValue([System.Windows.Automation.AutomationProperties]::NameProperty, $_.DisplayName)
-            $checkbox.Tag = $_.AppId
+            $checkbox.Tag = $_.AppIdDisplay
+            Add-Member -InputObject $checkbox -MemberType NoteProperty -Name 'AppIds' -Value @($_.AppId)
             $checkbox.IsChecked = $_.IsChecked
             $checkbox.ToolTip = $_.Description
             $checkbox.Style = $window.Resources["AppsPanelCheckBoxStyle"]
@@ -118,9 +119,10 @@ function Show-AppSelectionWindow {
         $selectedApps = @()
         foreach ($child in $appsPanel.Children) {
             if ($child -is [System.Windows.Controls.CheckBox] -and $child.IsChecked) {
-                $selectedApps += $child.Tag
+                $selectedApps += @($child.AppIds)
             }
         }
+        $selectedApps = @($selectedApps | Where-Object { $_ } | Select-Object -Unique)
 
         # Close form without saving if no apps were selected
         if ($selectedApps.Count -eq 0) {
@@ -143,7 +145,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

@@ -162,7 +162,7 @@ function Show-ApplyModal {
                     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)"
+                            $rebootFeatures += $feature.Action
                         }
                     }
 
@@ -179,7 +179,7 @@ function Show-ApplyModal {
                         $applyRebootPanel.Visibility = 'Visible'
                     }
                     else {
-                        $script:ApplyCompletionMessageEl.Text = "Your clean system is ready. Thanks for using Win11Debloat!"
+                        $script:ApplyCompletionMessageEl.Text = "Your system is ready. Thanks for using Win11Debloat!"
                     }
                 }
             }
@@ -216,7 +216,7 @@ function Show-ApplyModal {
             $script:ApplyProgressCallback = $null
             $script:ApplySubStepCallback = $null
         }
-    })
+    }) | Out-Null
     
     # Button handlers
     $applyCloseBtn.Add_Click({
@@ -242,8 +242,10 @@ function Show-ApplyModal {
     })
     
     # Show dialog
+    try {
         $applyWindow.ShowDialog() | Out-Null
-    
+    }
+    finally {
         # Hide overlay after dialog closes
         if ($overlay) {
             try {
@@ -251,4 +253,5 @@ function Show-ApplyModal {
             }
             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-ConfigWindow.ps1

@@ -0,0 +1,382 @@
+function Show-ImportExportConfigWindow {
+    param (
+        [System.Windows.Window]$Owner,
+        [bool]$UsesDarkMode,
+        [string]$Title,
+        [string]$Prompt,
+        [string[]]$Categories = @('Applications', 'System Tweaks', 'Deployment Settings'),
+        [string[]]$DisabledCategories = @()
+    )
+
+    # Show overlay on owner window
+    $overlay = $null
+    $overlayWasAlreadyVisible = $false
+    try {
+        $overlay = $Owner.FindName('ModalOverlay')
+        if ($overlay) {
+            $overlayWasAlreadyVisible = ($overlay.Visibility -eq 'Visible')
+            if (-not $overlayWasAlreadyVisible) {
+                $Owner.Dispatcher.Invoke([action]{ $overlay.Visibility = 'Visible' })
+            }
+        }
+    } catch { }
+
+    # Load XAML from schema file
+    $schemaPath = $script:ImportExportConfigSchema
+
+    if (-not $schemaPath -or -not (Test-Path $schemaPath)) {
+        Show-MessageBox -Message 'Import/Export window schema file could not be found.' -Title 'Error' -Button 'OK' -Icon 'Error' -Owner $Owner | Out-Null
+        if ($overlay -and -not $overlayWasAlreadyVisible) {
+            try { $Owner.Dispatcher.Invoke([action]{ $overlay.Visibility = 'Collapsed' }) } catch { }
+        }
+        return $null
+    }
+
+    $xaml = Get-Content -Path $schemaPath -Raw
+    $reader = [System.Xml.XmlReader]::Create([System.IO.StringReader]::new($xaml))
+    try {
+        $dlg = [System.Windows.Markup.XamlReader]::Load($reader)
+    }
+    finally {
+        $reader.Close()
+    }
+
+    $dlg.Owner = $Owner
+    SetWindowThemeResources -window $dlg -usesDarkMode $UsesDarkMode
+
+    # Populate named elements
+    $dlg.Title = $Title
+    $dlg.FindName('TitleText').Text = $Title
+    $dlg.FindName('PromptText').Text = $Prompt
+
+    $titleBar = $dlg.FindName('TitleBar')
+    $titleBar.Add_MouseLeftButtonDown({ $dlg.DragMove() })
+
+    # Add a themed checkbox per category
+    $checkboxPanel = $dlg.FindName('CheckboxPanel')
+    $checkboxes = @{}
+    foreach ($cat in $Categories) {
+        $cb = New-Object System.Windows.Controls.CheckBox
+        $cb.Content = $cat
+        $cb.IsChecked = $true
+        $cb.Margin = [System.Windows.Thickness]::new(0,0,0,8)
+        $cb.FontSize = 14
+        $cb.Foreground = $dlg.FindResource('FgColor')
+        $cb.Style = $window.Resources["AppsPanelCheckBoxStyle"]
+        if ($DisabledCategories -contains $cat) {
+            $cb.IsChecked = $false
+            $cb.IsEnabled = $false
+            $cb.Opacity = 0.65
+            $cb.ToolTip = 'No selected settings available in this category.'
+        }
+        $checkboxPanel.Children.Add($cb) | Out-Null
+        $checkboxes[$cat] = $cb
+    }
+
+    $okBtn = $dlg.FindName('OkButton')
+    $cancelBtn = $dlg.FindName('CancelButton')
+    $okBtn.Add_Click({ $dlg.Tag = 'OK'; $dlg.Close() })
+    $cancelBtn.Add_Click({ $dlg.Tag = 'Cancel'; $dlg.Close() })
+
+    # Handle Escape key
+    $dlg.Add_KeyDown({
+        param($s, $e)
+        if ($e.Key -eq 'Escape') { $dlg.Tag = 'Cancel'; $dlg.Close() }
+    })
+
+    try {
+        $dlg.ShowDialog() | Out-Null
+    }
+    finally {
+        # Hide overlay
+        if ($overlay -and -not $overlayWasAlreadyVisible) {
+            try { $Owner.Dispatcher.Invoke([action]{ $overlay.Visibility = 'Collapsed' }) } catch { }
+        }
+    }
+
+    if ($dlg.Tag -ne 'OK') { return $null }
+
+    $selected = @()
+    foreach ($cat in $Categories) {
+        if ($checkboxes[$cat].IsEnabled -and $checkboxes[$cat].IsChecked) { $selected += $cat }
+    }
+    if ($selected.Count -eq 0) { return $null }
+    return $selected
+}
+
+function Get-SelectedApplications {
+    param (
+        [System.Windows.Controls.Panel]$AppsPanel
+    )
+
+    $selectedApps = @()
+    foreach ($child in $AppsPanel.Children) {
+        if ($child -is [System.Windows.Controls.CheckBox] -and $child.IsChecked) {
+            $selectedApps += $child.Tag
+        }
+    }
+
+    return $selectedApps
+}
+
+function Get-SelectedTweakSettings {
+    param (
+        [System.Windows.Window]$Owner,
+        [hashtable]$UiControlMappings
+    )
+
+    $tweakSettings = @()
+    if (-not $UiControlMappings) {
+        return $tweakSettings
+    }
+
+    foreach ($mappingKey in $UiControlMappings.Keys) {
+        $control = $Owner.FindName($mappingKey)
+        if (-not $control) { continue }
+
+        $mapping = $UiControlMappings[$mappingKey]
+        if ($control -is [System.Windows.Controls.CheckBox] -and $control.IsChecked) {
+            if ($mapping.Type -eq 'feature') {
+                $tweakSettings += @{ Name = $mapping.FeatureId; Value = $true }
+            }
+        }
+        elseif ($control -is [System.Windows.Controls.ComboBox] -and $control.SelectedIndex -gt 0) {
+            if ($mapping.Type -eq 'group') {
+                $selectedValue = $mapping.Values[$control.SelectedIndex - 1]
+                foreach ($fid in $selectedValue.FeatureIds) {
+                    $tweakSettings += @{ Name = $fid; Value = $true }
+                }
+            }
+            elseif ($mapping.Type -eq 'feature') {
+                $tweakSettings += @{ Name = $mapping.FeatureId; Value = $true }
+            }
+        }
+    }
+
+    return $tweakSettings
+}
+
+function Get-DeploymentSettings {
+    param (
+        [System.Windows.Window]$Owner,
+        [System.Windows.Controls.ComboBox]$UserSelectionCombo,
+        [System.Windows.Controls.TextBox]$OtherUsernameTextBox
+    )
+
+    $deploySettings = @(
+        @{ Name = 'UserSelectionIndex'; Value = $UserSelectionCombo.SelectedIndex }
+    )
+
+    if ($UserSelectionCombo.SelectedIndex -eq 1) {
+        $deploySettings += @{ Name = 'OtherUsername'; Value = $OtherUsernameTextBox.Text.Trim() }
+    }
+
+    $appRemovalScopeCombo = $Owner.FindName('AppRemovalScopeCombo')
+    if ($appRemovalScopeCombo) {
+        $deploySettings += @{ Name = 'AppRemovalScopeIndex'; Value = $appRemovalScopeCombo.SelectedIndex }
+    }
+
+    $restorePointCheckBox = $Owner.FindName('RestorePointCheckBox')
+    if ($restorePointCheckBox) {
+        $deploySettings += @{ Name = 'CreateRestorePoint'; Value = [bool]$restorePointCheckBox.IsChecked }
+    }
+
+    $restartExplorerCheckBox = $Owner.FindName('RestartExplorerCheckBox')
+    if ($restartExplorerCheckBox) {
+        $deploySettings += @{ Name = 'RestartExplorer'; Value = [bool]$restartExplorerCheckBox.IsChecked }
+    }
+
+    return $deploySettings
+}
+
+function Get-AvailableImportExportCategories {
+    param (
+        $Config
+    )
+
+    $availableCategories = @()
+    if ($Config.Apps) { $availableCategories += 'Applications' }
+    if ($Config.Tweaks) { $availableCategories += 'System Tweaks' }
+    if ($Config.Deployment) { $availableCategories += 'Deployment Settings' }
+
+    return $availableCategories
+}
+
+function Apply-ImportedApplications {
+    param (
+        [System.Windows.Controls.Panel]$AppsPanel,
+        [string[]]$AppIds
+    )
+
+    foreach ($child in $AppsPanel.Children) {
+        if ($child -is [System.Windows.Controls.CheckBox]) {
+            $child.IsChecked = ($AppIds -contains $child.Tag)
+        }
+    }
+}
+
+function Apply-ImportedTweakSettings {
+    param (
+        [System.Windows.Window]$Owner,
+        [hashtable]$UiControlMappings,
+        [array]$TweakSettings
+    )
+
+    $settingsJson = [PSCustomObject]@{ Settings = @($TweakSettings) }
+    ApplySettingsToUiControls -window $Owner -settingsJson $settingsJson -uiControlMappings $UiControlMappings
+}
+
+function Apply-ImportedDeploymentSettings {
+    param (
+        [System.Windows.Window]$Owner,
+        [System.Windows.Controls.ComboBox]$UserSelectionCombo,
+        [System.Windows.Controls.TextBox]$OtherUsernameTextBox,
+        [array]$DeploymentSettings
+    )
+
+    $lookup = @{}
+    foreach ($setting in $DeploymentSettings) {
+        $lookup[$setting.Name] = $setting.Value
+    }
+
+    if ($lookup.ContainsKey('UserSelectionIndex')) {
+        $UserSelectionCombo.SelectedIndex = [int]$lookup['UserSelectionIndex']
+    }
+    if ($lookup.ContainsKey('OtherUsername') -and $UserSelectionCombo.SelectedIndex -eq 1) {
+        $OtherUsernameTextBox.Text = $lookup['OtherUsername']
+    }
+
+    $appRemovalScopeCombo = $Owner.FindName('AppRemovalScopeCombo')
+    if ($lookup.ContainsKey('AppRemovalScopeIndex') -and $appRemovalScopeCombo) {
+        $appRemovalScopeCombo.SelectedIndex = [int]$lookup['AppRemovalScopeIndex']
+    }
+
+    $restorePointCheckBox = $Owner.FindName('RestorePointCheckBox')
+    if ($lookup.ContainsKey('CreateRestorePoint') -and $restorePointCheckBox) {
+        $restorePointCheckBox.IsChecked = [bool]$lookup['CreateRestorePoint']
+    }
+
+    $restartExplorerCheckBox = $Owner.FindName('RestartExplorerCheckBox')
+    if ($lookup.ContainsKey('RestartExplorer') -and $restartExplorerCheckBox) {
+        $restartExplorerCheckBox.IsChecked = [bool]$lookup['RestartExplorer']
+    }
+}
+
+function Export-Configuration {
+    param (
+        [System.Windows.Window]$Owner,
+        [bool]$UsesDarkMode,
+        [System.Windows.Controls.Panel]$AppsPanel,
+        [hashtable]$UiControlMappings,
+        [System.Windows.Controls.ComboBox]$UserSelectionCombo,
+        [System.Windows.Controls.TextBox]$OtherUsernameTextBox
+    )
+
+    # Precompute exportable data so empty categories can be disabled in the picker.
+    $selectedApps = Get-SelectedApplications -AppsPanel $AppsPanel
+    $tweakSettings = Get-SelectedTweakSettings -Owner $Owner -UiControlMappings $UiControlMappings
+
+    $disabledCategories = @()
+    if ($selectedApps.Count -eq 0) { $disabledCategories += 'Applications' }
+    if ($tweakSettings.Count -eq 0) { $disabledCategories += 'System Tweaks' }
+
+    $categories = Show-ImportExportConfigWindow -Owner $Owner -UsesDarkMode $UsesDarkMode -Title 'Export Configuration' -Prompt 'Select which settings to include in the export:' -DisabledCategories $disabledCategories
+    if (-not $categories) { return }
+
+    $config = @{ Version = '1.0' }
+
+    if ($categories -contains 'Applications') {
+        $config['Apps'] = @($selectedApps)
+    }
+    if ($categories -contains 'System Tweaks') {
+        $config['Tweaks'] = @($tweakSettings)
+    }
+    if ($categories -contains 'Deployment Settings') {
+        $config['Deployment'] = @(Get-DeploymentSettings -Owner $Owner -UserSelectionCombo $UserSelectionCombo -OtherUsernameTextBox $OtherUsernameTextBox)
+    }
+
+    # Show native save-file dialog
+    $saveDialog = New-Object Microsoft.Win32.SaveFileDialog
+    $saveDialog.Title = 'Export Configuration'
+    $saveDialog.Filter = 'JSON files (*.json)|*.json|All files (*.*)|*.*'
+    $saveDialog.DefaultExt = '.json'
+    $saveDialog.FileName = "Win11Debloat-Config-$(Get-Date -Format 'yyyyMMdd').json"
+
+    if ($saveDialog.ShowDialog($Owner) -ne $true) { return }
+
+    if (SaveToFile -Config $config -FilePath $saveDialog.FileName) {
+        Show-MessageBox -Message "Configuration exported successfully." -Title 'Export Configuration' -Button 'OK' -Icon 'Information' | Out-Null
+    }
+    else {
+        Show-MessageBox -Message "Failed to export configuration" -Title 'Error' -Button 'OK' -Icon 'Error' | Out-Null
+    }
+}
+
+function Import-Configuration {
+    param (
+        [System.Windows.Window]$Owner,
+        [bool]$UsesDarkMode,
+        [System.Windows.Controls.Panel]$AppsPanel,
+        [hashtable]$UiControlMappings,
+        [System.Windows.Controls.ComboBox]$UserSelectionCombo,
+        [System.Windows.Controls.TextBox]$OtherUsernameTextBox,
+        [scriptblock]$OnAppsImported,
+        [scriptblock]$OnImportCompleted
+    )
+
+    # Show native open-file dialog
+    $openDialog = New-Object Microsoft.Win32.OpenFileDialog
+    $openDialog.Title = 'Import Configuration'
+    $openDialog.Filter = 'JSON files (*.json)|*.json|All files (*.*)|*.*'
+    $openDialog.DefaultExt = '.json'
+
+    if ($openDialog.ShowDialog($Owner) -ne $true) { return }
+
+    $config = LoadJsonFile -filePath $openDialog.FileName -expectedVersion '1.0'
+    if (-not $config) {
+        Show-MessageBox -Message "Failed to read configuration file" -Title 'Error' -Button 'OK' -Icon 'Error' | Out-Null
+        return
+    }
+
+    if (-not $config.Version) {
+        Show-MessageBox -Message "Invalid configuration file format." -Title 'Error' -Button 'OK' -Icon 'Error' | Out-Null
+        return
+    }
+
+    $availableCategories = Get-AvailableImportExportCategories -Config $config
+
+    if ($availableCategories.Count -eq 0) {
+        Show-MessageBox -Message "The configuration file contains no importable data." -Title 'Import Configuration' -Button 'OK' -Icon 'Information' | Out-Null
+        return
+    }
+
+    $categories = Show-ImportExportConfigWindow -Owner $Owner -UsesDarkMode $UsesDarkMode -Title 'Import Configuration' -Prompt 'Select which settings to import:' -Categories $availableCategories
+    if (-not $categories) { return }
+
+    if ($categories -contains 'Applications' -and $config.Apps) {
+        $appIds = @(
+            $config.Apps | 
+            Where-Object { $_ -is [string] } | 
+            ForEach-Object { $_.Trim() } |
+            Where-Object { -not [string]::IsNullOrWhiteSpace($_) }
+        )
+
+        Apply-ImportedApplications -AppsPanel $AppsPanel -AppIds $appIds
+        
+        if ($OnAppsImported) { 
+            & $OnAppsImported
+        }
+    }
+    if ($categories -contains 'System Tweaks' -and $config.Tweaks) {
+        Apply-ImportedTweakSettings -Owner $Owner -UiControlMappings $UiControlMappings -TweakSettings @($config.Tweaks)
+    }
+    if ($categories -contains 'Deployment Settings' -and $config.Deployment) {
+        Apply-ImportedDeploymentSettings -Owner $Owner -UserSelectionCombo $UserSelectionCombo -OtherUsernameTextBox $OtherUsernameTextBox -DeploymentSettings @($config.Deployment)
+    }
+
+    Show-MessageBox -Message "Configuration imported successfully." -Title 'Import Configuration' -Button 'OK' -Icon 'Information' | Out-Null
+
+    if ($OnImportCompleted) {
+        & $OnImportCompleted $categories
+    }
+}

Scripts/GUI/Show-MainWindow.ps1

@@ -27,6 +27,8 @@ function Show-MainWindow {
     $menuReportBug = $window.FindName('MenuReportBug')
     $menuLogs = $window.FindName('MenuLogs')
     $menuAbout = $window.FindName('MenuAbout')
+    $importConfigBtn = $window.FindName('ImportConfigBtn')
+    $exportConfigBtn = $window.FindName('ExportConfigBtn')
 
     # Title bar event handlers
     $titleBar.Add_MouseLeftButtonDown({
@@ -67,6 +69,22 @@ function Show-MainWindow {
         Show-AboutDialog -Owner $window
     })
 
+    # --- Import/Export Configuration ---
+    $exportConfigBtn.Add_Click({
+        Export-Configuration -Owner $window -UsesDarkMode $usesDarkMode -AppsPanel $appsPanel -UiControlMappings $script:UiControlMappings -UserSelectionCombo $userSelectionCombo -OtherUsernameTextBox $otherUsernameTextBox
+    })
+
+    $importConfigBtn.Add_Click({
+        Import-Configuration -Owner $window -UsesDarkMode $usesDarkMode -AppsPanel $appsPanel -UiControlMappings $script:UiControlMappings -UserSelectionCombo $userSelectionCombo -OtherUsernameTextBox $otherUsernameTextBox -OnAppsImported { UpdateAppSelectionStatus; UpdatePresetStates } -OnImportCompleted {
+            $tabControl.SelectedIndex = 3
+            UpdateNavigationButtons
+
+            $window.Dispatcher.BeginInvoke([System.Windows.Threading.DispatcherPriority]::Loaded, [action]{
+                Show-Bubble -TargetControl $reviewChangesBtn -Message 'View the selected changes here'
+            }) | Out-Null
+        }
+    })
+
     $closeBtn.Add_Click({
         $window.Close()
     })
@@ -210,21 +228,146 @@ 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) (@($c.AppIds) | Where-Object { $presetIds -contains $_ }).Count -gt 0 }.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
+
+    # Prevent app import until the apps list has finished initial population.
+    if ($importConfigBtn) {
+        $importConfigBtn.IsEnabled = $false
+    }
     
     # 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)
+        }
+    }
+
+    # Rebuilds $script:AppSearchMatches by scanning appsPanel children in their current order,
+    # collecting any that are still highlighted. Preserves the active match across reorderings.
+    function RebuildAppSearchIndex {
+        param($activeMatch = $null)
+        $newMatches = @()
+        $newActiveIndex = -1
+        $i = 0
+        foreach ($child in $appsPanel.Children) {
+            if ($child -is [System.Windows.Controls.CheckBox] -and $child.Background -ne [System.Windows.Media.Brushes]::Transparent) {
+                $newMatches += $child
+                if ($null -ne $activeMatch -and [System.Object]::ReferenceEquals($child, $activeMatch)) {
+                    $newActiveIndex = $i
+                }
+                $i++
+            }
+        }
+        $script:AppSearchMatches = $newMatches
+        $script:AppSearchMatchIndex = if ($newActiveIndex -ge 0) { $newActiveIndex } elseif ($newMatches.Count -gt 0) { 0 } else { -1 }
+    }
+
+    function SortApps {
+        $children = @($appsPanel.Children)
+        $key = switch ($script:SortColumn) {
+            'Name'        { { $_.AppName } }
+            'Description' { { $_.AppDescription } }
+            'AppId'       { { $_.AppIdDisplay } }
+        }
+        $sorted = $children | Sort-Object $key -Descending:(-not $script:SortAscending)
+        $appsPanel.Children.Clear()
+        foreach ($checkbox in $sorted) {
+            $appsPanel.Children.Add($checkbox) | Out-Null
+        }
+        UpdateSortArrows
+
+        # Rebuild search match list in new sorted order so keyboard navigation stays correct
+        if ($script:AppSearchMatches.Count -gt 0) {
+            $activeMatch = if ($script:AppSearchMatchIndex -ge 0 -and $script:AppSearchMatchIndex -lt $script:AppSearchMatches.Count) {
+                $script:AppSearchMatches[$script:AppSearchMatchIndex]
+            } else { $null }
+            RebuildAppSearchIndex -activeMatch $activeMatch
+        }
+    }
+
+    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) {
@@ -235,9 +378,75 @@ 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 {
+            # 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 ($child.IsChecked) { $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) (@($c.AppIds) | Where-Object { $localIds -contains $_ }).Count -gt 0 }.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) (@($c.AppIds) | Where-Object { $script:SavedAppIds -contains $_ }).Count -gt 0 }
+            }
+        }
+        finally {
+            $script:UpdatingPresets = $false
+        }
+    }
+
     # Dynamically builds Tweaks UI from Features.json
     function BuildDynamicTweaks {
-        $featuresJson = LoadJsonFile -filePath $script:FeaturesFilePath -expectedVersion "1.0"
+        $featuresJson = LoadJsonFile -filePath $script:FeaturesFilePath -expectedVersion $script:FeaturesConfigVersion
 
         if (-not $featuresJson) {
             Show-MessageBox -Message "Unable to load Features.json file!" -Title "Error" -Button 'OK' -Icon 'Error' | Out-Null
@@ -309,7 +518,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
             
@@ -500,7 +709,7 @@ function Show-MainWindow {
                     if ($feature.FeatureId -match '^Disable') { $opt = 'Disable' } elseif ($feature.FeatureId -match '^Enable') { $opt = 'Enable' }
                     $items = @('No Change', $opt)
                     $comboName = ("Feature_{0}_Combo" -f $feature.FeatureId) -replace '[^a-zA-Z0-9_]',''
-                    $combo = CreateLabeledCombo -parent $panel -labelText ($feature.Action + ' ' + $feature.Label) -comboName $comboName -items $items
+                    $combo = CreateLabeledCombo -parent $panel -labelText $feature.Action -comboName $comboName -items $items
                     # attach tooltip from Features.json if present
                     if ($feature.ToolTip) {
                         $tipBlock = New-Object System.Windows.Controls.TextBlock
@@ -516,153 +725,185 @@ function Show-MainWindow {
                 }
             }
         }
+
+        # 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
+        }
     }
 
-    # 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
+        # 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
+        }
+
+        $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
+            if ($importConfigBtn) {
+                $importConfigBtn.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.AppIdDisplay) { $app.AppIdDisplay } else { $null }
+            if ($automationName) { $checkbox.SetValue([System.Windows.Automation.AutomationProperties]::NameProperty, $automationName) }
+            $checkbox.Tag       = $app.AppIdDisplay
+            $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
-            $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)
+            $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 = $_.FriendlyName
-            $tbName.Style = $window.Resources["AppNameTextStyle"]
-            [System.Windows.Controls.Grid]::SetColumn($tbName, 0)
+            $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 = $_.Description
-            $tbDesc.Style = $window.Resources["AppDescTextStyle"]
-            $tbDesc.ToolTip = $_.Description
-            [System.Windows.Controls.Grid]::SetColumn($tbDesc, 1)
+            $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 = $_.AppId
+            $tbId.Text = $app.AppIdDisplay
             $tbId.Style = $window.Resources["AppIdTextStyle"]
-            $tbId.ToolTip = $_.AppId
-            [System.Windows.Controls.Grid]::SetColumn($tbId, 2)
+            $tbId.ToolTip = $app.AppIdDisplay
+            [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
 
-            # 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-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
+            Add-Member -InputObject $checkbox -MemberType NoteProperty -Name 'AppIds' -Value @($app.AppId)
+            Add-Member -InputObject $checkbox -MemberType NoteProperty -Name 'AppIdDisplay' -Value $app.AppIdDisplay
 
-            # 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 }
+            AttachShiftClickBehavior -checkbox $checkbox -appsPanel $appsPanel `
+                -lastSelectedCheckboxRef ([ref]$script:MainWindowLastSelectedCheckbox) `
+                -updateStatusCallback { UpdateAppSelectionStatus }
 
             $appsPanel.Children.Add($checkbox) | Out-Null
+
+            if (($i + 1) % $batchSize -eq 0) { DoEvents }
         }
 
-        # Hide loading indicator and navigation blocker, update status
-        $loadingAppsIndicator.Visibility = 'Collapsed'
+        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
+        if ($importConfigBtn) {
+            $importConfigBtn.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
+        # Prevent concurrent loads
+        if ($script:IsLoadingApps) { return }
+        $script:IsLoadingApps = $true
 
-        # Show loading indicator and navigation blocker, clear existing apps immediately
+        if ($importConfigBtn) {
+            $importConfigBtn.IsEnabled = $false
+        }
+
+        # 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)
+        # 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]{})
-        
-        # Schedule the actual loading work to run after UI has updated
         $window.Dispatcher.BeginInvoke([System.Windows.Threading.DispatcherPriority]::Background, [action]{
+            try {
                 $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
+                    $listOfApps = GetInstalledAppsViaWinget -TimeOut 10 -NonBlocking
 
-                # 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
+                    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
+            }
+            finally {
+                $script:IsLoadingApps = $false
+            }
         }) | Out-Null
     }
 
@@ -674,27 +915,66 @@ function Show-MainWindow {
         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 }
         }
     })
 
-    $clearAppSelectionBtn.Add_Click({
-        foreach ($child in $appsPanel.Children) {
-            if ($child -is [System.Windows.Controls.CheckBox]) {
-                $child.IsChecked = $false
-            }
-        }
+    # Close the preset menu when the main window loses focus (e.g., user switches to another app).
+    $window.Add_Deactivated({
+        if ($presetsPopup.IsOpen) { $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({
+        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 (
@@ -830,7 +1110,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)
         }
     })
     
@@ -980,9 +1260,6 @@ function Show-MainWindow {
         
         # Update progress indicators
         # Tab indices: 0=Home, 1=App Removal, 2=Tweaks, 3=Deployment Settings
-        $blueColor = "#0067c0"
-        $greyColor = "#808080"
-        
         $progressIndicator1 = $window.FindName('ProgressIndicator1') # App Removal
         $progressIndicator2 = $window.FindName('ProgressIndicator2') # Tweaks
         $progressIndicator3 = $window.FindName('ProgressIndicator3') # Deployment Settings
@@ -998,23 +1275,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 (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']
         }
     }
 
@@ -1099,17 +1376,17 @@ 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"
+            $usernameValidationMessage.Text = "Please enter a username"
             $usernameValidationMessage.Foreground = $errorBrush
             return $false
         }
         
         if ($username -eq $env:USERNAME) {
-            $usernameValidationMessage.Text = "[X] Cannot enter your own username, use 'Current User' option instead"
+            $usernameValidationMessage.Text = "Cannot enter your own username, use 'Current User' option instead"
             $usernameValidationMessage.Foreground = $errorBrush
             return $false
         }
@@ -1117,20 +1394,23 @@ function Show-MainWindow {
         $userExists = CheckIfUserExists -Username $username
 
         if ($userExists) {
-            $usernameValidationMessage.Text = "[OK] User found: $username"
+            if (TestIfUserIsLoggedIn -Username $username) {
+                $usernameValidationMessage.Text = "User '$username' is currently logged in. Please sign out that user first."
+                $usernameValidationMessage.Foreground = $errorBrush
+                return $false
+            }
+
+            $usernameValidationMessage.Text = "User found: $username"
             $usernameValidationMessage.Foreground = $successBrush
             return $true
         }
 
-        $usernameValidationMessage.Text = "[X] User not found, please enter a valid username"
+        $usernameValidationMessage.Text = "User not found, please enter a valid username"
         $usernameValidationMessage.Foreground = $errorBrush
         return $false
     }
 
     function GenerateOverview {
-        # Load Features.json
-        $featuresJson = LoadJsonFile -filePath $script:FeaturesFilePath -expectedVersion "1.0"
-        
         $changesList = @()
         
         # Collect selected apps
@@ -1150,13 +1430,13 @@ function Show-MainWindow {
             if ($userSelectionCombo.SelectedIndex -ne 2) {
                 $appRemovalScopeCombo.IsEnabled = $true
             }
-            $appRemovalScopeSection.Opacity = 1.0
+            $appRemovalScopeSection.Visibility = 'Visible'
             UpdateAppRemovalScopeDescription
         }
         else {
             # Disable app removal scope selection when no apps selected
             $appRemovalScopeCombo.IsEnabled = $false
-            $appRemovalScopeSection.Opacity = 0.5
+            $appRemovalScopeSection.Visibility = 'Collapsed'
             $appRemovalScopeDescription.Text = "No apps selected for removal."
         }
         
@@ -1180,13 +1460,13 @@ 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 ($label) { $changesList += $label }
                     }
                 }
             }
@@ -1208,6 +1488,7 @@ function Show-MainWindow {
     }
 
     $previousBtn.Add_Click({
+        Hide-Bubble -Immediate
         if ($tabControl.SelectedIndex -gt 0) {
             $tabControl.SelectedIndex--
             UpdateNavigationButtons
@@ -1217,7 +1498,6 @@ function Show-MainWindow {
     $nextBtn.Add_Click({
         if ($tabControl.SelectedIndex -lt ($tabControl.Items.Count - 1)) {
             $tabControl.SelectedIndex++
-            
             UpdateNavigationButtons
         }
     })
@@ -1230,6 +1510,44 @@ function Show-MainWindow {
         UpdateNavigationButtons
     })
 
+    # Handle Home Revert link button
+    $homeRevertLinkBtn = $window.FindName('HomeRevertLinkBtn')
+    if ($homeRevertLinkBtn) {
+        if (-not (Test-Path $script:SavedSettingsFilePath)) {
+            $homeRevertLinkBtn.Visibility = 'Collapsed'
+        }
+
+        $homeRevertLinkBtn.Add_Click({
+            $savedSettings = LoadJsonFile -filePath $script:SavedSettingsFilePath -expectedVersion "1.0" -optionalFile
+            if (-not $savedSettings -or -not $savedSettings.Settings) {
+                return
+            }
+
+            $revertSelection = Show-RevertSettingsModal -Owner $window -LastUsedSettings $savedSettings
+            $selectedFeatureIds = @($revertSelection.SelectedFeatureIds)
+            $shouldRestartExplorer = ($revertSelection.RestartExplorer -eq $true)
+
+            if (-not $selectedFeatureIds -or $selectedFeatureIds.Count -eq 0) {
+                return
+            }
+
+            AddParameter 'Undo'
+
+            foreach ($featureId in $selectedFeatureIds) {
+                if ($script:Features.ContainsKey($featureId)) {
+                    $feature = $script:Features[$featureId]
+                    if ($feature.RegistryUndoKey -and $feature.UndoAction) {
+                        AddParameter $featureId
+                    }
+                }
+            }
+
+            Show-ApplyModal -Owner $window -RestartExplorer $shouldRestartExplorer
+
+            $window.Close()
+        })
+    }
+
     # Handle Home Default Mode button - apply defaults and navigate directly to overview
     $homeDefaultModeBtn = $window.FindName('HomeDefaultModeBtn')
     $homeDefaultModeBtn.Add_Click({
@@ -1239,21 +1557,27 @@ 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 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 Review Changes link button
     $reviewChangesBtn = $window.FindName('ReviewChangesBtn')
     $reviewChangesBtn.Add_Click({
+        Hide-Bubble
         ShowChangesOverview
     })
 
@@ -1261,17 +1585,26 @@ function Show-MainWindow {
     $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
+            $validationMessage = if (-not [string]::IsNullOrWhiteSpace($usernameValidationMessage.Text)) {
+                $usernameValidationMessage.Text
+            }
+            else {
+                "Please enter a valid username."
+            }
+            Show-MessageBox -Message $validationMessage -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) {
             if ($child -is [System.Windows.Controls.CheckBox] -and $child.IsChecked) {
-                $selectedApps += $child.Tag
+                $selectedApps += @($child.AppIds)
             }
         }
+        $selectedApps = @($selectedApps | Where-Object { $_ } | Select-Object -Unique)
         
         if ($selectedApps.Count -gt 0) {
             # Check if Microsoft Store is selected
@@ -1366,8 +1699,17 @@ 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
@@ -1443,7 +1785,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
 
@@ -1472,28 +1813,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) (@($c.AppIds) | Where-Object { $script:SavedAppIds -contains $_ }).Count -gt 0 } -Check $check
         })
     }
     else {
-        $loadLastUsedAppsBtn.Visibility = 'Collapsed'
+        $script:SavedAppIds = $null
+        $presetLastUsed.Visibility = 'Collapsed'
     }
 
     # Clear All Tweaks button
@@ -1513,6 +1850,14 @@ function Show-MainWindow {
         }
     })
 
+    # 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

@@ -152,8 +152,10 @@ function Show-MessageBox {
     })
     
     # Show dialog and return result from Tag
+    try {
         $msgWindow.ShowDialog() | Out-Null
-    
+    }
+    finally {
         # Hide overlay after dialog closes (only if this dialog was the one that showed it)
         if ($overlay -and -not $overlayWasAlreadyVisible) {
             try {
@@ -161,6 +163,7 @@ function Show-MessageBox {
             }
             catch { }
         }
+    }
     
     return $msgWindow.Tag
 }

Scripts/GUI/Show-RevertSettingsModal.ps1

@@ -0,0 +1,198 @@
+function Show-RevertSettingsModal {
+    param (
+        [Parameter(Mandatory=$false)]
+        [System.Windows.Window]$Owner = $null,
+        [Parameter(Mandatory=$true)]
+        $LastUsedSettings
+    )
+
+    Add-Type -AssemblyName PresentationFramework,PresentationCore,WindowsBase | Out-Null
+
+    $usesDarkMode = GetSystemUsesDarkMode
+
+    # Determine owner window
+    $ownerWindow = if ($Owner) { $Owner } else { $script:GuiWindow }
+
+    # Show overlay if owner window exists
+    $overlay = $null
+    $overlayWasAlreadyVisible = $false
+    if ($ownerWindow) {
+        try {
+            $overlay = $ownerWindow.FindName('ModalOverlay')
+            if ($overlay) {
+                $overlayWasAlreadyVisible = ($overlay.Visibility -eq 'Visible')
+                if (-not $overlayWasAlreadyVisible) {
+                    $ownerWindow.Dispatcher.Invoke([action]{ $overlay.Visibility = 'Visible' })
+                }
+            }
+        }
+        catch { }
+    }
+
+    # Load XAML from file
+    $xaml = Get-Content -Path $script:RevertSettingsWindowSchema -Raw
+    $reader = [System.Xml.XmlReader]::Create([System.IO.StringReader]::new($xaml))
+    try {
+        $revertWindow = [System.Windows.Markup.XamlReader]::Load($reader)
+    }
+    finally {
+        $reader.Close()
+    }
+
+    if ($ownerWindow) {
+        try {
+            $revertWindow.Owner = $ownerWindow
+        }
+        catch { }
+    }
+
+    SetWindowThemeResources -window $revertWindow -usesDarkMode $usesDarkMode
+
+    $itemsPanel = $revertWindow.FindName('RevertItemsPanel')
+    $countText = $revertWindow.FindName('RevertSelectionCount')
+    $selectAllBtn = $revertWindow.FindName('RevertSelectAllBtn')
+    $clearBtn = $revertWindow.FindName('RevertClearBtn')
+    $applyBtn = $revertWindow.FindName('RevertApplyBtn')
+    $cancelBtn = $revertWindow.FindName('RevertCancelBtn')
+    $restartExplorerCheckbox = $revertWindow.FindName('RevertRestartExplorerCheckBox')
+    $featureCheckboxStyle = $revertWindow.FindResource('FeatureCheckboxStyle')
+    $restartExplorerCheckbox.Style = $featureCheckboxStyle
+    $entryCheckboxes = @()
+
+    foreach ($setting in $LastUsedSettings.Settings) {
+        if ($setting.Value -ne $true) { continue }
+        if ($setting.Name -eq 'Apps' -or $setting.Name -eq 'RemoveApps' -or $setting.Name -eq 'CreateRestorePoint') { continue }
+
+        $feature = $null
+        if ($script:Features.ContainsKey($setting.Name)) {
+            $feature = $script:Features[$setting.Name]
+        }
+        $undoFeature = GetUndoFeatureForParam -paramKey $setting.Name
+
+        $label = $setting.Name
+        if ($feature -and $feature.Action) {
+            $label = $feature.Action
+        }
+
+        $undoLabel = if ($undoFeature -and $undoFeature.UndoAction) {
+            $undoFeature.UndoAction
+        } else {
+            'No revert action available'
+        }
+
+        $canUndo = ($null -ne $undoFeature)
+
+        $itemBorder = New-Object System.Windows.Controls.Border
+        $itemBorder.Style = $revertWindow.FindResource('RevertItemBorderStyle')
+
+        $row = New-Object System.Windows.Controls.StackPanel
+        $row.Style = $revertWindow.FindResource('RevertItemRowStyle')
+
+        $checkbox = New-Object System.Windows.Controls.CheckBox
+        $checkbox.Content = $label
+        $checkbox.Tag = $setting.Name
+        $checkbox.Style = $featureCheckboxStyle
+        $checkbox.IsEnabled = $canUndo
+
+        $undoText = New-Object System.Windows.Controls.TextBlock
+        $undoText.Text = if ($canUndo) { "Revert to: $undoLabel" } else { 'Revert not supported for this setting' }
+        $undoText.Style = $revertWindow.FindResource('RevertItemUndoTextStyle')
+        $undoText.Opacity = if ($canUndo) { 0.75 } else { 0.4 }
+
+        $row.Children.Add($checkbox) | Out-Null
+        $row.Children.Add($undoText) | Out-Null
+        $itemBorder.Child = $row
+
+        $itemsPanel.Children.Add($itemBorder) | Out-Null
+        $entryCheckboxes += $checkbox
+    }
+
+    # Remove the divider from the last entry for cleaner list termination.
+    if ($itemsPanel.Children.Count -gt 0) {
+        $lastItem = $itemsPanel.Children[$itemsPanel.Children.Count - 1]
+        if ($lastItem -is [System.Windows.Controls.Border]) {
+            $lastItem.BorderThickness = [System.Windows.Thickness]::new(0)
+        }
+    }
+
+    if ($entryCheckboxes.Count -eq 0) {
+        $emptyText = New-Object System.Windows.Controls.TextBlock
+        $emptyText.Text = 'No previously applied tweaks can be reverted'
+        $emptyText.Style = $revertWindow.FindResource('RevertEmptyTextStyle')
+        $itemsPanel.Children.Add($emptyText) | Out-Null
+        $selectAllBtn.IsEnabled = $false
+        $clearBtn.IsEnabled = $false
+    }
+
+    $updateState = {
+        $selectedCount = 0
+        foreach ($cb in $entryCheckboxes) {
+            if ($cb.IsEnabled -and $cb.IsChecked -eq $true) {
+                $selectedCount++
+            }
+        }
+
+        $countText.Text = "$selectedCount settings selected"
+        $applyBtn.IsEnabled = ($selectedCount -gt 0)
+    }
+
+    foreach ($cb in $entryCheckboxes) {
+        $cb.Add_Checked($updateState)
+        $cb.Add_Unchecked($updateState)
+    }
+
+    $selectAllBtn.Add_Click({
+        foreach ($cb in $entryCheckboxes) {
+            if ($cb.IsEnabled) {
+                $cb.IsChecked = $true
+            }
+        }
+    })
+
+    $clearBtn.Add_Click({
+        foreach ($cb in $entryCheckboxes) {
+            if ($cb.IsEnabled) {
+                $cb.IsChecked = $false
+            }
+        }
+    })
+
+    $cancelHandler = {
+        $revertWindow.Close()
+    }
+
+    $cancelBtn.Add_Click($cancelHandler)
+
+    $applyBtn.Add_Click({
+        $selected = @()
+        foreach ($cb in $entryCheckboxes) {
+            if ($cb.IsEnabled -and $cb.IsChecked -eq $true -and $cb.Tag) {
+                $selected += $cb.Tag
+            }
+        }
+
+        $revertWindow.Tag = [PSCustomObject]@{
+            SelectedFeatureIds = $selected
+            RestartExplorer = ($restartExplorerCheckbox -and $restartExplorerCheckbox.IsChecked -eq $true)
+        }
+        $revertWindow.Close()
+    })
+
+    $revertWindow.ShowDialog() | Out-Null
+
+    if ($overlay -and -not $overlayWasAlreadyVisible) {
+        try {
+            $ownerWindow.Dispatcher.Invoke([action]{ $overlay.Visibility = 'Collapsed' })
+        }
+        catch { }
+    }
+
+    if ($revertWindow.Tag) {
+        return $revertWindow.Tag
+    }
+
+    return [PSCustomObject]@{
+        SelectedFeatureIds = @()
+        RestartExplorer = $false
+    }
+}

Scripts/Get.ps1

@@ -1,6 +1,7 @@
 param (
     [switch]$CLI,
     [switch]$Silent,
+    [switch]$Undo,
     [switch]$Verbose,
     [switch]$Sysprep,
     [string]$LogPath,
@@ -11,6 +12,7 @@ param (
     [switch]$RunDefaults,
     [switch]$RunDefaultsLite,
     [switch]$RunSavedSettings,
+    [string]$Config,
     [string]$Apps,
     [string]$AppRemovalTarget,
     [switch]$RemoveApps,
@@ -215,7 +217,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,Config,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/GetUndoFeatureForParam.ps1

@@ -0,0 +1,17 @@
+# Returns the feature metadata for a parameter when it supports undo; otherwise returns $null.
+function GetUndoFeatureForParam {
+    param (
+        [string]$paramKey
+    )
+
+    if (-not $script:Features -or -not $script:Features.ContainsKey($paramKey)) {
+        return $null
+    }
+
+    $feature = $script:Features[$paramKey]
+    if (-not ($feature.RegistryUndoKey -and ($feature.UndoText -or $feature.UndoAction))) {
+        return $null
+    }
+
+    return $feature
+}

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/Helpers/ImportConfigToParams.ps1

@@ -0,0 +1,127 @@
+function ImportConfigToParams {
+    param (
+        [Parameter(Mandatory = $true)]
+        [string]$ConfigPath,
+        [int]$CurrentBuild,
+        [string]$ExpectedVersion = '1.0'
+    )
+
+    $resolvedConfigPath = $null
+    try {
+        $resolvedConfigPath = (Resolve-Path -LiteralPath $ConfigPath -ErrorAction Stop).Path
+    }
+    catch {
+        throw "Unable to find config file at path: $ConfigPath"
+    }
+
+    if (-not (Test-Path -LiteralPath $resolvedConfigPath -PathType Leaf)) {
+        throw "Provided config path is not a file: $resolvedConfigPath"
+    }
+
+    if ([System.IO.Path]::GetExtension($resolvedConfigPath) -ne '.json') {
+        throw "Provided config file must be a .json file: $resolvedConfigPath"
+    }
+
+    $configJson = LoadJsonFile -filePath $resolvedConfigPath -expectedVersion $ExpectedVersion
+    if ($null -eq $configJson) {
+        throw "Failed to read config file: $resolvedConfigPath"
+    }
+
+    $importedItems = 0
+
+    if ($configJson.Apps) {
+        $appIds = @(
+            $configJson.Apps | 
+            Where-Object { $_ -is [string] } | 
+            ForEach-Object { $_.Trim() } |
+            Where-Object { -not [string]::IsNullOrWhiteSpace($_) }
+        )
+        
+        if ($appIds.Count -gt 0) {
+            AddParameter 'RemoveApps'
+            AddParameter 'Apps' ($appIds -join ',')
+            $importedItems++
+        }
+    }
+
+    if ($configJson.Tweaks) {
+        foreach ($setting in @($configJson.Tweaks)) {
+            if (-not $setting -or -not $setting.Name -or $setting.Value -ne $true) {
+                continue
+            }
+
+            $feature = $script:Features[$setting.Name]
+            if (-not $feature) {
+                continue
+            }
+
+            if (($feature.MinVersion -and $CurrentBuild -lt $feature.MinVersion) -or ($feature.MaxVersion -and $CurrentBuild -gt $feature.MaxVersion) -or ($feature.FeatureId -eq 'DisableModernStandbyNetworking' -and (-not $script:ModernStandbySupported))) {
+                continue
+            }
+
+            AddParameter $setting.Name $true
+            $importedItems++
+        }
+    }
+
+    if ($configJson.Deployment) {
+        $deploymentLookup = @{}
+        foreach ($setting in @($configJson.Deployment)) {
+            if ($setting -and $setting.Name) {
+                $deploymentLookup[$setting.Name] = $setting.Value
+            }
+        }
+
+        if ($deploymentLookup.ContainsKey('CreateRestorePoint') -and [bool]$deploymentLookup['CreateRestorePoint']) {
+            AddParameter 'CreateRestorePoint'
+            $importedItems++
+        }
+
+        if ($deploymentLookup.ContainsKey('RestartExplorer') -and -not [bool]$deploymentLookup['RestartExplorer']) {
+            AddParameter 'NoRestartExplorer'
+            $importedItems++
+        }
+
+        if ($deploymentLookup.ContainsKey('UserSelectionIndex')) {
+            switch ([int]$deploymentLookup['UserSelectionIndex']) {
+                1 {
+                    $otherUserName = if ($deploymentLookup.ContainsKey('OtherUsername')) { "$($deploymentLookup['OtherUsername'])".Trim() } else { '' }
+                    if (-not [string]::IsNullOrWhiteSpace($otherUserName)) {
+                        AddParameter 'User' $otherUserName
+                        $importedItems++
+                    }
+                }
+                2 {
+                    AddParameter 'Sysprep'
+                    $importedItems++
+                }
+            }
+        }
+
+        if ($deploymentLookup.ContainsKey('AppRemovalScopeIndex') -and $script:Params.ContainsKey('RemoveApps')) {
+            switch ([int]$deploymentLookup['AppRemovalScopeIndex']) {
+                0 {
+                    AddParameter 'AppRemovalTarget' 'AllUsers'
+                    $importedItems++
+                }
+                1 {
+                    AddParameter 'AppRemovalTarget' 'CurrentUser'
+                    $importedItems++
+                }
+                2 {
+                    $targetUser = if ($deploymentLookup.ContainsKey('OtherUsername')) { "$($deploymentLookup['OtherUsername'])".Trim() } else { '' }
+                    if (-not [string]::IsNullOrWhiteSpace($targetUser)) {
+                        AddParameter 'AppRemovalTarget' $targetUser
+                        $importedItems++
+                    }
+                }
+            }
+        }
+    }
+
+    if ($importedItems -eq 0) {
+        throw "The config file contains no importable data: $resolvedConfigPath"
+    }
+
+    return $resolvedConfigPath
+}

Scripts/Helpers/TestIfUserIsLoggedIn.ps1

@@ -0,0 +1,42 @@
+function TestIfUserIsLoggedIn {
+    param(
+        [Parameter(Mandatory)]
+        [string]$Username
+    )
+
+    try {
+        $quserOutput = @(& quser 2>$null)
+        if ($LASTEXITCODE -ne 0 -or -not $quserOutput) {
+            return $false
+        }
+
+        foreach ($line in ($quserOutput | Select-Object -Skip 1)) {
+            if ([string]::IsNullOrWhiteSpace($line)) { continue }
+
+            # Remove current-session marker and split columns.
+            $normalizedLine = $line.TrimStart('>', ' ')
+            $parts = $normalizedLine -split '\s+'
+            if ($parts.Count -eq 0) { continue }
+
+            $sessionUser = $parts[0]
+            if ([string]::IsNullOrWhiteSpace($sessionUser)) { continue }
+
+            # Normalize possible DOMAIN\user or user@domain formats.
+            if ($sessionUser.Contains('\')) {
+                $sessionUser = ($sessionUser -split '\\')[-1]
+            }
+            if ($sessionUser.Contains('@')) {
+                $sessionUser = ($sessionUser -split '@')[0]
+            }
+
+            if ($sessionUser.Equals($Username, [System.StringComparison]::OrdinalIgnoreCase)) {
+                return $true
+            }
+        }
+    }
+    catch {
+        return $false
+    }
+
+    return $false
+}

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

Win11Debloat.ps1

@@ -4,6 +4,7 @@
 param (
     [switch]$CLI,
     [switch]$Silent,
+    [switch]$Undo,
     [switch]$Sysprep,
     [string]$LogPath,
     [string]$User,
@@ -13,6 +14,7 @@ param (
     [switch]$RunDefaults,
     [switch]$RunDefaultsLite,
     [switch]$RunSavedSettings,
+    [string]$Config,
     [string]$Apps,
     [string]$AppRemovalTarget,
     [switch]$RemoveApps,
@@ -103,7 +105,8 @@ param (
 
 
 # Define script-level variables & paths
-$script:Version = "2026.03.09"
+$script:Version = "2026.03.15"
+$script:FeaturesConfigVersion = "2.0"
 $script:AppsListFilePath = "$PSScriptRoot/Config/Apps.json"
 $script:DefaultSettingsFilePath = "$PSScriptRoot/Config/DefaultSettings.json"
 $script:FeaturesFilePath = "$PSScriptRoot/Config/Features.json"
@@ -117,9 +120,13 @@ $script:MainWindowSchema = "$PSScriptRoot/Schemas/MainWindow.xaml"
 $script:MessageBoxSchema = "$PSScriptRoot/Schemas/MessageBoxWindow.xaml"
 $script:AboutWindowSchema = "$PSScriptRoot/Schemas/AboutWindow.xaml"
 $script:ApplyChangesWindowSchema = "$PSScriptRoot/Schemas/ApplyChangesWindow.xaml"
+$script:RevertSettingsWindowSchema = "$PSScriptRoot/Schemas/RevertSettingsWindow.xaml"
 $script:SharedStylesSchema = "$PSScriptRoot/Schemas/SharedStyles.xaml"
+$script:BubbleHintSchema = "$PSScriptRoot/Schemas/BubbleHint.xaml"
+$script:ImportExportConfigSchema = "$PSScriptRoot/Schemas/ImportExportConfigWindow.xaml"
+$script:LoadAppsDetailsScriptPath = "$PSScriptRoot/Scripts/FileIO/LoadAppsDetailsFromJson.ps1"
 
-$script:ControlParams = 'WhatIf', 'Confirm', 'Verbose', 'Debug', 'LogPath', 'Silent', 'Sysprep', 'User', 'NoRestartExplorer', 'RunDefaults', 'RunDefaultsLite', 'RunSavedSettings', 'RunAppsListGenerator', 'CLI', 'AppRemovalTarget'
+$script:ControlParams = 'WhatIf', 'Confirm', 'Verbose', 'Debug', 'LogPath', 'Silent', 'Undo', 'Sysprep', 'User', 'NoRestartExplorer', 'RunDefaults', 'RunDefaultsLite', 'RunSavedSettings', 'Config', 'RunAppsListGenerator', 'CLI', 'AppRemovalTarget'
 
 # Script-level variables for GUI elements
 $script:GuiWindow = $null
@@ -166,9 +173,23 @@ else {
     Start-Transcript -Path $script:DefaultLogPath -Append -IncludeInvocationHeader -Force | Out-Null
 }
 
-# Check if script has all required files
-if (-not ((Test-Path $script:DefaultSettingsFilePath) -and (Test-Path $script:AppsListFilePath) -and (Test-Path $script:RegfilesPath) -and (Test-Path $script:AssetsPath) -and (Test-Path $script:AppSelectionSchema) -and (Test-Path $script:ApplyChangesWindowSchema) -and (Test-Path $script:SharedStylesSchema) -and (Test-Path $script:FeaturesFilePath))) {
-    Write-Error "Win11Debloat is unable to find required files, please ensure all script files are present"
+# Check if script has all required files/directories.
+$optionalPathVariables = @('SavedSettingsFilePath', 'CustomAppsListFilePath', 'DefaultLogPath')
+$requiredPathVariables = @(Get-Variable -Scope Script | Where-Object {
+    $_.Name -match '(FilePath|Schema|ScriptPath|RegfilesPath|AssetsPath)$' -and ($optionalPathVariables -notcontains $_.Name)
+} | Select-Object -ExpandProperty Name)
+
+$missingRequiredPaths = @()
+foreach ($variableName in $requiredPathVariables) {
+    $pathValue = Get-Variable -Name $variableName -Scope Script -ValueOnly
+
+    if ([String]::IsNullOrWhiteSpace($pathValue) -or -not (Test-Path $pathValue)) {
+        $missingRequiredPaths += "$variableName => $pathValue"
+    }
+}
+
+if ($missingRequiredPaths.Count -gt 0) {
+    Write-Error "Win11Debloat is unable to find required files, please ensure all script files are present. Missing: $($missingRequiredPaths -join '; ')"
     Write-Output ""
     Write-Output "Press any key to exit..."
     $null = [System.Console]::ReadKey()
@@ -179,6 +200,15 @@ if (-not ((Test-Path $script:DefaultSettingsFilePath) -and (Test-Path $script:Ap
 $script:Features = @{}
 try {
     $featuresData = Get-Content -Path $script:FeaturesFilePath -Raw | ConvertFrom-Json
+
+    if (-not $featuresData.Version -or $featuresData.Version -ne $script:FeaturesConfigVersion) {
+        Write-Error "Features.json version mismatch (expected $($script:FeaturesConfigVersion), found $($featuresData.Version))"
+        Write-Output ""
+        Write-Output "Press any key to exit..."
+        $null = [System.Console]::ReadKey()
+        Exit
+    }
+
     foreach ($feature in $featuresData.Features) {
         $script:Features[$feature.FeatureId] = $feature
     }
@@ -217,15 +247,16 @@ if (-not $script:WingetInstalled -and -not $Silent) {
 
 ##################################################################################################################
 #                                                                                                                #
-#                                          FUNCTION IMPORTS/DEFINITIONS                                          #
+#                                                FUNCTION IMPORTS                                                #
 #                                                                                                                #
 ##################################################################################################################
 
-# Load app removal functions
+# App removal functions
 . "$PSScriptRoot/Scripts/AppRemoval/ForceRemoveEdge.ps1"
 . "$PSScriptRoot/Scripts/AppRemoval/RemoveApps.ps1"
+. "$PSScriptRoot/Scripts/AppRemoval/GetInstalledAppsViaWinget.ps1"
 
-# Load CLI functions
+# CLI functions
 . "$PSScriptRoot/Scripts/CLI/AwaitKeyToExit.ps1"
 . "$PSScriptRoot/Scripts/CLI/ShowCLILastUsedSettings.ps1"  
 . "$PSScriptRoot/Scripts/CLI/ShowCLIDefaultModeAppRemovalOptions.ps1"
@@ -235,7 +266,8 @@ if (-not $script:WingetInstalled -and -not $Silent) {
 . "$PSScriptRoot/Scripts/CLI/PrintPendingChanges.ps1"
 . "$PSScriptRoot/Scripts/CLI/PrintHeader.ps1"
 
-# Load Feature functions
+# Features functions
+. "$PSScriptRoot/Scripts/Features/ExecuteChanges.ps1"
 . "$PSScriptRoot/Scripts/Features/CreateSystemRestorePoint.ps1"
 . "$PSScriptRoot/Scripts/Features/DisableStoreSearchSuggestions.ps1"
 . "$PSScriptRoot/Scripts/Features/EnableWindowsFeature.ps1"
@@ -243,478 +275,47 @@ if (-not $script:WingetInstalled -and -not $Silent) {
 . "$PSScriptRoot/Scripts/Features/ReplaceStartMenu.ps1"
 . "$PSScriptRoot/Scripts/Features/RestartExplorer.ps1"
 
-# Load GUI functions
-. "$PSScriptRoot/Scripts/GUI/GetSystemUsesDarkMode.ps1"
-. "$PSScriptRoot/Scripts/GUI/SetWindowThemeResources.ps1"
-. "$PSScriptRoot/Scripts/GUI/AttachShiftClickBehavior.ps1"
-. "$PSScriptRoot/Scripts/GUI/ApplySettingsToUiControls.ps1"
-. "$PSScriptRoot/Scripts/GUI/Show-MessageBox.ps1"
-. "$PSScriptRoot/Scripts/GUI/Show-ApplyModal.ps1"
-. "$PSScriptRoot/Scripts/GUI/Show-AppSelectionWindow.ps1"
-. "$PSScriptRoot/Scripts/GUI/Show-MainWindow.ps1"
-. "$PSScriptRoot/Scripts/GUI/Show-AboutDialog.ps1"
-
-# Load File I/O functions
+# File I/O functions
 . "$PSScriptRoot/Scripts/FileIO/LoadJsonFile.ps1"
+. "$PSScriptRoot/Scripts/FileIO/SaveToFile.ps1"
 . "$PSScriptRoot/Scripts/FileIO/SaveSettings.ps1"
 . "$PSScriptRoot/Scripts/FileIO/LoadSettings.ps1"
 . "$PSScriptRoot/Scripts/FileIO/SaveCustomAppsListToFile.ps1"
 . "$PSScriptRoot/Scripts/FileIO/ValidateAppslist.ps1"
 . "$PSScriptRoot/Scripts/FileIO/LoadAppsFromFile.ps1"
 . "$PSScriptRoot/Scripts/FileIO/LoadAppsDetailsFromJson.ps1"
-
-# 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()
-    [System.Windows.Threading.Dispatcher]::CurrentDispatcher.BeginInvoke(
-        [System.Windows.Threading.DispatcherPriority]::Background,
-        [System.Windows.Threading.DispatcherOperationCallback]{
-            param($f)
-            $f.Continue = $false
-            return $null
-        },
-        $frame
-    )
-    [System.Windows.Threading.Dispatcher]::PushFrame($frame)
-}
-
-
-# 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 = @()
-    )
-
-    if (-not $script:GuiWindow) {
-        return (& $ScriptBlock @ArgumentList)
-    }
-
-    $ps = [powershell]::Create()
-    try {
-        $null = $ps.AddScript($ScriptBlock.ToString())
-        foreach ($arg in $ArgumentList) {
-            $null = $ps.AddArgument($arg)
-        }
-
-        $handle = $ps.BeginInvoke()
-
-        while (-not $handle.IsCompleted) {
-            DoEvents
-            Start-Sleep -Milliseconds 16
-        }
-
-        $result = $ps.EndInvoke($handle)
-
-        if ($result.Count -eq 0) { return $null }
-        if ($result.Count -eq 1) { return $result[0] }
-        return @($result)
-    }
-    finally {
-        $ps.Dispose()
-    }
-}
-
-
-# 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
-    }
-}
-
-
-# Run winget list and return installed apps (sync or async)
-function GetInstalledAppsViaWinget {
-    param (
-        [int]$TimeOut = 10,
-        [switch]$Async
-    )
-
-    if (-not $script:WingetInstalled) { return $null }
-
-    if ($Async) {
-        $wingetListJob = Start-Job { return winget list --accept-source-agreements --disable-interactivity }
-        return @{ Job = $wingetListJob; StartTime = Get-Date }
-    }
-    else {
-        $wingetListJob = Start-Job { return winget list --accept-source-agreements --disable-interactivity }
-        $jobDone = $wingetListJob | Wait-Job -TimeOut $TimeOut
-        if (-not $jobDone) {
-            Remove-Job -Job $wingetListJob -Force -ErrorAction SilentlyContinue
-            return $null
-        }
-        $result = Receive-Job -Job $wingetListJob
-        Remove-Job -Job $wingetListJob -ErrorAction SilentlyContinue
-        return $result
-    }
-}
-
-
-function GetUserName {
-    if ($script:Params.ContainsKey("User")) {
-        return $script:Params.Item("User")
-    }
-
-    return $env:USERNAME
-}
-
-
-
-# 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
-}
-
-
-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
-}
-
-
-# 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"
-}
-
-
-function GetFriendlyTargetUserName {
-    $target = GetTargetUserForAppRemoval
-
-    switch ($target) {
-        "AllUsers" { return "all users" }
-        "CurrentUser" { return "the current user" }
-        default { return "user $target" }
-    }
-}
-
-
-# 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
-}
-
-
-# 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
-        }
-    }
-}
-
-# 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
-# Parameters:
-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
-    }
-}
+. "$PSScriptRoot/Scripts/FileIO/LoadAppPresetsFromJson.ps1"
+
+# GUI functions
+. "$PSScriptRoot/Scripts/GUI/GetSystemUsesDarkMode.ps1"
+. "$PSScriptRoot/Scripts/GUI/SetWindowThemeResources.ps1"
+. "$PSScriptRoot/Scripts/GUI/AttachShiftClickBehavior.ps1"
+. "$PSScriptRoot/Scripts/GUI/ApplySettingsToUiControls.ps1"
+. "$PSScriptRoot/Scripts/GUI/Show-MessageBox.ps1"
+. "$PSScriptRoot/Scripts/GUI/Show-ConfigWindow.ps1"
+. "$PSScriptRoot/Scripts/GUI/Show-ApplyModal.ps1"
+. "$PSScriptRoot/Scripts/GUI/Show-RevertSettingsModal.ps1"
+. "$PSScriptRoot/Scripts/GUI/Show-AppSelectionWindow.ps1"
+. "$PSScriptRoot/Scripts/GUI/Show-MainWindow.ps1"
+. "$PSScriptRoot/Scripts/GUI/Show-AboutDialog.ps1"
+. "$PSScriptRoot/Scripts/GUI/Show-Bubble.ps1"
+
+# Helper functions
+. "$PSScriptRoot/Scripts/Helpers/AddParameter.ps1"
+. "$PSScriptRoot/Scripts/Helpers/CheckIfUserExists.ps1"
+. "$PSScriptRoot/Scripts/Helpers/CheckModernStandbySupport.ps1"
+. "$PSScriptRoot/Scripts/Helpers/GenerateAppsList.ps1"
+. "$PSScriptRoot/Scripts/Helpers/GetFriendlyTargetUserName.ps1"
+. "$PSScriptRoot/Scripts/Helpers/ImportConfigToParams.ps1"
+. "$PSScriptRoot/Scripts/Helpers/GetTargetUserForAppRemoval.ps1"
+. "$PSScriptRoot/Scripts/Helpers/GetUndoFeatureForParam.ps1"
+. "$PSScriptRoot/Scripts/Helpers/GetUserDirectory.ps1"
+. "$PSScriptRoot/Scripts/Helpers/GetUserName.ps1"
+. "$PSScriptRoot/Scripts/Helpers/TestIfUserIsLoggedIn.ps1"
+
+# Threading functions
+. "$PSScriptRoot/Scripts/Threading/DoEvents.ps1"
+. "$PSScriptRoot/Scripts/Threading/Invoke-NonBlocking.ps1"
 
 
 
@@ -748,6 +349,27 @@ foreach ($Param in $script:ControlParams) {
     }
 }
 
+# Guard: Undo mode requires at least one actionable and cannot be combined with deployment-targeted parameters
+if ($script:Params.ContainsKey('Undo')) {
+    $deploymentTargetParams = @('Sysprep', 'User', 'AppRemovalTarget')
+    $selectedDeploymentParams = @($deploymentTargetParams | Where-Object { $script:Params.ContainsKey($_) })
+
+    if ($selectedDeploymentParams.Count -gt 0) {
+        Write-Error "The -Undo parameter cannot be combined with deployment target parameters: -$($selectedDeploymentParams -join ', -')."
+        AwaitKeyToExit
+    }
+
+    $loadsSettingsFromPreset = $RunDefaults -or $RunDefaultsLite -or $RunSavedSettings
+    $undoTargets = @($script:Params.Keys | Where-Object {
+        ($script:ControlParams -notcontains $_) -and $_ -ne 'Apps' -and $_ -ne 'CreateRestorePoint'
+    })
+
+    if ($undoTargets.Count -eq 0 -and -not $loadsSettingsFromPreset) {
+        Write-Error "The -Undo parameter requires at least one setting/feature parameter to revert."
+        AwaitKeyToExit
+    }
+}
+
 # Hide progress bars for app removal, as they block Win11Debloat's output
 if (-not ($script:Params.ContainsKey("Verbose"))) {
     $ProgressPreference = 'SilentlyContinue'
@@ -784,6 +406,9 @@ if ((Test-Path $script:SavedSettingsFilePath) -and ([String]::IsNullOrWhiteSpace
     Remove-Item -Path $script:SavedSettingsFilePath -recurse
 }
 
+# Default to CLI mode for deployment-targeted parameters.
+$launchInCLI = $CLI -or $script:Params.ContainsKey("User") -or $script:Params.ContainsKey("Sysprep") -or $script:Params.ContainsKey("AppRemovalTarget")
+
 # Only run the app selection form if the 'RunAppsListGenerator' parameter was passed to the script
 if ($RunAppsListGenerator) {
     PrintHeader "Custom Apps List Generator"
@@ -803,7 +428,7 @@ if ($RunAppsListGenerator) {
 }
 
 # Change script execution based on provided parameters or user input
-if ((-not $script:Params.Count) -or $RunDefaults -or $RunDefaultsLite -or $RunSavedSettings -or ($controlParamsCount -eq $script:Params.Count)) {
+if ((-not $script:Params.Count) -or $RunDefaults -or $RunDefaultsLite -or $RunSavedSettings -or $Config -or ($controlParamsCount -eq $script:Params.Count)) {
     if ($RunDefaults -or $RunDefaultsLite) {
         ShowCLIDefaultModeOptions
     }
@@ -816,8 +441,23 @@ if ((-not $script:Params.Count) -or $RunDefaults -or $RunDefaultsLite -or $RunSa
 
         ShowCLILastUsedSettings
     }
+    elseif ($Config) {
+        try {
+            ImportConfigToParams -ConfigPath $Config -CurrentBuild $WinVersion -ExpectedVersion '1.0'
+        }
+        catch {
+            Write-Error "$_"
+            AwaitKeyToExit
+        }
+
+        if (-not $Silent) {
+            PrintHeader 'Custom Mode'
+            PrintPendingChanges
+            PrintHeader 'Custom Mode'
+        }
+    }
     else {
-        if ($CLI) {
+        if ($launchInCLI) {
             $Mode = ShowCLIMenuOptions 
         }
         else {
@@ -828,7 +468,7 @@ if ((-not $script:Params.Count) -or $RunDefaults -or $RunDefaultsLite -or $RunSa
                 Exit
             }
             catch {
-                Write-Warning "Unable to load WPF GUI (not supported in this environment), falling back to CLI mode"
+                Write-Warning "Something went wrong while loading the graphical interface, falling back to CLI mode: $_"
                 if (-not $Silent) {
                     Write-Host ""
                     Write-Host "Press any key to continue..."
@@ -869,9 +509,17 @@ if (($controlParamsCount -eq $script:Params.Keys.Count) -or ($script:Params.Keys
     AwaitKeyToExit
 }
 
-# Execute all selected/provided parameters using the consolidated function
-# (This also handles restore point creation if requested)
-ExecuteAllChanges
+try {
+    # Execute all selected/provided parameters using the consolidated function
+    # (This also handles restore point creation if requested)
+    ExecuteAllChanges
+}
+catch {
+    Write-Error "An error occurred while applying changes: $_"
+
+    AwaitKeyToExit
+}
+
 
 RestartExplorer