diff --git a/l10n b/l10n
index dd93803b8..07f5bf5d9 160000
--- a/l10n
+++ b/l10n
@@ -1 +1 @@
-Subproject commit dd93803b84f398834049a3f650536fbdbd14cbca
+Subproject commit 07f5bf5d9b4c2e0bae362f7720b702896f70c253
diff --git a/src/browser/base/content/zen-components b/src/browser/base/content/zen-components
index d853fa8de..2f2881814 160000
--- a/src/browser/base/content/zen-components
+++ b/src/browser/base/content/zen-components
@@ -1 +1 @@
-Subproject commit d853fa8de4167dfd4d1289f4f15792a698c738c3
+Subproject commit 2f2881814e7075cbea406b90ecee82e47cc87147
diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index e94d6a8f2..88b447179 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -4,18 +4,33 @@
 var gZenMarketplaceManager = {
   async init() {
     const checkForUpdates = document.getElementById('zenThemeMarketplaceCheckForUpdates');
-    if (!checkForUpdates) return; // We havent entered the settings page yet.
-    if (this.__hasInitializedEvents) return;
+    const header = document.getElementById('zenMarketplaceHeader');
+
+    if (!checkForUpdates || !header) {
+      return; // We haven't entered the settings page yet.
+    }
+
+    if (this.__hasInitializedEvents) {
+      return;
+    }
+
+    header.appendChild(this._initDisableAll());
+
     this.__hasInitializedEvents = true;
+
     await this._buildThemesList();
+
     Services.prefs.addObserver(this.updatePref, this);
-    var checkForUpdateClick = (event) => {
+
+    const checkForUpdateClick = (event) => {
       if (event.target === checkForUpdates) {
         event.preventDefault();
         this._checkForThemeUpdates(event);
       }
     };
+
     checkForUpdates.addEventListener('click', checkForUpdateClick);
+
     document.addEventListener('ZenThemeMarketplace:CheckForUpdatesFinished', (event) => {
       checkForUpdates.disabled = false;
       const updates = event.detail.updates;
@@ -29,6 +44,7 @@ var gZenMarketplaceManager = {
         error.hidden = false;
       }
     });
+
     window.addEventListener('unload', () => {
       Services.prefs.removeObserver(this.updatePref, this);
       this.__hasInitializedEvents = false;
@@ -40,6 +56,31 @@ var gZenMarketplaceManager = {
     });
   },
 
+  _initDisableAll() {
+    const areThemesDisabled = Services.prefs.getBoolPref('zen.themes.disable-all', false);
+    const browser = ZenThemesCommon.currentBrowser;
+    const mozToggle = document.createElement('moz-toggle');
+
+    mozToggle.className = 'zenThemeMarketplaceItemPreferenceToggle zenThemeMarketplaceDisableAllToggle';
+    mozToggle.pressed = !areThemesDisabled;
+
+    browser.document.l10n.setAttributes(mozToggle, `zen-theme-disable-all-${!areThemesDisabled ? 'enabled' : 'disabled'}`);
+
+    mozToggle.addEventListener('toggle', async (event) => {
+      const { pressed = false } = event.target || {};
+
+      this.themesList.style.display = pressed ? '' : 'none';
+      Services.prefs.setBoolPref('zen.themes.disable-all', !pressed);
+      browser.document.l10n.setAttributes(mozToggle, `zen-theme-disable-all-${pressed ? 'enabled' : 'disabled'}`);
+    });
+
+    if (areThemesDisabled) {
+      this.themesList.style.display = 'none';
+    }
+
+    return mozToggle;
+  },
+
   async observe() {
     ZenThemesCommon.resetThemesCache();
     await this._buildThemesList();
@@ -85,6 +126,8 @@ var gZenMarketplaceManager = {
     const themes = await ZenThemesCommon.getThemes();
     const theme = themes[themeId];
 
+    console.log(`[ZenThemeMarketplaceParent:settings]: Disabling theme ${theme.name}`);
+
     theme.enabled = false;
 
     await IOUtils.writeJSON(ZenThemesCommon.themesDataFile, themes);
@@ -96,6 +139,8 @@ var gZenMarketplaceManager = {
     const themes = await ZenThemesCommon.getThemes();
     const theme = themes[themeId];
 
+    console.log(`[ZenThemeMarketplaceParent:settings]: Enabling theme ${theme.name}`);
+
     theme.enabled = true;
 
     await IOUtils.writeJSON(ZenThemesCommon.themesDataFile, themes);
@@ -109,7 +154,10 @@ var gZenMarketplaceManager = {
   },
 
   async _buildThemesList() {
-    if (!this.themesList) return;
+    if (!this.themesList) {
+      return;
+    }
+
     if (this._doNotRebuildThemesList) {
       this._doNotRebuildThemesList = false;
       return;
@@ -617,9 +665,9 @@ var gZenWorkspacesSettings = {
         let buttonIndex = await confirmRestartPrompt(true, 1, true, true);
         if (buttonIndex == CONFIRM_RESTART_PROMPT_RESTART_NOW) {
           Services.startup.quit(Ci.nsIAppStartup.eAttemptQuit | Ci.nsIAppStartup.eRestart);
-        } 
-      }
-    }
+        }
+      },
+    };
     Services.prefs.addObserver('zen.workspaces.enabled', this);
     Services.prefs.addObserver('zen.tab-unloader.enabled', tabsUnloaderPrefListener);
     window.addEventListener('unload', () => {
@@ -682,17 +730,17 @@ var zenMissingKeyboardShortcutL10n = {
 };
 
 var zenKeycodeFixes = {
-  'Digit0': '0',
-  'Digit1': '1',
-  'Digit2': '2',
-  'Digit3': '3',
-  'Digit4': '4',
-  'Digit5': '5',
-  'Digit6': '6',
-  'Digit7': '7',
-  'Digit8': '8',
-  'Digit9': '9',
-}
+  Digit0: '0',
+  Digit1: '1',
+  Digit2: '2',
+  Digit3: '3',
+  Digit4: '4',
+  Digit5: '5',
+  Digit6: '6',
+  Digit7: '7',
+  Digit8: '8',
+  Digit9: '9',
+};
 
 var gZenCKSSettings = {
   async init() {
diff --git a/src/browser/components/preferences/zenMarketplace.inc.xhtml b/src/browser/components/preferences/zenMarketplace.inc.xhtml
index 5f32d7e66..77ab45998 100644
--- a/src/browser/components/preferences/zenMarketplace.inc.xhtml
+++ b/src/browser/components/preferences/zenMarketplace.inc.xhtml
@@ -9,7 +9,10 @@
 </hbox>
 
 <groupbox id="zenMarketplaceGroup" data-category="paneZenMarketplace" hidden="true" class="highlighting-group">
-      <label><html:h2 data-l10n-id="zen-theme-marketplace-header"/></label>
+
+      <hbox id="zenMarketplaceHeader">
+        <html:h2 data-l10n-id="zen-theme-marketplace-header"/>
+      </hbox>
       <description class="description-deemphasized" data-l10n-id="zen-theme-marketplace-description" />
       <hbox class="indent">
             <html:a id="zenThemeMarketplaceLink" href="https://zen-browser.app/themes" target="_blank" data-l10n-id="zen-theme-marketplace-link" />
diff --git a/src/browser/themes/shared/preferences/zen-preferences.css b/src/browser/themes/shared/preferences/zen-preferences.css
index 845b79664..06081ff4f 100644
--- a/src/browser/themes/shared/preferences/zen-preferences.css
+++ b/src/browser/themes/shared/preferences/zen-preferences.css
@@ -574,8 +574,29 @@ groupbox h2 {
   flex-direction: row;
 }
 
+#zenMarketplaceHeader {
+  display: flex;
+  justify-content: space-between;
+
+  & h2 {
+    margin: 0;
+  }
+}
+
 .zenThemeMarketplaceItemPreferenceToggle {
   align-self: start;
+
+  &::part(button) {
+    background-color: var(--zen-primary-color);
+  }
+
+  &::part(button)::before {
+    background-color: var(--zen-colors-secondary);
+  }
+}
+
+.zenThemeMarketplaceDisableAllToggle {
+  align-self: center;
 }
 
 #zenThemeMarketplaceItemContentHeader {