diff --git a/src/playbook/Configuration/tweaks.yml b/src/playbook/Configuration/tweaks.yml
index 9ce629e4d9..aff5e36625 100644
--- a/src/playbook/Configuration/tweaks.yml
+++ b/src/playbook/Configuration/tweaks.yml
@@ -233,7 +233,7 @@ actions:
   #  qol\explorer\remove-context-menus                                         #
   # -------------------------------------------------------------------------- #
   - !task: {path: 'tweaks\qol\explorer\remove-context-menus\cast-to-device.yml'}
-  - !task: {path: 'tweaks\qol\explorer\remove-context-menus\extract-all.yml'}
+  - !task: {path: 'tweaks\qol\explorer\remove-context-menus\extract.yml'}
   - !task: {path: 'tweaks\qol\explorer\remove-context-menus\include-in-library.yml'}
   - !task: {path: 'tweaks\qol\explorer\remove-context-menus\new-bitmap.yml'}
   - !task: {path: 'tweaks\qol\explorer\remove-context-menus\new-rtf.yml'}
diff --git a/src/playbook/Configuration/tweaks/qol/explorer/remove-context-menus/extract-all.yml b/src/playbook/Configuration/tweaks/qol/explorer/remove-context-menus/extract-all.yml
deleted file mode 100644
index b933820f0a..0000000000
--- a/src/playbook/Configuration/tweaks/qol/explorer/remove-context-menus/extract-all.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Remove 'Extract all' from Context Menu
-description: Removes 'Extract all' from Context Menu
-actions:
-  - !registryKey: {path: 'HKCR\CompressedFolder\ShellEx\ContextMenuHandlers\{b8cdcb65-b1bf-4b42-9428-1dfdb7ee92af}'}
-  - !registryKey: {path: 'HKCR\SystemFileAssociations\.zip\ShellEx\ContextMenuHandlers\{b8cdcb65-b1bf-4b42-9428-1dfdb7ee92af}'}
diff --git a/src/playbook/Configuration/tweaks/qol/explorer/remove-context-menus/extract.yml b/src/playbook/Configuration/tweaks/qol/explorer/remove-context-menus/extract.yml
new file mode 100644
index 0000000000..5e15160e62
--- /dev/null
+++ b/src/playbook/Configuration/tweaks/qol/explorer/remove-context-menus/extract.yml
@@ -0,0 +1,24 @@
+---
+title: Remove 'Extract' from Context Menu
+description: Removes 'Extract' from Context Menu
+actions:
+  - !registryValue:
+    path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Blocked'
+    value: '{b8cdcb65-b1bf-4b42-9428-1dfdb7ee92af}'
+    type: REG_SZ
+    data: ''
+  - !registryValue:
+    path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Blocked'
+    value: '{BD472F60-27FA-11cf-B8B4-444553540000}'
+    type: REG_SZ
+    data: ''
+  - !registryValue:
+    path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Blocked'
+    value: '{EE07CEF5-3441-4CFB-870A-4002C724783A}'
+    type: REG_SZ
+    data: ''
+  - !registryValue:
+    path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Blocked'
+    value: '{D12E3394-DE4B-4777-93E9-DF0AC88F8584}'
+    type: REG_SZ
+    data: ''
diff --git a/src/playbook/Executables/AtlasDesktop/4. Interface Tweaks/Context Menus/Extract/Add Extract.reg b/src/playbook/Executables/AtlasDesktop/4. Interface Tweaks/Context Menus/Extract/Add Extract.reg
new file mode 100644
index 0000000000..d8331ee33f
--- /dev/null
+++ b/src/playbook/Executables/AtlasDesktop/4. Interface Tweaks/Context Menus/Extract/Add Extract.reg	
@@ -0,0 +1,7 @@
+Windows Registry Editor Version 5.00
+
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Blocked]
+"{b8cdcb65-b1bf-4b42-9428-1dfdb7ee92af}"=""
+"{BD472F60-27FA-11cf-B8B4-444553540000}"=""
+"{EE07CEF5-3441-4CFB-870A-4002C724783A}"=""
+"{D12E3394-DE4B-4777-93E9-DF0AC88F8584}"=""
diff --git a/src/playbook/Executables/AtlasDesktop/4. Interface Tweaks/Context Menus/Extract/Remove Extract (default).reg b/src/playbook/Executables/AtlasDesktop/4. Interface Tweaks/Context Menus/Extract/Remove Extract (default).reg
new file mode 100644
index 0000000000..fb8d6a375b
--- /dev/null
+++ b/src/playbook/Executables/AtlasDesktop/4. Interface Tweaks/Context Menus/Extract/Remove Extract (default).reg	
@@ -0,0 +1,7 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Blocked]
+"{b8cdcb65-b1bf-4b42-9428-1dfdb7ee92af}"=""
+"{BD472F60-27FA-11cf-B8B4-444553540000}"=""
+"{EE07CEF5-3441-4CFB-870A-4002C724783A}"=""
+"{D12E3394-DE4B-4777-93E9-DF0AC88F8584}"=""