diff --git a/Wrapper/data.txt b/Wrapper/data.txt
index 5673fd55..8066593b 100644
--- a/Wrapper/data.txt
+++ b/Wrapper/data.txt
@@ -114,7 +114,7 @@ PinToStart -UnpinAll;LeaveAlone
 <#uwp#>
 
 UninstallUWPApps;LeaveAlone;
-InstallHEIF;LeaveAlone;
+HEIF -Manual;HEIF -Install
 CortanaAutostart -Disable;CortanaAutostart -Enable;
 CheckUWPAppsUpdates;LeaveAlone
 
diff --git a/Wrapper/default.txt b/Wrapper/default.txt
index 844995d5..fa8dec5e 100644
--- a/Wrapper/default.txt
+++ b/Wrapper/default.txt
@@ -105,7 +105,7 @@ PinToStart -Tiles ControlPanel,DevicesPrinters,PowerShell
 <#uwp#>
 
 UninstallUWPApps;
-InstallHEIF;
+HEIF -Install
 CortanaAutostart -Disable;
 CheckUWPAppsUpdates
 
diff --git a/Wrapper/tooltip.txt b/Wrapper/tooltip.txt
index 7091d0fa..a9e40685 100644
--- a/Wrapper/tooltip.txt
+++ b/Wrapper/tooltip.txt
@@ -120,7 +120,7 @@ StorageSenseTempFiles -Enable;Delete temporary files that apps aren't using;
 StorageSenseTempFiles -Disable;Do not delete temporary files that apps aren't using;
 StorageSenseRecycleBin -Enable;Delete files in recycle bin if they have been there for over 30 days;
 StorageSenseRecycleBin -Disable;Do not delete files in recycle bin if they have been there for over 30 days;
-Hibernate -Disable;Disable hibernation if the device is not a laptop;
+Hibernate -Disable;Disable hibernation;
 Hibernate -Enable;Enable hibernate (default value);
 TempFolder -SystemDrive;Change the %TEMP% environment variable path to "%SystemDrive%\Temp;
 TempFolder -Default;Change %TEMP% environment variable path to "%LOCALAPPDATA%\Temp" (default value);
@@ -146,11 +146,11 @@ UpdateMicrosoftProducts -Enable;Receive updates for other Microsoft products whe
 UpdateMicrosoftProducts -Disable;Do not receive updates for other Microsoft products when you update Windows (default value);
 BackgroundUWPApps -Disable;Do not let all UWP apps run in the background;
 BackgroundUWPApps -Enable;Let all UWP apps run in the background (default value);
-PowerManagementScheme -High;Set the power management scheme on "High performance" if device is a desktop;
+PowerManagementScheme -High;Set the power management scheme on "High performance";
 PowerManagementScheme -Balanced;Set the power management scheme on "Balanced" (default value);
 LatestInstalled.NET -Enable;Use latest installed .NET runtime for all apps;
 LatestInstalled.NET -Disable;Do not use latest installed .NET runtime for all apps (default value);
-PCTurnOffDevice -Disable;Do not allow the computer (if device is not a laptop) to turn off the network adapters to save power;
+PCTurnOffDevice -Disable;Do not allow the computer to turn off the network adapters to save power;
 PCTurnOffDevice -Enable;Allow the computer to turn off the network adapters to save power (default value);
 SetInputMethod -English;Override for default input method: English;
 SetInputMethod -Default;Override for default input method: use langiage list (default value);