diff --git a/Wrapper/Sophia Script Wrapper.exe b/Wrapper/Sophia Script Wrapper.exe
index 0e346e62..6f93862c 100644
Binary files a/Wrapper/Sophia Script Wrapper.exe and b/Wrapper/Sophia Script Wrapper.exe differ
diff --git a/Wrapper/data.txt b/Wrapper/data.txt
index bb4f3382..c823b445 100644
--- a/Wrapper/data.txt
+++ b/Wrapper/data.txt
@@ -1,9 +1,9 @@
-<#systemprotection#>
+#region Protection
 
 Logging;LeaveAlone;
 CreateRestorePoint;LeaveAlone
 
-<#privacy&telemetry#>
+#region Privacy & Telemetry
 
 DiagTrackService -Disable;DiagTrackService -Enable;
 DiagnosticDataLevel -Minimal;DiagnosticDataLevel -Default;
@@ -22,7 +22,7 @@ WhatsNewInWindows -Disable;WhatsNewInWindows -Enable;
 TailoredExperiences -Disable;TailoredExperiences -Enable;
 BingSearch -Disable;BingSearch -Enable
 
-<#ui&personal#>
+#region UI & Personalization
 
 ThisPC -Show;ThisPC -Hide;
 CheckBoxes -Disable;CheckBoxes -Enable;
@@ -57,11 +57,11 @@ ShortcutsSuffix -Disable;ShortcutsSuffix -Enable;
 PrtScnSnippingTool -Enable;PrtScnSnippingTool -Disable;
 AppsLanguageSwitch -Disable;AppsLanguageSwitch -Enable
 
-<#onedrive#>
+#region OneDrive
 
 OneDrive -Uninstall;OneDrive -Install
 
-<#system#>
+#region System
 
 StorageSense -Enable;StorageSense -Disable;
 StorageSenseFrequency -Month;StorageSenseFrequency -Default;
@@ -100,7 +100,7 @@ DeviceRestartAfterUpdate -Enable;DeviceRestartAfterUpdate -Disable;
 WSL -Enable;WSL -Disable;
 EnableWSL2;LeaveAlone
 
-<#start#>
+#region Start menu
 
 RecentlyAddedApps -Hide;RecentlyAddedApps -Show;
 AppSuggestions -Hide;AppSuggestions -Show;
@@ -111,7 +111,7 @@ PinToStart -Tiles DevicesPrinters;LeaveAlone;
 PinToStart -Tiles PowerShell;LeaveAlone;
 PinToStart -UnpinAll;LeaveAlone
 
-<#uwp#>
+#region UWP apps
 
 UninstallUWPApps;LeaveAlone;UninstallUWPApps -ForAllUsers;LeaveAlone;
 RestoreUWPApps;LeaveAlone;
@@ -120,20 +120,20 @@ CortanaAutostart -Disable;CortanaAutostart -Enable;
 BackgroundUWPApps -Disable;BackgroundUWPApps -Enable;
 CheckUWPAppsUpdates;LeaveAlone
 
-<#gaming#>
+#region Gaming
 
 XboxGameBar -Disable;XboxGameBar -Enable;
 XboxGameTips -Disable;XboxGameTips -Enable;
 SetAppGraphicsPerformance;LeaveAlone;
 GPUScheduling -Enable;GPUScheduling -Disable
 
-<#scheduled#>
+#region Scheduled tasks
 
 CleanUpTask -Register;CleanUpTask -Delete;
 SoftwareDistributionTask -Register;SoftwareDistributionTask -Delete;
 TempTask -Register;TempTask -Delete
 
-<#defender&security#>
+#region Microsoft Defender & Security
 
 AddProtectedFolders;RemoveProtectedFolders;
 AddAppControlledFolder;RemoveAllowedAppsControlledFolder;
@@ -154,7 +154,7 @@ SaveZoneInformation -Disable;SaveZoneInformation -Enable;
 WindowsScriptHost -Disable;WindowsScriptHost -Enable;
 WindowsSandbox -Enable;WindowsSandbox -Disable
 
-<#context#>
+#region Context menu
 
 MSIExtractContext -Add;MSIExtractContext -Remove;
 CABInstallContext -Add;CABInstallContext -Remove;
@@ -176,7 +176,8 @@ MultipleInvokeContext -Enable;MultipleInvokeContext -Disable;
 UseStoreOpenWith -Hide;UseStoreOpenWith -Show;
 PreviousVersionsPage -Hide;PreviousVersionsPage -Show
 
-<#other#>
+#region Other
+
 ControlPanelView -Category;ControlPanelView -LargeIcons;ControlPanelView -SmallIcons;
 TaskbarSearch -Hide;TaskbarSearch -SearchIcon;TaskbarSearch -SearchBox;
 SetUserShellFolderLocation -Root;SetUserShellFolderLocation -Custom;SetUserShellFolderLocation -Default
diff --git a/Wrapper/default.txt b/Wrapper/default.txt
index 758820b3..2197074f 100644
--- a/Wrapper/default.txt
+++ b/Wrapper/default.txt
@@ -1,8 +1,8 @@
-<#systemprotection#>
+#region Protection
 
 CreateRestorePoint
 
-<#privacy&telemetry#>
+#region Privacy & Telemetry
 
 TelemetryService -Disable;
 DiagnosticDataLevel -Minimal;
@@ -21,7 +21,7 @@ WhatsNewInWindows -Disable;
 TailoredExperiences -Disable;
 BingSearch -Disable
 
-<#ui&personal#>
+#region UI & Personalization
 
 ThisPC -Show;
 CheckBoxes -Disable;
@@ -56,11 +56,11 @@ ShortcutsSuffix -Disable;
 PrtScnSnippingTool -Enable;
 AppsLanguageSwitch -Disable
 
-<#onedrive#>
+#region OneDrive
 
 OneDrive -Uninstall
 
-<#system#>
+#region System
 
 StorageSense -Enable;
 StorageSenseFrequency -Month;
@@ -95,14 +95,14 @@ NetworkDiscovery -Enable;
 SmartActiveHours -Enable;
 DeviceRestartAfterUpdate -Enable
 
-<#start#>
+#region Start menu
 
 RecentlyAddedApps -Hide;
 AppSuggestions -Hide;
 RunPowerShellShortcut -Elevated;
 PinToStart -Tiles ControlPanel, DevicesPrinters, PowerShell
 
-<#uwp#>
+#region UWP apps
 
 UninstallUWPApps;
 HEIF -Install;
@@ -110,20 +110,20 @@ CortanaAutostart -Disable;
 BackgroundUWPApps -Disable;
 CheckUWPAppsUpdates
 
-<#gaming#>
+#region Gaming
 
 XboxGameBar -Disable;
 XboxGameTips -Disable;
 SetAppGraphicsPerformance;
 GPUScheduling -Enable
 
-<#scheduled#>
+#region Scheduled tasks
 
 CleanUpTask -Register;
 SoftwareDistributionTask -Register;
 TempTask -Register
 
-<#defender&security#>
+#region Microsoft Defender & Security
 
 AddProtectedFolders;
 AddAppControlledFolder;
@@ -144,7 +144,7 @@ SaveZoneInformation -Disable;
 WindowsScriptHost -Disable;
 WindowsSandbox -Enable
 
-<#context#>
+#region Context menu
 
 MSIExtractContext -Add;
 CABInstallContext -Add;
@@ -165,7 +165,8 @@ MultipleInvokeContext -Enable;
 UseStoreOpenWith -Hide;
 PreviousVersionsPage -Hide
 
-<#other#>
+#region Other
+
 ControlPanelView -LargeIcons;
 TaskbarSearch -Hide;
 SetUserShellFolderLocation -Root
diff --git a/Wrapper/tooltip.txt b/Wrapper/tooltip.txt
index 79e8016e..d2a417ce 100644
--- a/Wrapper/tooltip.txt
+++ b/Wrapper/tooltip.txt
@@ -1,9 +1,9 @@
-<#systemprotection#>
+#region Protection
 
 Logging;Enable script logging. The log will be being recorded into the script folder.To stop logging just close the console or type "Stop-Transcript";
 CreateRestorePoint;Create a restore point
 
-<#privacy&telemetry#>
+#region Privacy & Telemetry
 
 DiagTrackService -Disable;Disable the DiagTrack service, firewall rule for Unified Telemetry Client Outbound Traffic and block connection;
 DiagTrackService -Enable;Enable the DiagTrack service, firewall rule for Unified Telemetry Client Outbound Traffic and allow connection (default value);
@@ -38,7 +38,7 @@ TailoredExperiences -Enable;Offer tailored experiences based on the diagnostic d
 BingSearch -Disable;Disable Bing search in the Start Menu (for the USA only);
 BingSearch -Enable;Enable Bing search in the Start Menu (default value)
 
-<#ui&personal#>
+#region UI & Personalization
 
 ThisPC -Show;Show the "This PC" icon on Desktop;
 ThisPC -Hide; Hide the "This PC" icon on Desktop (default value);
@@ -107,12 +107,12 @@ PrtScnSnippingTool -Disable;Do not use the PrtScn button to open screen snipping
 AppsLanguageSwitch -Disable;Let let use a different input method for each app window;
 AppsLanguageSwitch -Enable;Do not let use a different input method for each app window (default value)
 
-<#onedrive#>
+#region OneDrive
 
 OneDrive -Uninstall;Uninstall OneDrive;
 OneDrive -Install;Install OneDrive (default value)
 
-<#system#>
+#region System
 
 StorageSense -Enable;Turn on Storage Sense;
 StorageSense -Disable;Turn off Storage Sense (default value);
@@ -186,7 +186,7 @@ WSL -Enable;Install the Windows Subsystem for Linux (WSL);
 WSL -Disable;Uninstall the Windows Subsystem for Linux (WSL);
 EnableWSL2;Download and install the Linux kernel update package. Set WSL 2 as the default version when installing a new Linux distribution. Run the function only after WSL installed and PC restart;
 
-<#start#>
+#region Start menu
 
 RecentlyAddedApps -Hide;Hide recently added apps in the Start menu;
 RecentlyAddedApps -Show;Show recently added apps in the Start menu (default value);
@@ -200,7 +200,7 @@ PinToStart -Tiles DevicesPrinters;Pin the "Devices & Printers" shortcut to Start
 PinToStart -Tiles PowerShell;Pin the Windows PowerShell shortcut to Start;
 PinToStart -UnpinAll;Unpin all the Start tiles
 
-<#uwp#>
+#region UWP apps
 
 UninstallUWPApps;Uninstall UWP apps using the pop-up dialog box. If the "For All Users" is checked apps packages will not be installed for new users. The "For All Users" checkbox isn't checked by default;
 UninstallUWPApps -ForAllUsers;Uninstall UWP apps using the pop-up dialog box. If the "For All Users" is checked apps packages will not be installed for new users. The "For All Users" checkbox checked by default;
@@ -212,7 +212,7 @@ BackgroundUWPApps -Disable;Do not let all UWP apps run in the background;
 BackgroundUWPApps -Enable;Let all UWP apps run in the background (default value);
 CheckUWPAppsUpdates;Check for UWP apps updates
 
-<#gaming#>
+#region Gaming
 
 XboxGameBar -Disable;Disable Xbox Game Bar;
 XboxGameBar -Enable;Enable Xbox Game Bar (default value);
@@ -222,7 +222,7 @@ SetAppGraphicsPerformance;Set "High performance" in graphics performance prefere
 GPUScheduling -Enable;Turn on hardware-accelerated GPU scheduling. Restart needed. Only with a dedicated GPU and WDDM verion is 2.7 or higher;
 GPUScheduling -Disable;Turn off hardware-accelerated GPU scheduling (default value). Restart needed;
 
-<#scheduled#>
+#region Scheduled tasks
 
 CleanUpTask -Register;Create the "Windows Cleanup" scheduled task for cleaning up unused files and Windows updates;
 CleanUpTask -Delete;Delete the "Windows Cleanup" scheduled task for cleaning up unused files and Windows updates;
@@ -231,7 +231,7 @@ SoftwareDistributionTask -Delete;Delete the "SoftwareDistribution" scheduled tas
 TempTask -Register;Create the "Temp" scheduled task for cleaning up the %TEMP% folder;
 TempTask -Delete;Delete the "Temp" scheduled task for cleaning up the %TEMP% folder
 
-<#defender&security#>
+#region Microsoft Defender & Security
 
 AddProtectedFolders;Enable Controlled folder access and add protected folders;
 RemoveProtectedFolders;Remove all added protected folders;
@@ -268,7 +268,7 @@ WindowsScriptHost -Enable;Emable Windows Script Host (default value);
 WindowsSandbox -Enable;Enable Windows Sandbox;
 WindowsSandbox -Disable;Disable Windows Sandbox (default value)
 
-<#context#>
+#region Context menu
 
 MSIExtractContext -Add;Add the "Extract all" item to Windows Installer (.msi) context menu;
 MSIExtractContext -Remove;Remove the "Extract all" item from Windows Installer (.msi) context menu (default value);
@@ -309,7 +309,7 @@ UseStoreOpenWith -Show;Show the "Look for an app in the Microsoft Store" item in
 PreviousVersionsPage -Hide;Hide the "Previous Versions" tab from files and folders context menu and also the "Restore previous versions" context menu item;
 PreviousVersionsPage -Show;Show the "Previous Versions" tab from files and folders context menu and also the "Restore previous versions" context menu item (default value)
 
-<#other#>
+#region Other
 
 ControlPanelView -Category;View the Control Panel icons by: category (default value);
 ControlPanelView -LargeIcons;View the Control Panel icons by: large icons;