diff --git a/src/playbook/Configuration/tweaks/qol/visual-effects.yml b/src/playbook/Configuration/tweaks/qol/visual-effects.yml
index ab6292358c..3586bfbdfb 100644
--- a/src/playbook/Configuration/tweaks/qol/visual-effects.yml
+++ b/src/playbook/Configuration/tweaks/qol/visual-effects.yml
@@ -4,46 +4,57 @@ description: Configures the visual effects in Windows for the optimal responsive
 privilege: TrustedInstaller
 actions:
   - !registryValue:
-    path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects'
-    value: 'VisualFXSetting'
-    data: '3'
-    type: REG_DWORD
+    path: 'HKCU\Control Panel\Desktop'
+    value: 'FontSmoothing'
+    data: '2'
+    type: REG_SZ
   - !registryValue:
     path: 'HKCU\Control Panel\Desktop'
     value: 'UserPreferencesMask'
     data: '9012038010000000'
     type: REG_BINARY
-    # Disable 'Animate Windows when Minimizing and Maximizing'
+  - !registryValue:
+    path: 'HKCU\Control Panel\Desktop'
+    value: 'DragFullWindows'
+    data: '1'
+    type: REG_SZ
   - !registryValue:
     path: 'HKCU\Control Panel\Desktop\WindowMetrics'
     value: 'MinAnimate'
     data: '0'
     type: REG_SZ
   - !registryValue:
-    path: 'HKLM\SOFTWARE\Policies\Microsoft\Windows\DWM'
-    value: 'DisallowAnimations'
+    path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced'
+    value: 'ListviewAlphaSelect'
     data: '1'
     type: REG_DWORD
   - !registryValue:
-    path: 'HKCU\SOFTWARE\Microsoft\Windows\DWM'
-    value: 'EnableAeroPeek'
+    path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced'
+    value: 'IconsOnly'
     data: '0'
     type: REG_DWORD
   - !registryValue:
-    path: 'HKCU\SOFTWARE\Microsoft\Windows\DWM'
-    value: 'EnableWindowColorization'
-    data: '1'
+    path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced'
+    value: 'TaskbarAnimations'
+    data: '0'
     type: REG_DWORD
-    # No info on what it does, probably placebo
-    # - !registryValue:
-    # path: 'HKCU\SOFTWARE\Microsoft\Windows\DWM'
-    # value: 'Composition'
-    # data: '0'
-    # type: REG_DWORD
-
-    # Disable taskbar animations
   - !registryValue:
     path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced'
-    value: 'TaskbarAnimations'
+    value: 'ListviewShadow'
+    data: '1'
+    type: REG_DWORD
+  - !registryValue:
+    path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects'
+    value: 'VisualFXSetting'
+    data: '3'
+    type: REG_DWORD
+  - !registryValue:
+    path: 'HKCU\SOFTWARE\Microsoft\Windows\DWM'
+    value: 'EnableAeroPeek'
+    data: '0'
+    type: REG_DWORD
+  - !registryValue:
+    path: 'HKCU\SOFTWARE\Microsoft\Windows\DWM'
+    value: 'AlwaysHibernateThumbnails'
     data: '0'
     type: REG_DWORD
diff --git a/src/playbook/Executables/AtlasDesktop/3. Configuration/Animations/Disable Animations (default).cmd b/src/playbook/Executables/AtlasDesktop/3. Configuration/Animations/Disable Animations (default).cmd
deleted file mode 100644
index e54c5e4fb8..0000000000
--- a/src/playbook/Executables/AtlasDesktop/3. Configuration/Animations/Disable Animations (default).cmd	
+++ /dev/null
@@ -1,16 +0,0 @@
-@echo off
-
-whoami /user | find /i "S-1-5-18" > nul 2>&1 || (
-	call RunAsTI.cmd "%~f0" %*
-	exit /b
-)
-
-reg add "HKCU\Control Panel\Desktop" /v "UserPreferencesMask" /t REG_BINARY /d "9012038010000000" /f > nul
-reg add "HKCU\Control Panel\Desktop\WindowMetrics" /v "MinAnimate" /t REG_DWORD /d "0" /f > nul
-reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarAnimations" /t REG_DWORD /d "0" /f > nul
-reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects" /v "VisualFXSetting" /t REG_DWORD /d "3" /f > nul
-reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\DWM" /v "DisallowAnimations" /t REG_DWORD /d "1" /f > nul
-
-echo Finished, please reboot your device for changes to apply.
-pause
-exit /b
diff --git a/src/playbook/Executables/AtlasDesktop/3. Configuration/Animations/Enable Animations.cmd b/src/playbook/Executables/AtlasDesktop/3. Configuration/Animations/Enable Animations.cmd
deleted file mode 100644
index f6de044596..0000000000
--- a/src/playbook/Executables/AtlasDesktop/3. Configuration/Animations/Enable Animations.cmd	
+++ /dev/null
@@ -1,16 +0,0 @@
-@echo off
-
-whoami /user | find /i "S-1-5-18" > nul 2>&1 || (
-	call RunAsTI.cmd "%~f0" %*
-	exit /b
-)
-
-reg add "HKCU\Control Panel\Desktop" /v "UserPreferencesMask" /t REG_BINARY /d "9e3e078012000000" /f > nul
-reg add "HKCU\Control Panel\Desktop\WindowMetrics" /v "MinAnimate" /t REG_DWORD /d "1" /f > nul
-reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarAnimations" /t REG_DWORD /d "1" /f > nul
-reg delete "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects" /v "VisualFXSetting" /f > nul 2>&1
-reg delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\DWM" /v "DisallowAnimations" /f > nul 2>&1
-
-echo Finished, please reboot your device for changes to apply.
-pause
-exit /b
diff --git a/src/playbook/Executables/AtlasDesktop/3. Configuration/Visual Effects/Atlas Visual Effects (default).cmd b/src/playbook/Executables/AtlasDesktop/3. Configuration/Visual Effects/Atlas Visual Effects (default).cmd
new file mode 100644
index 0000000000..2b4f608cc8
--- /dev/null
+++ b/src/playbook/Executables/AtlasDesktop/3. Configuration/Visual Effects/Atlas Visual Effects (default).cmd	
@@ -0,0 +1,26 @@
+@echo off
+
+whoami /user | find /i "S-1-5-18" > nul 2>&1 || (
+	call RunAsTI.cmd "%~f0" %*
+	exit /b
+)
+
+(
+	reg add "HKCU\Control Panel\Desktop" /v "FontSmoothing" /t REG_SZ /d "2" /f
+	reg add "HKCU\Control Panel\Desktop" /v "UserPreferencesMask" /t REG_BINARY /d "9012038010000000" /f
+	reg add "HKCU\Control Panel\Desktop" /v "DragFullWindows" /t REG_SZ /d "1" /f
+	reg add "HKCU\Control Panel\Desktop\WindowMetrics" /v "MinAnimate" /t REG_SZ /d "0" /f
+	reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "ListviewAlphaSelect" /t REG_DWORD /d "1" /f
+	reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "IconsOnly" /t REG_DWORD /d "0" /f
+	reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarAnimations" /t REG_DWORD /d "0" /f
+	reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "ListviewShadow" /t REG_DWORD /d "1" /f
+	reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects" /v "VisualFXSetting" /t REG_DWORD /d "3" /f
+	reg add "HKCU\SOFTWARE\Microsoft\Windows\DWM" /v "EnableAeroPeek" /t REG_DWORD /d "0" /f
+	reg add "HKCU\SOFTWARE\Microsoft\Windows\DWM" /v "AlwaysHibernateThumbnails" /t REG_DWORD /d "0" /f
+	taskkill /f /im explorer.exe
+	taskkill /f /im sihost.exe
+) > nul
+
+choice /c:yn /n /m "Finished, would you like to logout to apply the changes? [Y/N] "
+if %errorlevel%==1 logoff
+exit /b
\ No newline at end of file
diff --git a/src/playbook/Executables/AtlasDesktop/3. Configuration/Visual Effects/Default Windows Visual Effects.cmd b/src/playbook/Executables/AtlasDesktop/3. Configuration/Visual Effects/Default Windows Visual Effects.cmd
new file mode 100644
index 0000000000..aa1e1e592e
--- /dev/null
+++ b/src/playbook/Executables/AtlasDesktop/3. Configuration/Visual Effects/Default Windows Visual Effects.cmd	
@@ -0,0 +1,26 @@
+@echo off
+
+whoami /user | find /i "S-1-5-18" > nul 2>&1 || (
+	call RunAsTI.cmd "%~f0" %*
+	exit /b
+)
+
+(
+	reg add "HKCU\Control Panel\Desktop" /v "FontSmoothing" /t REG_SZ /d "2" /f
+	reg add "HKCU\Control Panel\Desktop" /v "UserPreferencesMask" /t REG_BINARY /d "9E1E078012000000" /f
+	reg add "HKCU\Control Panel\Desktop" /v "DragFullWindows" /t REG_SZ /d "1" /f
+	reg add "HKCU\Control Panel\Desktop\WindowMetrics" /v "MinAnimate" /t REG_SZ /d "1" /f
+	reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "ListviewAlphaSelect" /t REG_DWORD /d "1" /f
+	reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "IconsOnly" /t REG_DWORD /d "0" /f
+	reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarAnimations" /t REG_DWORD /d "1" /f
+	reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "ListviewShadow" /t REG_DWORD /d "1" /f
+	reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VisualEffects" /v "VisualFXSetting" /t REG_DWORD /d "0" /f
+	reg add "HKCU\SOFTWARE\Microsoft\Windows\DWM" /v "EnableAeroPeek" /t REG_DWORD /d "1" /f
+	reg add "HKCU\SOFTWARE\Microsoft\Windows\DWM" /v "AlwaysHibernateThumbnails" /t REG_DWORD /d "1" /f
+	taskkill /f /im explorer.exe
+	taskkill /f /im sihost.exe
+) > nul
+
+choice /c:yn /n /m "Finished, would you like to logout to apply the changes? [Y/N] "
+if %errorlevel%==1 logoff
+exit /b
\ No newline at end of file
diff --git a/src/playbook/Executables/AtlasDesktop/3. Configuration/Animations/Visual Effect Settings.lnk b/src/playbook/Executables/AtlasDesktop/3. Configuration/Visual Effects/Visual Effect Settings.lnk
similarity index 100%
rename from src/playbook/Executables/AtlasDesktop/3. Configuration/Animations/Visual Effect Settings.lnk
rename to src/playbook/Executables/AtlasDesktop/3. Configuration/Visual Effects/Visual Effect Settings.lnk