Merge branch 'dev' of https://github.com/zen-browser/desktop into tab-folders

.prettierignore

@@ -9,6 +9,8 @@ engine/
 
 **/*.svg
 
+**/*.inc.css
+
 surfer.json
 
 src/browser/app/profile/*.js
@@ -26,4 +28,6 @@ src/zen/tabs/zen-tabs.css
 src/zen/compact-mode/zen-compact-mode.css
 src/zen/common/ZenEmojies.mjs
 
+src/zen/workspaces/zen-workspaces.css
+
 *.inc

README.md

@@ -1,3 +1,4 @@
+<!-- TODO: Get a job -->
 <img src="./docs/assets/zen-dark.svg" width="100px" align="left">
 
 ### `Zen Browser`
@@ -28,9 +29,9 @@
 
 ## 🖥️ Compatibility
 
-Zen is currently built using Firefox version `138.0.3`! 🚀
+Zen is currently built using Firefox version `138.0.4`! 🚀
 
-- [`Zen Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 138.0.3`!
+- [`Zen Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 139.0`!
 - Check out the latest [release notes](https://zen-browser.app/release-notes)!
 - Part of our mission is to keep Zen up-to-date with the latest version of Firefox, so you can enjoy the latest features and security updates!
 

build/firefox-cache/l10n-last-commit-hash

@@ -1 +1 @@
-a7fc259e12695c40d6ae249950f054221fed4f95
+82a08ea3ce2d17f21f3d45f4b5607a37590b0158

l10n

@@ -1 +1 @@
-Subproject commit 3aef56c134be9fa88b7e77f8f3c3a1b28a072735
+Subproject commit 644474b8c92e306288d835698eb6714081a650d8

package.json

@@ -23,7 +23,9 @@
     "lint": "npx prettier . --check && autopep8 --diff scripts/ src/",
     "prepare": "husky",
     "reset-ff": "surfer reset",
-    "surfer": "surfer"
+    "surfer": "surfer",
+    "test": "python3 scripts/run_tests.py",
+    "test:dbg": "python3 scripts/run_tests.py --jsdebugger --debug-on-failure"
   },
   "repository": {
     "type": "git",

scripts/run_tests.py

@@ -0,0 +1,45 @@
+import os
+import sys
+import subprocess
+from pathlib import Path
+
+
+def main():
+  project_root = Path(__file__).resolve().parent.parent
+  package_json = project_root / 'package.json'
+
+  # Ensure script is run from project root
+  if not package_json.exists():
+    print("Please run this script from the root of the project", file=sys.stderr)
+    sys.exit(1)
+
+  args = sys.argv[1:]
+  path = ""
+  for arg in args:
+    if not arg.startswith("--"):
+      path = arg
+      break
+
+  # Collect any additional arguments
+  other_args = [arg for arg in args if arg != path]
+
+  engine_dir = project_root / 'engine'
+  os.chdir(engine_dir)
+
+  def run_mach_with_paths(test_paths):
+    command = ['./mach', 'mochitest'] + other_args + test_paths
+    subprocess.run(command, check=True)
+
+  if path in ("", "all"):
+    test_dirs = [p for p in Path("zen/tests").iterdir() if p.is_dir()]
+    test_paths = [str(p) for p in test_dirs]
+    run_mach_with_paths(test_paths)
+  else:
+    run_mach_with_paths([f"zen/tests/{path}"])
+
+  # Return to original directory
+  os.chdir(project_root)
+
+
+if __name__ == "__main__":
+  main()

src/Cargo-lock.patch

@@ -1,8 +1,8 @@
 diff --git a/Cargo.lock b/Cargo.lock
-index 38508fffccbce801a02d4a4211f368674307c4d3..5ce56c36da2e242ad81621c2032eb68dcd26e960 100644
+index f7ebed9b2a71da90c5751cfd5d5f018cc8b73612..96e881c7782198f1e58be2578f167c7079a8191e 100644
 --- a/Cargo.lock
 +++ b/Cargo.lock
-@@ -3931,8 +3931,6 @@ dependencies = [
+@@ -4014,8 +4014,6 @@ dependencies = [
  [[package]]
  name = "mime_guess"
  version = "2.0.4"

src/Cargo-toml.patch

@@ -1,8 +1,8 @@
 diff --git a/Cargo.toml b/Cargo.toml
-index d3d529b487f80d4b4f3bfa13cdd3f62946352db8..b35a9e0e3339d48d1cd0cab7b22d030f330e40d1 100644
+index 8c6b99bc629ec26e01ab3746f2ae46174bfaa0b1..5791c7470923c7c15986089b40357ce80365e942 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -217,6 +217,9 @@ rure = { path = "third_party/rust/rure" }
+@@ -233,6 +233,9 @@ rure = { path = "third_party/rust/rure" }
  # Patch `plist` to work with `indexmap` 2.*
  plist = { path = "third_party/rust/plist" }
  

src/browser/actors/WebRTCParent-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/actors/WebRTCParent.sys.mjs b/browser/actors/WebRTCParent.sys.mjs
-index 40e3a057a1d4b2f9bcfb73fa5ff96b2555865434..a92bed06766dd930bd336d56cd9ddcf3c6c0eeca 100644
+index 4ed2dd19207fc38b9e5cc22ea2947aba94b2f5ad..ffc88d62dc46683399c68cdfd35f1b1efde70902 100644
 --- a/browser/actors/WebRTCParent.sys.mjs
 +++ b/browser/actors/WebRTCParent.sys.mjs
 @@ -152,6 +152,7 @@ export class WebRTCParent extends JSWindowActorParent {

src/browser/app/profile/browser.inc

@@ -9,6 +9,9 @@ pref("browser.tabs.closeWindowWithLastTab", false);
 pref("browser.tabs.loadBookmarksInTabs", false);
 pref("browser.tabs.hoverPreview.enabled", false);
 pref("browser.tabs.dragdrop.moveOverThresholdPercent", 50);
+pref("browser.tabs.unloadTabInContextMenu", true);
+pref("browser.tabs.fadeOutExplicitlyUnloadedTabs", true);
+
 pref('browser.toolbars.bookmarks.visibility', 'never');
 pref("browser.bookmarks.openInTabClosesMenu", false);
 pref("browser.menu.showViewImageInfo", true);

src/browser/app/profile/features.inc

@@ -64,14 +64,6 @@ pref('zen.urlbar.show-domain-only-in-sidebar', true);
 pref('zen.urlbar.hide-one-offs', true);
 pref('zen.urlbar.enable-overrides', false);
 
-// Exoerimental: Apply a blend mode to the websites so they can render rounded corners
-// IMPORTANT: Remove once firefox 139 is released
-#ifdef XP_MACOSX
-pref('zen.view.experimental-rounded-view', false);
-#else 
-pref('zen.view.experimental-rounded-view', true);
-#endif
-
 // Glance
 pref('zen.glance.enabled', true);
 pref('zen.glance.hold-duration', 300); // in ms
@@ -99,18 +91,12 @@ pref('zen.view.grey-out-inactive-windows', true);
 pref('zen.view.hide-window-controls', true);
 pref('zen.view.experimental-no-window-controls', false);
 
-pref('zen.tabs.dim-pending', true);
-
 pref('zen.keyboard.shortcuts.enabled', true);
 pref('zen.keyboard.shortcuts.version', 0); // Empty string means default shortcuts
 pref('zen.keyboard.shortcuts.disable-mainkeyset-clear', false); // for debugging
 
 pref('zen.themes.updated-value-observer', false);
 
-pref('zen.tab-unloader.enabled', true);
-pref('zen.tab-unloader.timeout-minutes', 40);
-pref('zen.tab-unloader.excluded-urls', "example.com,example.org");
-
 pref('zen.pinned-tab-manager.debug', false);
 pref('zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url', false);
 pref('zen.pinned-tab-manager.close-shortcut-behavior', 'reset-unload-switch');

src/browser/app/profile/firefox-js.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index eda8312b0edd34ed22c94c224167680ac6c9c459..56de47f79c553dab2676e127f5320e352b7d3a77 100644
+index beced8067e6c8b5c8cf8e3f6060ba259ec9a294d..33a264e7f9cf97944da3888bdb957fa6e7c4c346 100644
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -3377,3 +3377,5 @@ pref("toolkit.contentRelevancy.enabled", false);
+@@ -3398,3 +3398,5 @@ pref("toolkit.contentRelevancy.enabled", false);
  pref("toolkit.contentRelevancy.ingestEnabled", false);
  // Pref to enable extra logging for the content relevancy feature
  pref("toolkit.contentRelevancy.log", false);

src/browser/app/profile/performance.inc

@@ -12,6 +12,19 @@ pref("gfx.canvas.accelerated", true);
 pref("media.hardware-video-decoding.enabled", true);
 pref("layers.gpu-process.enabled", true);
 
+#ifdef XP_MACOSX
+// Pref to control the reponse taken on macOS when the OS is under memory
+// pressure. Changes to the pref take effect immediately. Browser restart not
+// required. The pref value is a bitmask:
+// 0x0: No response (other than recording for telemetry, crash reporting)
+// 0x1: Use the tab unloading feature to reduce memory use. Requires that
+//      the above "browser.tabs.unloadOnLowMemory" pref be set to true for tab
+//      unloading to occur.
+// 0x2: Issue the internal "memory-pressure" notification to reduce memory use
+// 0x3: Both 0x1 and 0x2.
+pref("browser.lowMemoryResponseMask", 3);
+#endif
+
 // Prefetching:
 pref("network.dns.disablePrefetch", false);
 pref("network.prefetch-next", true);

src/browser/base/content/browser-box-inc-xhtml.patch

@@ -1,13 +1,15 @@
 diff --git a/browser/base/content/browser-box.inc.xhtml b/browser/base/content/browser-box.inc.xhtml
-index 7d7e8697f02f90d4f336c9ab0a73a89848e0c21c..d113b439888d26629ce5f6b5d35f8fa12249774b 100644
+index 7d7e8697f02f90d4f336c9ab0a73a89848e0c21c..64e950106dd05b443ce72107613ac9cc405d56ea 100644
 --- a/browser/base/content/browser-box.inc.xhtml
 +++ b/browser/base/content/browser-box.inc.xhtml
-@@ -23,7 +23,13 @@
+@@ -23,7 +23,15 @@
      <browser id="sidebar" autoscroll="false" disablehistory="true" disablefullscreen="true" tooltip="aHTMLTooltip"/>
    </vbox>
    <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
 +<vbox flex="1" id="zen-appcontent-wrapper">
-+  <html:div id="zen-appcontent-navbar-container"></html:div>
++  <html:div id="zen-appcontent-navbar-wrapper">
++    <html:div id="zen-appcontent-navbar-container"></html:div>
++  </html:div>
 +  <hbox id="zen-tabbox-wrapper" flex="1">
    <tabbox id="tabbrowser-tabbox" flex="1" tabcontainer="tabbrowser-tabs">
 +#include zen-tabbrowser-elements.inc.xhtml

src/browser/base/content/browser-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
-index ea79d296e7dd0f8fd812b0677a252af5cf7ad26e..08568d90f888cc262a23ffaa72e985e7c3463b93 100644
+index 6d664917a5a3bb1cea8a747e42e8bc0065ec999e..5059293ebfa29d646455b7a3505bd6eae408ba64 100644
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
 @@ -33,6 +33,7 @@ ChromeUtils.defineESModuleGetters(this, {
@@ -10,19 +10,18 @@ index ea79d296e7dd0f8fd812b0677a252af5cf7ad26e..08568d90f888cc262a23ffaa72e985e7
    DevToolsSocketStatus:
      "resource://devtools/shared/security/DevToolsSocketStatus.sys.mjs",
    DownloadUtils: "resource://gre/modules/DownloadUtils.sys.mjs",
-@@ -2338,6 +2339,11 @@ var XULBrowserWindow = {
+@@ -2340,6 +2341,10 @@ var XULBrowserWindow = {
      AboutReaderParent.updateReaderButton(gBrowser.selectedBrowser);
      TranslationsParent.onLocationChange(gBrowser.selectedBrowser);
  
 +    gZenViewSplitter.onLocationChange(gBrowser.selectedBrowser);
 +    gZenWorkspaces.onLocationChange(gBrowser.selectedBrowser);
-+    gZenTabUnloader.onLocationChange(gBrowser.selectedBrowser);
 +    gZenPinnedTabManager.onLocationChange(gBrowser.selectedBrowser);
 +
      PictureInPicture.updateUrlbarToggle(gBrowser.selectedBrowser);
  
      if (!gMultiProcessBrowser) {
-@@ -4814,7 +4820,7 @@ function switchToTabHavingURI(
+@@ -4816,7 +4821,7 @@ function switchToTabHavingURI(
        ignoreQueryString || replaceQueryString,
        ignoreFragmentWhenComparing
      );
@@ -31,7 +30,7 @@ index ea79d296e7dd0f8fd812b0677a252af5cf7ad26e..08568d90f888cc262a23ffaa72e985e7
      for (let i = 0; i < browsers.length; i++) {
        let browser = browsers[i];
        let browserCompare = cleanURL(
-@@ -4857,7 +4863,7 @@ function switchToTabHavingURI(
+@@ -4859,7 +4864,7 @@ function switchToTabHavingURI(
          }
  
          if (!doAdopt) {

src/browser/base/content/browser-xhtml.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
-index 51a25aaa5558e6e17246d54a7ed95d5ddf3ecdab..08809c25c01d159a9903f1921936b178d51f9875 100644
+index 8f8c5536cb6e54300897180ca3f950974c60e930..79305485631f14712d8b2674f477b641ec53fcd6 100644
 --- a/browser/base/content/browser.xhtml
 +++ b/browser/base/content/browser.xhtml
 @@ -26,6 +26,7 @@
@@ -10,7 +10,7 @@ index 51a25aaa5558e6e17246d54a7ed95d5ddf3ecdab..08809c25c01d159a9903f1921936b178
          persist="screenX screenY width height sizemode"
          data-l10n-sync="true">
  <head>
-@@ -104,8 +105,11 @@
+@@ -105,8 +106,11 @@
  
    <title data-l10n-id="browser-main-window-default-title"></title>
  
@@ -22,7 +22,7 @@ index 51a25aaa5558e6e17246d54a7ed95d5ddf3ecdab..08809c25c01d159a9903f1921936b178
  </head>
  <html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  # All sets except for popupsets (commands, keys, and stringbundles)
-@@ -127,9 +131,11 @@
+@@ -128,9 +132,11 @@
      </vbox>
    </html:template>
  

src/browser/base/content/zen-assets.inc.xhtml

@@ -29,19 +29,16 @@
 </linkset>
 
 # Scripts used all over the browser
-<script>
+<script src="chrome://browser/content/ZenUIManager.mjs"></script>                             
-Services.scriptloader.loadSubScript("chrome://browser/content/ZenUIManager.mjs", this);
+<script src="chrome://browser/content/zen-components/ZenFolders.mjs"></script>
-Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenFolders.mjs", this);
+<script src="chrome://browser/content/zen-components/ZenThemesCommon.mjs"></script>
-Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenThemesCommon.mjs", this);
+<script src="chrome://browser/content/zen-components/ZenThemesImporter.mjs"></script>
-Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenThemesImporter.mjs", this);
+<script src="chrome://browser/content/zen-components/ZenCompactMode.mjs"></script>
-Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenCompactMode.mjs", this);
+<script src="chrome://browser/content/zen-components/ZenPinnedTabsStorage.mjs"></script>
-Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenTabUnloader.mjs", this);
+<script src="chrome://browser/content/zen-components/ZenWorkspacesStorage.mjs"></script>
-Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenPinnedTabsStorage.mjs", this);
+<script src="chrome://browser/content/zen-components/ZenPinnedTabManager.mjs"></script>
-Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenWorkspacesStorage.mjs", this);
+<script src="chrome://browser/content/zen-components/ZenGradientGenerator.mjs"></script>
-Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenPinnedTabManager.mjs", this);
+<script src="chrome://browser/content/zen-components/ZenViewSplitter.mjs"></script>
-Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenGradientGenerator.mjs", this);
+<script src="chrome://browser/content/zen-components/ZenGlanceManager.mjs"></script>
-Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenViewSplitter.mjs", this);
+<script src="chrome://browser/content/zen-components/ZenMediaController.mjs"></script>
-Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenGlanceManager.mjs", this);
+<script src="chrome://browser/content/zen-components/ZenDownloadAnimation.mjs"></script>
-Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenMediaController.mjs", this);
-Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenDownloadAnimation.mjs", this);
-</script>

src/browser/base/content/zen-assets.jar.inc.mn

@@ -45,12 +45,11 @@
         content/browser/zen-components/ZenWorkspacesStorage.mjs                 (../../zen/workspaces/ZenWorkspacesStorage.mjs)
         content/browser/zen-components/ZenWorkspacesSync.mjs                    (../../zen/workspaces/ZenWorkspacesSync.mjs)
         content/browser/zen-components/ZenGradientGenerator.mjs                 (../../zen/workspaces/ZenGradientGenerator.mjs)
-        content/browser/zen-styles/zen-workspaces.css                           (../../zen/workspaces/zen-workspaces.css)
+*       content/browser/zen-styles/zen-workspaces.css                           (../../zen/workspaces/zen-workspaces.css)
         content/browser/zen-styles/zen-gradient-generator.css                   (../../zen/workspaces/zen-gradient-generator.css)
 
         content/browser/zen-components/ZenKeyboardShortcuts.mjs                 (../../zen/kbs/ZenKeyboardShortcuts.mjs)
 
-        content/browser/zen-components/ZenTabUnloader.mjs                       (../../zen/tabs/ZenTabUnloader.mjs)
         content/browser/zen-components/ZenPinnedTabsStorage.mjs                 (../../zen/tabs/ZenPinnedTabsStorage.mjs)
         content/browser/zen-components/ZenPinnedTabManager.mjs                  (../../zen/tabs/ZenPinnedTabManager.mjs)
 *       content/browser/zen-styles/zen-tabs.css                                 (../../zen/tabs/zen-tabs.css)

src/browser/base/content/zen-keysets.inc.xhtml

@@ -43,10 +43,6 @@
 
   <command id="cmd_zenCopyCurrentURL" />
   <command id="cmd_zenCopyCurrentURLMarkdown" />
-
-  <command id="cmd_zenUnloadTab" />
-  <command id="cmd_zenPreventUnloadTab" />
-  <command id="cmd_zenIgnoreUnloadTab" />
 </commandset>
 
 <keyset id="zenKeyset"></keyset>

src/browser/base/content/zen-preloaded.inc.xhtml

@@ -1,13 +1,11 @@
 # This needs to be here, before all the other scripts, because it's used before
 # the window is fully loaded.
 # Make sure they are loaded before the global-scripts.inc file.
-<script type="text/javascript">
+<script type="text/javascript" src="chrome://browser/content/zen-sets.js"></script>                                  
-  Services.scriptloader.loadSubScript("chrome://browser/content/zen-sets.js", this);
+<script type="text/javascript" src="chrome://browser/content/zen-components/ZenCommonUtils.mjs"></script>
-  Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenCommonUtils.mjs", this);
+<script type="text/javascript" src="chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs"></script>
-  Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs", this);
+<script type="text/javascript" src="chrome://browser/content/zen-components/ZenWorkspaceIcons.mjs"></script>
-  Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenWorkspaceIcons.mjs", this);
+<script type="text/javascript" src="chrome://browser/content/zen-components/ZenWorkspace.mjs"></script>
-  Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenWorkspace.mjs", this);
+<script type="text/javascript" src="chrome://browser/content/zen-components/ZenWorkspaces.mjs"></script>
-  Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenWorkspaces.mjs", this);
+<script type="text/javascript" src="chrome://browser/content/zen-components/ZenWorkspacesSync.mjs"></script>
-  Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenWorkspacesSync.mjs", this);
+<script type="text/javascript" src="chrome://browser/content/zen-components/ZenActorsManager.mjs"></script>
-  Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenActorsManager.mjs", this);
-</script>

src/browser/base/content/zen-sidebar-icons.inc.xhtml

@@ -2,7 +2,7 @@
 <toolbar brighttext="true"
   id="zen-sidebar-bottom-buttons"
   fullscreentoolbar="true"
-  class="browser-toolbar customization-target zen-dont-hide-on-fullscreen"
+  class="browser-toolbar customization-target"
   data-l10n-id="tabs-toolbar"
   customizable="true"
   skipintoolbarset="true"

src/browser/base/moz-build.patch

@@ -1,9 +1,9 @@
 diff --git a/browser/base/moz.build b/browser/base/moz.build
-index 636e0841786735a63ddea00e819c0b6f0b8a5d4d..62e4531bd19caf098fd76c69b213fa32d62546a6 100644
+index 9da444880c4dbf188443d43e8d0a71d98311a2b7..3a654be6f78931e92479b30de6f0a6e50da81908 100644
 --- a/browser/base/moz.build
 +++ b/browser/base/moz.build
-@@ -87,3 +87,5 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] in ("windows", "gtk"):
+@@ -81,3 +81,5 @@ DEFINES["MOZ_APP_VERSION_DISPLAY"] = CONFIG["MOZ_APP_VERSION_DISPLAY"]
-     DEFINES["MENUBAR_CAN_AUTOHIDE"] = 1
+ DEFINES["APP_LICENSE_BLOCK"] = "%s/content/overrides/app-license.html" % SRCDIR
  
  JAR_MANIFESTS += ["jar.mn"]
 +

src/browser/components/BrowserContentHandler-sys-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/BrowserContentHandler.sys.mjs b/browser/components/BrowserContentHandler.sys.mjs
-index 5911b276fdc9889d3cb61bac3d302ec5239e4a90..a405f8a0204e98fa9de08f1cd7b6761f0fc6198e 100644
+index e72feb538c0dc182211945a66e51bcea73d3d4a0..b4d9115873b7af414043c53fb817b611b78ec58f 100644
 --- a/browser/components/BrowserContentHandler.sys.mjs
 +++ b/browser/components/BrowserContentHandler.sys.mjs
-@@ -1270,6 +1270,7 @@ function maybeRecordToHandleTelemetry(uri, isLaunch) {
+@@ -1281,6 +1281,7 @@ function maybeRecordToHandleTelemetry(uri, isLaunch) {
        ".avif",
        ".htm",
        ".html",

src/browser/components/BrowserGlue-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs
-index a6a7f9165aece774c3f1c15f7e352b11a4bf90f4..a4b6124b85f099c6f12d297fc26f2040370c337c 100644
+index cebca6d017a0c3fc8eff7a38f987726324789e69..73a24df91bec368f2f27c538b37d57595e18c599 100644
 --- a/browser/components/BrowserGlue.sys.mjs
 +++ b/browser/components/BrowserGlue.sys.mjs
 @@ -8,6 +8,7 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
@@ -10,7 +10,7 @@ index a6a7f9165aece774c3f1c15f7e352b11a4bf90f4..a4b6124b85f099c6f12d297fc26f2040
    AboutHomeStartupCache: "resource:///modules/AboutHomeStartupCache.sys.mjs",
    AboutNewTab: "resource:///modules/AboutNewTab.sys.mjs",
    AWToolbarButton: "resource:///modules/aboutwelcome/AWToolbarUtils.sys.mjs",
-@@ -1886,6 +1887,7 @@ BrowserGlue.prototype = {
+@@ -881,6 +882,7 @@ BrowserGlue.prototype = {
  
      lazy.ProcessHangMonitor.init();
  

src/browser/components/customizableui/CustomizableUI-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
-index 91088fab1759b9af908912648d28daa5938a29c9..d420e7a2b1d66ad2bd7699cc580e180ab45a793d 100644
+index 5bb6be19f7f855b129aac921af1ed5cfc63d732b..41230a61f3088a234903dcc10abd361efac34729 100644
 --- a/browser/components/customizableui/CustomizableUI.sys.mjs
 +++ b/browser/components/customizableui/CustomizableUI.sys.mjs
 @@ -13,6 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {

src/browser/components/customizableui/content/panelUI-js.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
-index ec52437dba30633a374299a46c856e1df05dec0e..48617e32d56c3b3f525557ddeac6297555c48c04 100644
+index 689205034d9df67ff1fe0ebbf4a3481a5f414391..2626b7286deb51f66b6ccbbc32d510139cacb109 100644
 --- a/browser/components/customizableui/content/panelUI.js
 +++ b/browser/components/customizableui/content/panelUI.js
-@@ -515,8 +515,7 @@ const PanelUI = {
+@@ -516,8 +516,7 @@ const PanelUI = {
          tempPanel.setAttribute("animate", "false");
        }
        tempPanel.setAttribute("context", "");
@@ -12,7 +12,7 @@ index ec52437dba30633a374299a46c856e1df05dec0e..48617e32d56c3b3f525557ddeac62975
          .appendChild(tempPanel);
  
        let multiView = document.createXULElement("panelmultiview");
-@@ -957,7 +956,7 @@ const PanelUI = {
+@@ -959,7 +958,7 @@ const PanelUI = {
          el.removeAttribute("data-lazy-l10n-id");
        });
  

src/browser/components/places/PlacesUIUtils-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/places/PlacesUIUtils.sys.mjs b/browser/components/places/PlacesUIUtils.sys.mjs
-index 1f5e163bae58f3f1cac750ca32846cc8a80bd2ca..028b899b7a5da7ba398965861ff044e596c27666 100644
+index c7c5c28e1ea6d05094ed9fe751c6b50ab9645370..72f1038aa37b0951a1e78331ee317f714e5b6e8b 100644
 --- a/browser/components/places/PlacesUIUtils.sys.mjs
 +++ b/browser/components/places/PlacesUIUtils.sys.mjs
 @@ -59,6 +59,7 @@ class BookmarkState {

src/browser/components/preferences/main-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
-index aa339be9ba94ed776fa25f2d72f9e6b25dc86cd3..4c6c725942b3d6f2a42938d444ac7645526623cc 100644
+index 2116a8a3b5746b79280f2d73b5e29b01c7a15993..448269adeab747fd2da419509e6923eefbb87d8a 100644
 --- a/browser/components/preferences/main.js
 +++ b/browser/components/preferences/main.js
 @@ -389,7 +389,7 @@ function getBundleForLocales(newLocales) {

src/browser/components/preferences/preferences-js.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
-index e4746e3408e68273126e6d2baf5afcf80721674b..e478aaf6bfefa6acd9062aeb3e4709ca0d5d779c 100644
+index 6a575e3148de0c73f7ab7ff9afbd3ff179bce313..b7c2f2818358b7b6b6fc62b298dc67a66ebd9e3b 100644
 --- a/browser/components/preferences/preferences.js
 +++ b/browser/components/preferences/preferences.js
-@@ -118,6 +118,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () {
+@@ -117,6 +117,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () {
        styleSheets: [
          "chrome://browser/skin/preferences/dialog.css",
          "chrome://browser/skin/preferences/preferences.css",
@@ -10,7 +10,7 @@ index e4746e3408e68273126e6d2baf5afcf80721674b..e478aaf6bfefa6acd9062aeb3e4709ca
        ],
        resizeCallback: async ({ title, frame }) => {
          // Search within main document and highlight matched keyword.
-@@ -197,6 +198,10 @@ function init_all() {
+@@ -196,6 +197,10 @@ function init_all() {
    register_module("paneSearch", gSearchPane);
    register_module("panePrivacy", gPrivacyPane);
    register_module("paneContainers", gContainersPane);

src/browser/components/preferences/preferences-xhtml.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
-index 43be2b6ac84827bd13723e0211a3ade401934591..513584d7e720451efdb87350ac07d8b2590c1705 100644
+index b3b128cb5eb8c005c642965a8c8e5e68bf756e77..6e128d45c983b267e349b08097c56380dd04be3d 100644
 --- a/browser/components/preferences/preferences.xhtml
 +++ b/browser/components/preferences/preferences.xhtml
 @@ -44,6 +44,8 @@
@@ -11,7 +11,7 @@ index 43be2b6ac84827bd13723e0211a3ade401934591..513584d7e720451efdb87350ac07d8b2
    <link rel="localization" href="branding/brand.ftl"/>
    <link rel="localization" href="browser/browser.ftl"/>
      <!-- Used by fontbuilder.js -->
-@@ -105,6 +107,11 @@
+@@ -104,6 +106,11 @@
    <hbox flex="1">
  
      <vbox class="navigation">
@@ -23,7 +23,7 @@ index 43be2b6ac84827bd13723e0211a3ade401934591..513584d7e720451efdb87350ac07d8b2
        <!-- category list -->
        <richlistbox id="categories" data-l10n-id="category-list" data-l10n-attrs="aria-label">
          <richlistitem id="category-general"
-@@ -117,6 +124,50 @@
+@@ -116,6 +123,50 @@
            <label class="category-name" flex="1" data-l10n-id="pane-general-title"></label>
          </richlistitem>
  
@@ -74,7 +74,7 @@ index 43be2b6ac84827bd13723e0211a3ade401934591..513584d7e720451efdb87350ac07d8b2
          <richlistitem id="category-home"
                        class="category"
                        value="paneHome"
-@@ -228,11 +279,6 @@
+@@ -227,11 +278,6 @@
                  <html:a href="about:policies" target="_blank" data-l10n-id="managed-notice"/>
                </hbox>
              </hbox>
@@ -86,7 +86,7 @@ index 43be2b6ac84827bd13723e0211a3ade401934591..513584d7e720451efdb87350ac07d8b2
            </hbox>
          </hbox>
          <vbox id="mainPrefPane">
-@@ -246,6 +292,10 @@
+@@ -245,6 +291,10 @@
  #include sync.inc.xhtml
  #include experimental.inc.xhtml
  #include moreFromMozilla.inc.xhtml

src/browser/components/preferences/zen-settings.js

@@ -1219,4 +1219,9 @@ Preferences.addAll([
     type: 'bool',
     default: false,
   },
+  {
+    id: 'browser.tabs.unloadOnLowMemory',
+    type: 'bool',
+    default: true,
+  },
 ]);

src/browser/components/preferences/zenTabsManagement.inc.xhtml

@@ -37,18 +37,7 @@
 
       <checkbox id="zenTabsUnloadActivate"
             data-l10n-id="zen-tabs-unloader-enabled"
-            preference="zen.tab-unloader.enabled"/>
+            preference="browser.tabs.unloadOnLowMemory"/>
-
-
-      <label><html:h2 data-l10n-id="zen-tabs-unloader-unload-delay"/></label>
-      <hbox id="zenTabsUnloadDelayContainer">
-            <description class="description-deemphasized" data-l10n-id="zen-tabs-unloader-unload-delay-description" />
-            <html:input id="zenTabsUnloadDelay"
-                  type="number"
-                  min="1"
-                  max="1000"
-                  preference="zen.tab-unloader.timeout-minutes"/>
-      </hbox>
 </groupbox>
 
 <hbox id="zenPinnedTabsManagerCategory"

src/browser/components/sessionstore/SessionStore-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
-index 11794372f8ff13387b54dabdf4111dfdb89ea998..0e51251a579cee759f25272894c82a1744d79b26 100644
+index 8c6047e1ada5a22e57e1e665965237c9e22641d7..ccd2779d66eda9d034ca51cc3200d81447514e2c 100644
 --- a/browser/components/sessionstore/SessionStore.sys.mjs
 +++ b/browser/components/sessionstore/SessionStore.sys.mjs
 @@ -2088,7 +2088,6 @@ var SessionStoreInternal = {
@@ -22,7 +22,7 @@ index 11794372f8ff13387b54dabdf4111dfdb89ea998..0e51251a579cee759f25272894c82a17
  
        // Store the window's close date to figure out when each individual tab
        // was closed. This timestamp should allow re-arranging data based on how
-@@ -3209,7 +3206,7 @@ var SessionStoreInternal = {
+@@ -3216,7 +3213,7 @@ var SessionStoreInternal = {
      if (!isPrivateWindow && tabState.isPrivate) {
        return;
      }
@@ -31,7 +31,7 @@ index 11794372f8ff13387b54dabdf4111dfdb89ea998..0e51251a579cee759f25272894c82a17
        return;
      }
  
-@@ -3918,6 +3915,9 @@ var SessionStoreInternal = {
+@@ -3925,6 +3922,9 @@ var SessionStoreInternal = {
          Math.min(tabState.index, tabState.entries.length)
        );
        tabState.pinned = false;
@@ -41,7 +41,7 @@ index 11794372f8ff13387b54dabdf4111dfdb89ea998..0e51251a579cee759f25272894c82a17
  
        if (inBackground === false) {
          aWindow.gBrowser.selectedTab = newTab;
-@@ -5232,7 +5232,7 @@ var SessionStoreInternal = {
+@@ -5239,7 +5239,7 @@ var SessionStoreInternal = {
      }
  
      let workspaceID = aWindow.getWorkspaceID();
@@ -50,7 +50,7 @@ index 11794372f8ff13387b54dabdf4111dfdb89ea998..0e51251a579cee759f25272894c82a17
        winData.workspaceID = workspaceID;
      }
    },
-@@ -5423,14 +5423,15 @@ var SessionStoreInternal = {
+@@ -5430,14 +5430,15 @@ var SessionStoreInternal = {
      }
  
      let tabbrowser = aWindow.gBrowser;
@@ -68,16 +68,29 @@ index 11794372f8ff13387b54dabdf4111dfdb89ea998..0e51251a579cee759f25272894c82a17
          continue;
        }
        let tabData = lazy.TabState.collect(tab, TAB_CUSTOM_VALUES.get(tab));
-@@ -5449,7 +5450,7 @@ var SessionStoreInternal = {
+@@ -5456,8 +5457,8 @@ var SessionStoreInternal = {
      // We don't store the Firefox View tab in Session Store, so if it was the last selected "tab" when
      // a window is closed, point to the first item in the tab strip instead (it will never be the Firefox View tab,
      // since it's only inserted into the tab strip after it's selected).
 -    if (aWindow.FirefoxViewHandler.tab?.selected) {
+-      selectedIndex = 1;
 +    if (aWindow.FirefoxViewHandler.tab?.selected || tabbrowser.selectedTab.hasAttribute("zen-empty-tab")) {
-       selectedIndex = 1;
++      selectedIndex = 0;
        winData.title = tabbrowser.tabs[0].label;
      }
-@@ -5606,6 +5607,7 @@ var SessionStoreInternal = {
+     winData.selected = selectedIndex;
+@@ -5569,8 +5570,8 @@ var SessionStoreInternal = {
+     // selectTab represents.
+     let selectTab = 0;
+     if (overwriteTabs) {
+-      selectTab = parseInt(winData.selected || 1, 10);
+-      selectTab = Math.max(selectTab, 1);
++      selectTab = parseInt(winData.selected || 0, 10);
++      selectTab = Math.max(selectTab, 0);
+       selectTab = Math.min(selectTab, winData.tabs.length);
+     }
+ 
+@@ -5613,6 +5614,7 @@ var SessionStoreInternal = {
          winData.tabs,
          winData.groups ?? []
        );
@@ -85,7 +98,7 @@ index 11794372f8ff13387b54dabdf4111dfdb89ea998..0e51251a579cee759f25272894c82a17
        this._log.debug(
          `restoreWindow, createTabsForSessionRestore returned ${tabs.length} tabs`
        );
-@@ -6155,8 +6157,23 @@ var SessionStoreInternal = {
+@@ -6162,8 +6164,23 @@ var SessionStoreInternal = {
  
      // Most of tabData has been restored, now continue with restoring
      // attributes that may trigger external events.

src/browser/components/tabbrowser/TabUnloader-sys-mjs.patch

@@ -0,0 +1,13 @@
+diff --git a/browser/components/tabbrowser/TabUnloader.sys.mjs b/browser/components/tabbrowser/TabUnloader.sys.mjs
+index 44846cc902fd3fc17d12be38ac9abccb47a12f23..c715c7cf47486066b3fd6f92bf78bc8a720759bc 100644
+--- a/browser/components/tabbrowser/TabUnloader.sys.mjs
++++ b/browser/components/tabbrowser/TabUnloader.sys.mjs
+@@ -52,7 +52,7 @@ let CRITERIA_WEIGHT = 1;
+  */
+ let DefaultTabUnloaderMethods = {
+   isNonDiscardable(tab, weight) {
+-    if (tab.undiscardable || tab.selected) {
++    if (tab.undiscardable || tab.selected || tab.zenModeActive) {
+       return weight;
+     }
+ 

src/browser/components/tabbrowser/content/tab-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tab.js b/browser/components/tabbrowser/content/tab.js
-index f43ab1cf6257ff1a9c9aa522a0180fd9bbfe4036..75d6f7e08f70a1a26e24c4e2005af9225f193e68 100644
+index f43ab1cf6257ff1a9c9aa522a0180fd9bbfe4036..d9714c46de860243b06af7e8343d36b107efb855 100644
 --- a/browser/components/tabbrowser/content/tab.js
 +++ b/browser/components/tabbrowser/content/tab.js
 @@ -21,6 +21,7 @@
@@ -48,17 +48,6 @@ index f43ab1cf6257ff1a9c9aa522a0180fd9bbfe4036..75d6f7e08f70a1a26e24c4e2005af922
      }
  
      get lastAccessed() {
-@@ -364,8 +367,8 @@
-     }
- 
-     get group() {
--      if (this.parentElement?.tagName == "tab-group") {
--        return this.parentElement;
-+      if (gBrowser.isTabGroup(this.parentElement?.parentElement)) {
-+        return this.parentElement.parentElement;
-       }
-       return null;
-     }
 @@ -459,6 +462,8 @@
          this.style.MozUserFocus = "ignore";
        } else if (

src/browser/components/tabbrowser/content/tabbrowser-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e51fb618a 100644
+index d5aa64842a35c6697263c63fd3a0571b64b01344..6943dc7f1d3d95ab1da315cbdbda0b032cf200f1 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -413,11 +413,41 @@
@@ -253,7 +253,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
        }
  
        if (!color) {
-@@ -3014,7 +3084,10 @@
+@@ -3014,7 +3084,12 @@
          label,
          isAdoptingGroup
        );
@@ -265,7 +265,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
          group,
          insertBefore?.group ?? insertBefore
        );
-@@ -3303,6 +3376,7 @@
+@@ -3303,6 +3378,7 @@
          openWindowInfo,
          skipLoad,
          triggeringRemoteType,
@@ -273,7 +273,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
        }
      ) {
        // If we don't have a preferred remote type (or it is `NOT_REMOTE`), and
-@@ -3372,6 +3446,7 @@
+@@ -3372,6 +3448,7 @@
            openWindowInfo,
            name,
            skipLoad,
@@ -281,7 +281,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
          });
        }
  
-@@ -3560,7 +3635,7 @@
+@@ -3560,7 +3637,7 @@
          // Add a new tab if needed.
          if (!tab) {
            let createLazyBrowser =
@@ -290,7 +290,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
  
            let url = "about:blank";
            if (tabData.entries?.length) {
-@@ -3598,7 +3673,29 @@
+@@ -3598,7 +3675,29 @@
              skipLoad: true,
              preferredRemoteType,
            });
@@ -320,7 +320,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
            if (select) {
              tabToSelect = tab;
            }
-@@ -3622,7 +3719,8 @@
+@@ -3622,7 +3721,8 @@
              // needs calling:
              shouldUpdateForPinnedTabs = true;
            }
@@ -330,7 +330,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
            let { groupId } = tabData;
            const tabGroup = tabGroupWorkingData.get(groupId);
            // if a tab refers to a tab group we don't know, skip any group
-@@ -3636,7 +3734,10 @@
+@@ -3636,7 +3736,10 @@
                  tabGroup.stateData.id,
                  tabGroup.stateData.color,
                  tabGroup.stateData.collapsed,
@@ -342,7 +342,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
                );
                tabsFragment.appendChild(tabGroup.node);
              }
-@@ -3684,8 +3785,16 @@
+@@ -3684,8 +3787,16 @@
        // to remove the old selected tab.
        if (tabToSelect) {
          let leftoverTab = this.selectedTab;
@@ -361,7 +361,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
        }
  
        if (tabs.length > 1 || !tabs[0].selected) {
-@@ -3881,7 +3990,7 @@
+@@ -3881,7 +3992,7 @@
        // Ensure we have an index if one was not provided.
        if (typeof elementIndex != "number" && typeof tabIndex != "number") {
          // Move the new tab after another tab if needed, to the end otherwise.
@@ -370,7 +370,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -3904,7 +4013,7 @@
+@@ -3904,7 +4015,7 @@
            ) {
              elementIndex = Infinity;
            } else if (previousTab.visible) {
@@ -379,7 +379,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
            } else if (previousTab == FirefoxViewHandler.tab) {
              elementIndex = 0;
            }
-@@ -3932,10 +4041,10 @@
+@@ -3932,10 +4043,10 @@
        }
        // Ensure index is within bounds.
        if (tab.pinned) {
@@ -393,7 +393,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
          index = Math.min(index, allItems.length);
        }
        /** @type {MozTabbrowserTab|undefined} */
-@@ -3947,7 +4056,7 @@
+@@ -3947,7 +4058,7 @@
  
        this.tabContainer._invalidateCachedTabs();
  
@@ -402,7 +402,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
          if (this.isTab(itemAfter) && itemAfter.group == tabGroup) {
            // Place at the front of, or between tabs in, the same tab group
            this.tabContainer.insertBefore(tab, itemAfter);
-@@ -4268,6 +4377,9 @@
+@@ -4268,6 +4379,9 @@
          return;
        }
  
@@ -412,7 +412,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
        this.removeTabs(selectedTabs, { telemetrySource });
      }
  
-@@ -4520,6 +4632,7 @@
+@@ -4520,6 +4634,7 @@
          telemetrySource,
        } = {}
      ) {
@@ -420,7 +420,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
        // When 'closeWindowWithLastTab' pref is enabled, closing all tabs
        // can be considered equivalent to closing the window.
        if (
-@@ -4604,6 +4717,7 @@
+@@ -4604,6 +4719,7 @@
          if (lastToClose) {
            this.removeTab(lastToClose, aParams);
          }
@@ -428,7 +428,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
        } catch (e) {
          console.error(e);
        }
-@@ -4641,6 +4755,12 @@
+@@ -4641,6 +4757,12 @@
          aTab._closeTimeNoAnimTimerId = Glean.browserTabclose.timeNoAnim.start();
        }
  
@@ -441,7 +441,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -4655,7 +4775,9 @@
+@@ -4655,7 +4777,9 @@
        // frame created for it (for example, by updating the visually selected
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
@@ -452,7 +452,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -4821,7 +4943,7 @@
+@@ -4821,7 +4945,7 @@
            closeWindowWithLastTab != null
              ? closeWindowWithLastTab
              : !window.toolbar.visible ||
@@ -461,7 +461,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -4845,6 +4967,7 @@
+@@ -4845,6 +4969,7 @@
  
          newTab = true;
        }
@@ -469,7 +469,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
        aTab._endRemoveArgs = [closeWindow, newTab];
  
        // swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -4885,9 +5008,7 @@
+@@ -4885,9 +5010,7 @@
        aTab._mouseleave();
  
        if (newTab) {
@@ -480,7 +480,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
        } else {
          TabBarVisibility.update();
        }
-@@ -5016,6 +5137,8 @@
+@@ -5016,6 +5139,8 @@
          this.tabs[i]._tPos = i;
        }
  
@@ -489,7 +489,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
        if (!this._windowIsClosing) {
          if (wasPinned) {
            this.tabContainer._positionPinnedTabs();
-@@ -5230,6 +5353,7 @@
+@@ -5230,6 +5355,7 @@
        }
  
        let excludeTabs = new Set(aExcludeTabs);
@@ -497,7 +497,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
  
        // If this tab has a successor, it should be selectable, since
        // hiding or closing a tab removes that tab as a successor.
-@@ -5242,13 +5366,13 @@
+@@ -5242,13 +5368,13 @@
          !excludeTabs.has(aTab.owner) &&
          Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
        ) {
@@ -513,7 +513,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
        );
  
        let tab = this.tabContainer.findNextTab(aTab, {
-@@ -5264,7 +5388,7 @@
+@@ -5264,7 +5390,7 @@
        }
  
        if (tab) {
@@ -522,7 +522,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
        }
  
        // If no qualifying visible tab was found, see if there is a tab in
-@@ -5285,7 +5409,7 @@
+@@ -5285,7 +5411,7 @@
          });
        }
  
@@ -531,7 +531,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
      }
  
      _blurTab(aTab) {
-@@ -5686,10 +5810,10 @@
+@@ -5686,10 +5812,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -544,16 +544,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5909,7 +6033,7 @@
+@@ -5986,7 +6112,7 @@
-      *   `true` if element is a `<tab-group>`
-      */
-     isTabGroup(element) {
--      return !!(element?.tagName == "tab-group");
-+      return !!(element?.tagName == "tab-group" || element?.tagName == "zen-folder");
-     }
- 
-     /**
-@@ -5986,7 +6110,7 @@
  
        // Don't allow mixing pinned and unpinned tabs.
        if (this.isTab(element) && element.pinned) {
@@ -562,7 +553,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
        } else {
          tabIndex = Math.max(tabIndex, this.pinnedTabCount);
        }
-@@ -6012,10 +6136,16 @@
+@@ -6012,10 +6138,16 @@
        this.#handleTabMove(
          element,
          () => {
@@ -581,7 +572,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
            if (neighbor && this.isTab(element) && tabIndex > element._tPos) {
              neighbor.after(element);
            } else {
-@@ -6084,17 +6214,26 @@
+@@ -6084,17 +6216,26 @@
            targetElement = targetElement.group;
          }
        }
@@ -611,7 +602,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
          if (element.pinned && this.tabContainer.verticalMode) {
            return this.tabContainer.verticalPinnedTabsContainer;
          }
-@@ -6154,7 +6293,7 @@
+@@ -6154,7 +6295,7 @@
        if (!this.isTab(aTab)) {
          throw new Error("Can only move a tab into a tab group");
        }
@@ -620,7 +611,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
          return;
        }
        if (aTab.group && aTab.group.id === aGroup.id) {
-@@ -6248,6 +6387,10 @@
+@@ -6248,6 +6389,10 @@
  
        moveActionCallback();
  
@@ -631,7 +622,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
        // Clear tabs cache after moving nodes because the order of tabs may have
        // changed.
        this.tabContainer._invalidateCachedTabs();
-@@ -7145,7 +7288,7 @@
+@@ -7145,7 +7290,7 @@
              // preventDefault(). It will still raise the window if appropriate.
              break;
            }
@@ -640,7 +631,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
            window.focus();
            aEvent.preventDefault();
            break;
-@@ -8044,6 +8187,7 @@
+@@ -8044,6 +8189,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -648,7 +639,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
            }
-@@ -9009,7 +9153,7 @@ var TabContextMenu = {
+@@ -9009,7 +9155,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !this.multiselected;
@@ -657,7 +648,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..f44e217b5a104d16d9a76c80adced54e
      // Move Tab items
      let contextMoveTabOptions = document.getElementById(
        "context_moveTabOptions"
-@@ -9278,6 +9422,7 @@ var TabContextMenu = {
+@@ -9278,6 +9424,7 @@ var TabContextMenu = {
          telemetrySource: gBrowser.TabMetrics.METRIC_SOURCE.TAB_STRIP,
        });
      } else {

src/browser/components/urlbar/UrlbarInput-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..66ef8de0d2a767376740ca57d75b5372cc11ed40 100644
+index 0c5145c3d31862bd2c6b5ed2faa88f02425ffde1..1cf86995514b2c00360f6ed681f0c640dac8ab56 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
 @@ -68,6 +68,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
@@ -16,7 +16,7 @@ index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..66ef8de0d2a767376740ca57d75b5372
  const DEFAULT_FORM_HISTORY_NAME = "searchbar-history";
  const SEARCH_BUTTON_CLASS = "urlbar-search-button";
  
-@@ -349,7 +356,16 @@ export class UrlbarInput {
+@@ -355,7 +362,16 @@ export class UrlbarInput {
      // See _on_select().  HTMLInputElement.select() dispatches a "select"
      // event but does not set the primary selection.
      this._suppressPrimaryAdjustment = true;
@@ -33,7 +33,7 @@ index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..66ef8de0d2a767376740ca57d75b5372
      this._suppressPrimaryAdjustment = false;
    }
  
-@@ -425,6 +441,10 @@ export class UrlbarInput {
+@@ -431,6 +447,10 @@ export class UrlbarInput {
      hideSearchTerms = false,
      isSameDocument = false
    ) {
@@ -44,7 +44,7 @@ index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..66ef8de0d2a767376740ca57d75b5372
      // We only need to update the searchModeUI on tab switch conditionally
      // as we only persist searchMode with ScotchBonnet enabled.
      if (
-@@ -698,8 +718,16 @@ export class UrlbarInput {
+@@ -735,8 +755,16 @@ export class UrlbarInput {
          return;
        }
      }
@@ -62,7 +62,7 @@ index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..66ef8de0d2a767376740ca57d75b5372
    }
  
    /**
-@@ -1093,7 +1121,11 @@ export class UrlbarInput {
+@@ -1142,7 +1170,11 @@ export class UrlbarInput {
      }
  
      if (!this.#providesSearchMode(result)) {
@@ -74,8 +74,8 @@ index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..66ef8de0d2a767376740ca57d75b5372
 +      }
      }
  
-     this.controller.recordSelectedResult(event, result);
+     if (isCanonized) {
-@@ -2125,6 +2157,10 @@ export class UrlbarInput {
+@@ -2191,6 +2223,10 @@ export class UrlbarInput {
      await this.#updateLayoutBreakoutDimensions();
    }
  
@@ -86,7 +86,7 @@ index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..66ef8de0d2a767376740ca57d75b5372
    startLayoutExtend() {
      if (!this.#allowBreakout || this.hasAttribute("breakout-extend")) {
        // Do not expand if the Urlbar does not support being expanded or it is
-@@ -2147,6 +2183,12 @@ export class UrlbarInput {
+@@ -2205,6 +2241,12 @@ export class UrlbarInput {
  
      this.setAttribute("breakout-extend", "true");
  
@@ -99,7 +99,7 @@ index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..66ef8de0d2a767376740ca57d75b5372
      // Enable the animation only after the first extend call to ensure it
      // doesn't run when opening a new window.
      if (!this.hasAttribute("breakout-extend-animate")) {
-@@ -2166,6 +2208,24 @@ export class UrlbarInput {
+@@ -2224,6 +2266,24 @@ export class UrlbarInput {
        return;
      }
  
@@ -124,7 +124,7 @@ index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..66ef8de0d2a767376740ca57d75b5372
      this.removeAttribute("breakout-extend");
      this.#updateTextboxPosition();
    }
-@@ -2485,7 +2545,7 @@ export class UrlbarInput {
+@@ -2553,7 +2613,7 @@ export class UrlbarInput {
  
          this.textbox.parentNode.style.setProperty(
            "--urlbar-container-height",
@@ -133,7 +133,7 @@ index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..66ef8de0d2a767376740ca57d75b5372
          );
          this.textbox.style.setProperty(
            "--urlbar-height",
-@@ -2900,6 +2960,7 @@ export class UrlbarInput {
+@@ -2968,6 +3028,7 @@ export class UrlbarInput {
    }
  
    _toggleActionOverride(event) {
@@ -141,7 +141,7 @@ index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..66ef8de0d2a767376740ca57d75b5372
      if (
        event.keyCode == KeyEvent.DOM_VK_SHIFT ||
        event.keyCode == KeyEvent.DOM_VK_ALT ||
-@@ -2998,7 +3059,7 @@ export class UrlbarInput {
+@@ -3069,7 +3130,7 @@ export class UrlbarInput {
     */
    _trimValue(val) {
      let trimmedValue = lazy.UrlbarPrefs.get("trimURLs")
@@ -150,7 +150,7 @@ index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..66ef8de0d2a767376740ca57d75b5372
        : val;
      // Only trim value if the directionality doesn't change to RTL and we're not
      // showing a strikeout https protocol.
-@@ -3368,6 +3429,10 @@ export class UrlbarInput {
+@@ -3439,6 +3500,10 @@ export class UrlbarInput {
        }
        reuseEmpty = true;
      }
@@ -161,7 +161,7 @@ index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..66ef8de0d2a767376740ca57d75b5372
      if (
        where == "tab" &&
        reuseEmpty &&
-@@ -3375,6 +3440,9 @@ export class UrlbarInput {
+@@ -3446,6 +3511,9 @@ export class UrlbarInput {
      ) {
        where = "current";
      }
@@ -171,7 +171,7 @@ index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..66ef8de0d2a767376740ca57d75b5372
      return where;
    }
  
-@@ -3632,6 +3700,7 @@ export class UrlbarInput {
+@@ -3703,6 +3771,7 @@ export class UrlbarInput {
        this.setResultForCurrentValue(null);
        this.handleCommand();
        this.controller.clearLastQueryContextCache();
@@ -179,7 +179,7 @@ index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..66ef8de0d2a767376740ca57d75b5372
  
        this._suppressStartQuery = false;
      });
-@@ -3639,7 +3708,6 @@ export class UrlbarInput {
+@@ -3710,7 +3779,6 @@ export class UrlbarInput {
      contextMenu.addEventListener("popupshowing", () => {
        // Close the results pane when the input field contextual menu is open,
        // because paste and go doesn't want a result selection.
@@ -187,7 +187,7 @@ index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..66ef8de0d2a767376740ca57d75b5372
  
        let controller =
          this.document.commandDispatcher.getControllerForCommand("cmd_paste");
-@@ -4053,6 +4121,11 @@ export class UrlbarInput {
+@@ -4136,6 +4204,11 @@ export class UrlbarInput {
    }
  
    _on_click(event) {
@@ -199,7 +199,7 @@ index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..66ef8de0d2a767376740ca57d75b5372
      if (
        event.target == this.inputField ||
        event.target == this._inputContainer ||
-@@ -4124,7 +4197,7 @@ export class UrlbarInput {
+@@ -4207,7 +4280,7 @@ export class UrlbarInput {
        }
      }
  
@@ -208,7 +208,7 @@ index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..66ef8de0d2a767376740ca57d75b5372
        this.view.autoOpen({ event });
      } else {
        if (this._untrimOnFocusAfterKeydown) {
-@@ -4164,9 +4237,16 @@ export class UrlbarInput {
+@@ -4247,9 +4320,16 @@ export class UrlbarInput {
    }
  
    _on_mousedown(event) {
@@ -226,7 +226,7 @@ index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..66ef8de0d2a767376740ca57d75b5372
  
          if (
            event.target != this.inputField &&
-@@ -4178,6 +4258,10 @@ export class UrlbarInput {
+@@ -4261,6 +4341,10 @@ export class UrlbarInput {
  
          this.focusedViaMousedown = !this.focused;
          this._preventClickSelectsAll = this.focused;
@@ -237,7 +237,7 @@ index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..66ef8de0d2a767376740ca57d75b5372
  
          // Keep the focus status, since the attribute may be changed
          // upon calling this.focus().
-@@ -4218,7 +4302,7 @@ export class UrlbarInput {
+@@ -4301,7 +4385,7 @@ export class UrlbarInput {
          }
          // Don't close the view when clicking on a tab; we may want to keep the
          // view open on tab switch, and the TabSelect event arrived earlier.

src/browser/components/urlbar/UrlbarProviderPlaces-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs b/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs
-index b1481a11ef38037bec13939928f72f9772e335a9..925f0dc34bf84bb9e0f143f5c1973a87e7b4f8ac 100644
+index 899e808c5f8cf14577404e3d1766fe967b32b065..82854a04edc21ac4552d06d6ba45c4714b5ef5cb 100644
 --- a/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs
 +++ b/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs
 @@ -35,6 +35,8 @@ const QUERYINDEX_SWITCHTAB = 9;
@@ -9,14 +9,14 @@ index b1481a11ef38037bec13939928f72f9772e335a9..925f0dc34bf84bb9e0f143f5c1973a87
 +const QUERYINDEX_PINNEDTITLE = 13;
 +const QUERYINDEX_PINNEDURL = 14;
  
- // Constants to support an alternative frecency algorithm.
+ // This SQL query fragment provides the following:
- const PAGES_USE_ALT_FRECENCY = Services.prefs.getBoolPref(
+ //   - whether the entry is bookmarked (QUERYINDEX_BOOKMARKED)
-@@ -65,11 +67,14 @@ const SQL_BOOKMARK_TAGS_FRAGMENT = `EXISTS(SELECT 1 FROM moz_bookmarks WHERE fk
+@@ -56,11 +58,14 @@ const SQL_BOOKMARK_TAGS_FRAGMENT = `EXISTS(SELECT 1 FROM moz_bookmarks WHERE fk
  // condition once, and avoid evaluating "btitle" and "tags" when it is false.
  function defaultQuery(conditions = "") {
    let query = `SELECT :query_type, h.url, h.title, ${SQL_BOOKMARK_TAGS_FRAGMENT},
--            h.visit_count, h.typed, h.id, t.open_count, ${PAGES_FRECENCY_FIELD}, t.userContextId, h.last_visit_date
+-            h.visit_count, h.typed, h.id, t.open_count, ${lazy.PAGES_FRECENCY_FIELD}, t.userContextId, h.last_visit_date
-+            h.visit_count, h.typed, h.id, t.open_count, ${PAGES_FRECENCY_FIELD}, t.userContextId, h.last_visit_date,
++            h.visit_count, h.typed, h.id, t.open_count, ${lazy.PAGES_FRECENCY_FIELD}, t.userContextId, h.last_visit_date,
 +            zp.title AS pinned_title, zp.url AS pinned_url
       FROM moz_places h
       LEFT JOIN moz_openpages_temp t
@@ -26,8 +26,8 @@ index b1481a11ef38037bec13939928f72f9772e335a9..925f0dc34bf84bb9e0f143f5c1973a87
 +            ON zp.url = h.url
       WHERE (
          (:switchTabsEnabled AND t.open_count > 0) OR
-         ${PAGES_FRECENCY_FIELD} <> 0
+         ${lazy.PAGES_FRECENCY_FIELD} <> 0
-@@ -83,7 +88,7 @@ function defaultQuery(conditions = "") {
+@@ -74,7 +79,7 @@ function defaultQuery(conditions = "") {
                                :matchBehavior, :searchBehavior, NULL)
           ELSE
             AUTOCOMPLETE_MATCH(:searchString, h.url,
@@ -36,7 +36,7 @@ index b1481a11ef38037bec13939928f72f9772e335a9..925f0dc34bf84bb9e0f143f5c1973a87
                                h.visit_count, h.typed,
                                0, t.open_count,
                                :matchBehavior, :searchBehavior, NULL)
-@@ -1132,11 +1137,14 @@ Search.prototype = {
+@@ -1130,11 +1135,14 @@ Search.prototype = {
      let lastVisit = lastVisitPRTime
        ? lazy.PlacesUtils.toDate(lastVisitPRTime).getTime()
        : undefined;

src/browser/components/urlbar/UrlbarView-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarView.sys.mjs b/browser/components/urlbar/UrlbarView.sys.mjs
-index d5382623595de8daed8cd13ea2eb2de329a4bd92..c3b5d1bad0bf4e1c5a5875a83751cfa96cdf1510 100644
+index e17f3d34367d6567c89f632b6d1ce537608a6829..7528dfb0abc8ea8d9315591cd529a341b4c3962a 100644
 --- a/browser/components/urlbar/UrlbarView.sys.mjs
 +++ b/browser/components/urlbar/UrlbarView.sys.mjs
 @@ -609,7 +609,7 @@ export class UrlbarView {

src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/extensions/newtab/lib/ActivityStream.sys.mjs b/browser/extensions/newtab/lib/ActivityStream.sys.mjs
-index 14183ad7165dc91126b4409b26f669409c4e9905..be979225b89b193b9e9c8903de5740dc04a8999f 100644
+index a00011de585a40b91d33364a04c6bf5c86145ecd..f98b6d11519a80aff307513fd77361179f9914a4 100644
 --- a/browser/extensions/newtab/lib/ActivityStream.sys.mjs
 +++ b/browser/extensions/newtab/lib/ActivityStream.sys.mjs
-@@ -215,7 +215,7 @@ export const PREFS_CONFIG = new Map([
+@@ -228,7 +228,7 @@ export const PREFS_CONFIG = new Map([
      "showSponsoredTopSites",
      {
        title: "Show sponsored top sites",

src/browser/locales/en-US/installer/custom-properties.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/locales/en-US/installer/custom.properties b/browser/locales/en-US/installer/custom.properties
-index a9dc6fb90caa50a9ba9ec63a6cd90b4d8dcc2bc0..48d11c0c5a3b926d2d29c30d1ca8630941514210 100644
+index 8c33192e589de1d819cbb21c31cec0480ed4c85e..9db296363303c153dc05ad9e85493f1197bb1efd 100644
 --- a/browser/locales/en-US/installer/custom.properties
 +++ b/browser/locales/en-US/installer/custom.properties
-@@ -77,7 +77,7 @@ STATUS_INSTALL_LANG=Installing Language Files (${AB_CD})…
+@@ -73,7 +73,7 @@ STATUS_INSTALL_APP=Installing $BrandShortName…
  STATUS_UNINSTALL_MAIN=Uninstalling $BrandShortName…
  STATUS_CLEANUP=A Little Housekeeping…
  

src/browser/modules/ExtensionsUI-sys-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/modules/ExtensionsUI.sys.mjs b/browser/modules/ExtensionsUI.sys.mjs
-index 3f74e47bf7602fa800d1cf3034ec67055cc792b6..e700b88d1aee80c946e234f89f695a31d71ff608 100644
+index 9734d95742035dbe6f608ad3cdaaefc6ed5b83bc..9a7bbb272025e84968d3173faca259f558746c5e 100644
 --- a/browser/modules/ExtensionsUI.sys.mjs
 +++ b/browser/modules/ExtensionsUI.sys.mjs
-@@ -436,7 +436,7 @@ export var ExtensionsUI = {
+@@ -466,7 +466,7 @@ export var ExtensionsUI = {
          eventCallback,
          removeOnDismissal: true,
          popupOptions: {

src/browser/themes/BuiltInThemeConfig-sys-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/themes/BuiltInThemeConfig.sys.mjs b/browser/themes/BuiltInThemeConfig.sys.mjs
-index 081187147736f56abfe5866a69e00ac13a8dd940..9a980fe858c1a77af7634037aebc332d237e9c11 100644
+index a5361f1f0ec57f575f8d76e118ff762dc7547501..db5c5eb2059b4ceef3911fd807bf985408859d1a 100644
 --- a/browser/themes/BuiltInThemeConfig.sys.mjs
 +++ b/browser/themes/BuiltInThemeConfig.sys.mjs
-@@ -33,13 +33,6 @@ export const BuiltInThemeConfig = new Map([
+@@ -33,11 +33,4 @@ export const BuiltInThemeConfig = new Map([
        path: "resource://builtin-themes/dark/",
      },
    ],
@@ -13,6 +13,4 @@ index 081187147736f56abfe5866a69e00ac13a8dd940..9a980fe858c1a77af7634037aebc332d
 -      path: "resource://builtin-themes/alpenglow/",
 -    },
 -  ],
-   [
+ ]);
-     "2022red-colorway@mozilla.org",
-     {

src/browser/themes/addons/jar-mn.patch

@@ -1,22 +0,0 @@
-diff --git a/browser/themes/addons/jar.mn b/browser/themes/addons/jar.mn
-index 69bb3000d6d2d249d1d77262dc2a0057d0318308..bbed04a6b6f11c582e17e08201db260b9ed496b7 100644
---- a/browser/themes/addons/jar.mn
-+++ b/browser/themes/addons/jar.mn
-@@ -5,8 +5,8 @@
- browser.jar:
- %  resource builtin-themes %content/builtin-themes/
- 
--  content/builtin-themes/alpenglow                 (alpenglow/*.svg)
--  content/builtin-themes/alpenglow/manifest.json   (alpenglow/manifest.json)
-+#  content/builtin-themes/alpenglow                 (alpenglow/*.svg)
-+#  content/builtin-themes/alpenglow/manifest.json   (alpenglow/manifest.json)
- 
-   content/builtin-themes/dark                      (dark/*.svg)
-   content/builtin-themes/dark                      (dark/*.css)
-@@ -100,3 +100,5 @@ browser.jar:
-   content/builtin-themes/colorways/2022innovator/balanced/manifest.json       (colorways/2022-independent-voices/innovator/balanced/manifest.json)
-   content/builtin-themes/colorways/2022innovator/bold                         (colorways/2022-independent-voices/innovator/bold/*.svg)
-   content/builtin-themes/colorways/2022innovator/bold/manifest.json           (colorways/2022-independent-voices/innovator/bold/manifest.json)
-+
-+#include zen-addons.inc.mn
-\ No newline at end of file

src/browser/themes/addons/zen-addons.inc.mn

@@ -1 +0,0 @@
-

src/browser/themes/linux/browser-css.patch

@@ -1,20 +1,18 @@
 diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
-index 5c9891e5ed4b865ed4ecc98d794a239b0f96a8f9..e13bf7277edeb49ebbb12cf9359ac6193bb47ebd 100644
+index 195cf888a61893cc9b0015e07e27bce94ec9d409..5f4cb6a1922730e8a0f1e9ad04169fb092917938 100644
 --- a/browser/themes/linux/browser.css
 +++ b/browser/themes/linux/browser.css
-@@ -42,21 +42,25 @@
+@@ -42,7 +42,8 @@
      -moz-default-appearance: -moz-window-decorations;
      appearance: auto;
  
 -    #navigator-toolbox,
--    dialog::backdrop {
 +    #zen-main-app-wrapper,
-+    dialog::backdrop,
++    #zen-browser-background,
-+    #browser::after,
+     dialog::backdrop {
-+    #browser::before {
        border-top-left-radius: env(-moz-gtk-csd-titlebar-radius);
        border-top-right-radius: env(-moz-gtk-csd-titlebar-radius);
-     }
+@@ -50,13 +51,14 @@
  
      /* stylelint-disable-next-line media-query-no-invalid */
      @media -moz-pref("widget.gtk.rounded-bottom-corners.enabled") {
@@ -27,8 +25,7 @@ index 5c9891e5ed4b865ed4ecc98d794a239b0f96a8f9..e13bf7277edeb49ebbb12cf9359ac619
        body,
 -      dialog::backdrop {
 +      dialog::backdrop,
-+      #browser::after,
++      #zen-browser-background {
-+      #browser::before {
          /* Use an uniform clip to allow WebRender to optimize it better */
          border-radius: env(-moz-gtk-csd-titlebar-radius);
        }

src/browser/themes/osx/browser-css.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
-index 7fc76bc82bd5d6311442b85a76d885dcfb6d753d..61b1b3ac8241c4f12e4ca8966a7ac1fae0eb41ee 100644
+index 9f795cd5b67b12ed4e6d0838d6e0b8e1048f6e50..e9d9326f174a25140113de40f4c57e8bc67677ff 100644
 --- a/browser/themes/osx/browser.css
 +++ b/browser/themes/osx/browser.css
 @@ -38,7 +38,7 @@

src/browser/themes/shared/customizableui/panelUI-shared-css.patch

@@ -1,24 +0,0 @@
-diff --git a/browser/themes/shared/customizableui/panelUI-shared.css b/browser/themes/shared/customizableui/panelUI-shared.css
-index bdbfd3521b4921f7d6d44623181019a8263b5825..e69b1fb9ee7e553f1183f7a52f9104d6f99d4288 100644
---- a/browser/themes/shared/customizableui/panelUI-shared.css
-+++ b/browser/themes/shared/customizableui/panelUI-shared.css
-@@ -18,7 +18,7 @@
-   --menu-panel-width-wide: 29em;
- 
-   --arrowpanel-menuitem-margin-block: 0;
--  --arrowpanel-menuitem-margin-inline: 8px;
-+  --arrowpanel-menuitem-margin-inline: 4px;
-   --arrowpanel-menuitem-margin: var(--arrowpanel-menuitem-margin-block) var(--arrowpanel-menuitem-margin-inline);
-   --arrowpanel-menuitem-padding-block: 8px;
-   --arrowpanel-menuitem-padding-inline: 8px;
-@@ -819,8 +819,8 @@ toolbarbutton[constrain-size="true"][cui-areatype="panel"] > .toolbarbutton-badg
- /* Firefox Account Toolbar Panel */
- 
- #fxa-avatar-image {
--  width: 16px;
--  height: 16px;
-+  width: 20px;
-+  height: 20px;
- }
- 
- :root {

src/browser/themes/shared/tabbrowser/fullscreen-and-pointerlock-css.patch

@@ -1,13 +0,0 @@
-diff --git a/browser/themes/shared/tabbrowser/fullscreen-and-pointerlock.css b/browser/themes/shared/tabbrowser/fullscreen-and-pointerlock.css
-index 787e3153e2e07b383445e94aa9e25177eb49c929..a017e4c003f6c3b9af7c226c637b37aea6baa7e5 100644
---- a/browser/themes/shared/tabbrowser/fullscreen-and-pointerlock.css
-+++ b/browser/themes/shared/tabbrowser/fullscreen-and-pointerlock.css
-@@ -7,7 +7,7 @@
- :root[inDOMFullscreen] #sidebar-box,
- :root[inDOMFullscreen] #sidebar-main,
- :root[inDOMFullscreen] #sidebar-splitter,
--:root[inFullscreen]:not([macOSNativeFullscreen]) toolbar:not([fullscreentoolbar=true]),
-+:root[inFullscreen]:not([macOSNativeFullscreen]) toolbar:not([fullscreentoolbar=true]):not(.zen-dont-hide-on-fullscreen),
- :root[inFullscreen] .global-notificationbox {
-   visibility: collapse;
- }

src/browser/themes/shared/tabbrowser/tabs-css.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/themes/shared/tabbrowser/tabs.css b/browser/themes/shared/tabbrowser/tabs.css
-index 6ca85d9d4d593271fe49138ea736bd96651c05f5..bcae5b6829190d6e36a32b36d20c1c73ed810ba5 100644
+index 5b9ad123d819c6ef068acd427416957a1d0939fe..311caa27ee268c95215d459be02a93d20e129f8b 100644
 --- a/browser/themes/shared/tabbrowser/tabs.css
 +++ b/browser/themes/shared/tabbrowser/tabs.css
-@@ -32,7 +32,7 @@
+@@ -33,7 +33,7 @@
    --tab-block-margin: 4px;
    --tab-icon-end-margin: 5.5px;
    --tab-label-line-height: 1.7;
@@ -11,7 +11,7 @@ index 6ca85d9d4d593271fe49138ea736bd96651c05f5..bcae5b6829190d6e36a32b36d20c1c73
    --tab-hover-background-color: color-mix(in srgb, currentColor 11%, transparent);
    --tab-selected-textcolor: var(--toolbar-color);
    --tab-selected-bgcolor: var(--toolbar-bgcolor);
-@@ -210,8 +210,7 @@
+@@ -211,8 +211,7 @@
    }
  
    #tabbrowser-tabs[positionpinnedtabs] > #tabbrowser-arrowscrollbox > &[pinned] {
@@ -21,7 +21,7 @@ index 6ca85d9d4d593271fe49138ea736bd96651c05f5..bcae5b6829190d6e36a32b36d20c1c73
    }
  
    #tabbrowser-tabs[movingtab] &:is(:active, [multiselected]) {
-@@ -257,7 +256,6 @@
+@@ -258,7 +257,6 @@
    }
  
    :root:not([uidensity=compact], [sidebar-expand-on-hover]) &[pinned] {
@@ -29,7 +29,7 @@ index 6ca85d9d4d593271fe49138ea736bd96651c05f5..bcae5b6829190d6e36a32b36d20c1c73
    }
  
    &:is([selected], [multiselected]) {
-@@ -271,6 +269,7 @@
+@@ -272,6 +270,7 @@
      border-radius: inherit;
      position: relative;
      overflow: hidden;
@@ -37,15 +37,34 @@ index 6ca85d9d4d593271fe49138ea736bd96651c05f5..bcae5b6829190d6e36a32b36d20c1c73
  
      &::before {
        position: absolute;
-@@ -458,6 +457,7 @@
+@@ -459,14 +458,11 @@
  .tab-icon-image {
    -moz-context-properties: fill, stroke;
    fill: currentColor;
 +  border-radius: 4px;
  
-   /* Apply crisp rendering for favicons at exactly 2dppx resolution */
+   /* stylelint-disable-next-line media-query-no-invalid */
-   @media (resolution: 2dppx) {
+   @media -moz-pref("browser.tabs.fadeOutUnloadedTabs") {
-@@ -557,7 +557,7 @@
+     &[pending] {
+-      filter: grayscale(100%);
+-      @media (prefers-color-scheme: dark) {
+-        filter: grayscale(100%) invert();
+-      }
+       opacity: 0.5;
+       /* Fade the favicon out */
+       transition-property: filter, opacity;
+@@ -483,10 +479,6 @@
+   /* stylelint-disable-next-line media-query-no-invalid */
+   @media -moz-pref("browser.tabs.fadeOutExplicitlyUnloadedTabs") {
+     &[pending][discarded] {
+-      filter: grayscale(100%);
+-      @media (prefers-color-scheme: dark) {
+-        filter: grayscale(100%) invert();
+-      }
+       opacity: 0.5;
+       /* Fade the favicon out */
+       transition-property: filter, opacity;
+@@ -559,7 +551,7 @@
    z-index: 1; /* Overlay tab title */
  
    #tabbrowser-tabs[orient=vertical] & {
@@ -54,7 +73,7 @@ index 6ca85d9d4d593271fe49138ea736bd96651c05f5..bcae5b6829190d6e36a32b36d20c1c73
    }
  
    &[crashed] {
-@@ -565,7 +565,7 @@
+@@ -567,7 +559,7 @@
    }
  
    #tabbrowser-tabs[orient="vertical"]:not([expanded]) &:not([crashed]),
@@ -63,7 +82,7 @@ index 6ca85d9d4d593271fe49138ea736bd96651c05f5..bcae5b6829190d6e36a32b36d20c1c73
      &[soundplaying] {
        list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-playing-small.svg");
      }
-@@ -595,7 +595,7 @@
+@@ -597,7 +589,7 @@
        background-image: linear-gradient(var(--audio-overlay-extra-background)),
                          linear-gradient(var(--toolbox-bgcolor));
        -moz-context-properties: fill;
@@ -72,7 +91,7 @@ index 6ca85d9d4d593271fe49138ea736bd96651c05f5..bcae5b6829190d6e36a32b36d20c1c73
        color-scheme: var(--tab-selected-color-scheme);
        border-radius: var(--border-radius-circle);
  
-@@ -1362,7 +1362,7 @@ tab-group {
+@@ -1365,7 +1357,7 @@ tab-group {
    }
  }
  
@@ -81,7 +100,7 @@ index 6ca85d9d4d593271fe49138ea736bd96651c05f5..bcae5b6829190d6e36a32b36d20c1c73
  #vertical-tabs-newtab-button {
    appearance: none;
    min-height: var(--tab-min-height);
-@@ -1373,7 +1373,7 @@ tab-group {
+@@ -1376,7 +1368,7 @@ tab-group {
    margin-inline: var(--tab-inner-inline-margin);
  
    #tabbrowser-tabs[orient="vertical"]:not([expanded]) & > .toolbarbutton-text {
@@ -90,7 +109,7 @@ index 6ca85d9d4d593271fe49138ea736bd96651c05f5..bcae5b6829190d6e36a32b36d20c1c73
    }
  
    &:hover {
-@@ -1397,7 +1397,7 @@ tab-group {
+@@ -1400,7 +1392,7 @@ tab-group {
   * flex container. #tabs-newtab-button is a child of the arrowscrollbox where
   * we don't want a gap (between tabs), so we have to add some margin.
   */
@@ -99,7 +118,7 @@ index 6ca85d9d4d593271fe49138ea736bd96651c05f5..bcae5b6829190d6e36a32b36d20c1c73
    margin-block: var(--tab-block-margin);
  }
  
-@@ -1471,8 +1471,6 @@ tab-group {
+@@ -1474,8 +1466,6 @@ tab-group {
    }
  
    :root:not([sidebar-expand-on-hover]) & {
@@ -108,7 +127,7 @@ index 6ca85d9d4d593271fe49138ea736bd96651c05f5..bcae5b6829190d6e36a32b36d20c1c73
      /* stylelint-disable-next-line media-query-no-invalid */
      @media not -moz-pref("sidebar.visibility", "expand-on-hover") {
        /* We need these rules to apply at all times when the sidebar.visibility
-@@ -1586,7 +1584,6 @@ tab-group {
+@@ -1585,7 +1575,6 @@ tab-group {
  
    &:not([expanded]) {
      .tabbrowser-tab[pinned] {
@@ -116,7 +135,7 @@ index 6ca85d9d4d593271fe49138ea736bd96651c05f5..bcae5b6829190d6e36a32b36d20c1c73
      }
  
      .tab-background {
-@@ -1717,7 +1714,7 @@ tab-group {
+@@ -1716,7 +1705,7 @@ tab-group {
    toolbarbutton:not(#firefox-view-button),
    toolbarpaletteitem:not(#wrapper-firefox-view-button)
  ) ~ #tabbrowser-tabs {
@@ -125,7 +144,7 @@ index 6ca85d9d4d593271fe49138ea736bd96651c05f5..bcae5b6829190d6e36a32b36d20c1c73
    padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width) + 2px);
    margin-inline-start: 2px;
  }
-@@ -1751,7 +1748,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
+@@ -1750,7 +1739,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
    list-style-image: url(chrome://global/skin/icons/plus.svg);
  }
  

src/browser/themes/shared/toolbarbuttons-css.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/themes/shared/toolbarbuttons.css b/browser/themes/shared/toolbarbuttons.css
-index 26b58ee104a432a359ba2667d2e49a9231e81fef..7cb950e7b3fcb6f599e9cb645ea24a515e2cc491 100644
+index d84326072652a48d7fc9b61c585fb00ac4b506ab..c91654eb852460721cf7e45623fb471027f06d90 100644
 --- a/browser/themes/shared/toolbarbuttons.css
 +++ b/browser/themes/shared/toolbarbuttons.css
-@@ -218,7 +218,7 @@ toolbar[brighttext] .toolbaritem-combined-buttons > separator {
+@@ -249,7 +249,7 @@ toolbar[brighttext] .toolbaritem-combined-buttons > separator {
  #nav-bar-overflow-button {
    list-style-image: url("chrome://global/skin/icons/chevron.svg");
  
@@ -11,7 +11,7 @@ index 26b58ee104a432a359ba2667d2e49a9231e81fef..7cb950e7b3fcb6f599e9cb645ea24a51
      display: none;
    }
  
-@@ -428,7 +428,7 @@ toolbarbutton.bookmark-item:not(.subviewbutton) {
+@@ -459,7 +459,7 @@ toolbarbutton.bookmark-item:not(.subviewbutton) {
       */
      align-items: stretch;
      > .toolbarbutton-icon {

src/browser/themes/shared/urlbar-searchbar-css.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/urlbar-searchbar.css b/browser/themes/shared/urlbar-searchbar.css
-index e237ee9edea85c1d2ef22f988df6b22755e343e6..b06fc06686a7a969e924ad0df662dec937b3c70d 100644
+index 23661cf489d97cdbd6d4c66de199fd9dc0c8475f..2677dc60a92cebe014c817414a6067be9543cf98 100644
 --- a/browser/themes/shared/urlbar-searchbar.css
 +++ b/browser/themes/shared/urlbar-searchbar.css
 @@ -5,7 +5,7 @@
@@ -11,14 +11,18 @@ index e237ee9edea85c1d2ef22f988df6b22755e343e6..b06fc06686a7a969e924ad0df662dec9
    --urlbar-margin-inline: 5px;
    --urlbar-padding-block: 4px;
  }
-@@ -292,7 +292,9 @@
+@@ -303,10 +303,14 @@
- }
  
  #urlbar[breakout][breakout-extend] {
--  margin-left: calc(-1 * var(--urlbar-margin-inline));
+   height: auto;
 +  :root:not([zen-single-toolbar='true']) {
-+    margin-left: calc(-1 * var(--urlbar-margin-inline));
+   margin-left: calc(-1 * var(--urlbar-margin-inline));
 +  }
++  align-items: center;
    width: calc(var(--urlbar-width) + 2 * var(--urlbar-margin-inline));
  
    > .urlbar-input-container {
++    align-items: center;
+     height: var(--urlbar-container-height);
+     padding-block: calc((var(--urlbar-container-height) - var(--urlbar-height)) / 2 + var(--urlbar-container-padding));
+     padding-inline: calc(var(--urlbar-margin-inline) + var(--urlbar-container-padding));

src/browser/themes/shared/zen-icons/icons.css

@@ -670,7 +670,7 @@
 #unified-extensions-context-menu menuitem {
   background-image: var(--menu-image) !important;
   background-size: 16px !important;
-  background-position: var(--fp-contextmenu-menuitem-padding-inline) center !important;
+  background-position: var(--zen-contextmenu-menuitem-padding-inline) center !important;
   background-repeat: no-repeat !important;
   -moz-context-properties: fill, fill-opacity !important;
   fill: currentColor !important;
@@ -679,7 +679,7 @@
 @media not (-moz-platform: windows) {
   menu > .menu-iconic-text,
   menuitem > .menu-iconic-text {
-    padding-inline-start: var(--fp-contextmenu-menuicon-margin-inline) !important;
+    padding-inline-start: var(--zen-contextmenu-menuicon-margin-inline) !important;
   }
 }
 
@@ -1051,8 +1051,7 @@ menuitem[id='placesContext_new:separator'] {
   --menu-image: url('close-all.svg');
 }
 
-#context_zenUnloadTab,
+#context_unloadTab,
-#context_zenUnloadWebPanel,
 #context_zenTabActions {
   --menu-image: url('close-all.svg');
 }
@@ -1156,8 +1155,8 @@ menuitem[id='placesContext_new:separator'] {
   ),
 :not(:not(menubar) > menu, #ContentSelectDropdown) > menupopup > menucaption {
   padding-inline-start: calc(
-    var(--fp-contextmenu-menuitem-padding-inline) + 16px +
+    var(--zen-contextmenu-menuitem-padding-inline) + var(--zen-contextmenu-menuicon-margin-inline) /
-      var(--fp-contextmenu-menuicon-margin-inline)
+      2
   ) !important;
 }
 

src/browser/themes/windows/browser-css.patch

@@ -1,21 +1,12 @@
 diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
-index 3e75a5f366e76acf4b9457a510b58b0cb8af580f..99b5712d533e99f3bb3f13c1485e771ab66731cd 100644
+index 007aec91e089a1d2df20235890b268b820b0a529..ac0592cbcec62ffefb58b491dff48749852f2d88 100644
 --- a/browser/themes/windows/browser.css
 +++ b/browser/themes/windows/browser.css
-@@ -34,7 +34,6 @@
+@@ -31,7 +31,6 @@
-         /* stylelint-disable-next-line media-query-no-invalid */
+     /* stylelint-disable-next-line media-query-no-invalid */
-         @media -moz-pref("widget.windows.mica.toplevel-backdrop", 2) {
+     @media -moz-pref("widget.windows.mica.toplevel-backdrop", 2) {
-           /* For acrylic, do the same we do for popups to guarantee some contrast */
+       /* For acrylic, do the same we do for popups to guarantee some contrast */
--          background-color: light-dark(rgba(255, 255, 255, .6), rgba(0, 0, 0, .6));
+-      background-color: light-dark(rgba(255, 255, 255, .6), rgba(0, 0, 0, .6));
-         }
-       }
-     }
-@@ -57,7 +56,7 @@
-       }
      }
+   }
  
--    &[sizemode="normal"] #navigator-toolbox {
-+    &[sizemode="normal"] #browser {
-       border-top: .5px solid ActiveBorder;
-       &:-moz-window-inactive {
-         border-top-color: InactiveBorder;

src/build/moz-build.patch

@@ -1,8 +1,8 @@
 diff --git a/build/moz.build b/build/moz.build
-index ad78395c33bba4f6a7bd73bae2a3b6e0658ed59e..a3ba1001a60b764c9ef1c824917fe4d5b81ed0b2 100644
+index f7a912ec35dd089ea9a7e712765e954854f55cb3..a84534efbc7662f81573a4a80bc045e0a6d2ed3e 100644
 --- a/build/moz.build
 +++ b/build/moz.build
-@@ -90,7 +90,7 @@ if CONFIG["MOZ_APP_BASENAME"]:
+@@ -89,7 +89,7 @@ if CONFIG["MOZ_APP_BASENAME"]:
          if CONFIG[var]:
              appini_defines[var] = True
  

src/build/pgo/profileserver-py.patch

@@ -1,5 +1,5 @@
 diff --git a/build/pgo/profileserver.py b/build/pgo/profileserver.py
-index c59efbdc5382da897dcac31da7039cdc92e1d7dc..9b14add5b0c5afec5b7efc7f9df7d04d3169fc80 100755
+index 6017810c873f6be5a5d133dc9386f7cd8879e81b..6d399e0c8135d2c27157c81d75515de04c39f1d7 100755
 --- a/build/pgo/profileserver.py
 +++ b/build/pgo/profileserver.py
 @@ -18,7 +18,13 @@ from mozprofile import FirefoxProfile, Preferences

src/docshell/base/nsAboutRedirector-cpp.patch

@@ -1,5 +1,5 @@
 diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
-index e95ff966b34576439c745aa206ff534a835c956f..5691cb2baa76b7cd543bb030b7c8d3028359bc4c 100644
+index 77491402cb2921ad52c028ee8fe940636cbe3cf1..e93265e1bb96a07a6d9a66074f191cb8c16fa37a 100644
 --- a/docshell/base/nsAboutRedirector.cpp
 +++ b/docshell/base/nsAboutRedirector.cpp
 @@ -108,7 +108,7 @@ static const RedirEntry kRedirMap[] = {

src/dom/base/use_counter_metrics-yaml.patch

@@ -1,8 +1,8 @@
 diff --git a/dom/base/use_counter_metrics.yaml b/dom/base/use_counter_metrics.yaml
-index 58755773c26952b79df258dd8f55147c77db9c5f..041bd3fe99303621733cd3543e196b6a03950526 100644
+index 6d2b80297f728af4e6b363e09dac4244d9ffd312..03ca7d1c7f27430923f146a3d3a708a09e351948 100644
 --- a/dom/base/use_counter_metrics.yaml
 +++ b/dom/base/use_counter_metrics.yaml
-@@ -21402,6 +21402,22 @@ use.counter.css.page:
+@@ -21527,6 +21527,22 @@ use.counter.css.page:
      send_in_pings:
        - use-counters
  
@@ -25,7 +25,7 @@ index 58755773c26952b79df258dd8f55147c77db9c5f..041bd3fe99303621733cd3543e196b6a
    css_transform_origin:
      type: counter
      description: >
-@@ -33372,6 +33388,22 @@ use.counter.css.doc:
+@@ -33497,6 +33513,22 @@ use.counter.css.doc:
      send_in_pings:
        - use-counters
  

src/dom/html/HTMLMediaElement-cpp.patch

@@ -1,8 +1,8 @@
 diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp
-index 677a2f25b16f4cf724b57d86a2b83acf40ec6164..e06f85366866c1cc99d27bc10cbebf2cb986e5cb 100644
+index add22d0f3c462eae3d5b5140779ff7a4e25f9321..7653df83680ee0e6c765432b1539fe1c90bfae35 100644
 --- a/dom/html/HTMLMediaElement.cpp
 +++ b/dom/html/HTMLMediaElement.cpp
-@@ -455,6 +455,7 @@ class HTMLMediaElement::MediaControlKeyListener final
+@@ -452,6 +452,7 @@ class HTMLMediaElement::MediaControlKeyListener final
      // audible state. Therefore, in that case we would noitfy the audible state
      // when media starts playing.
      if (mState == MediaPlaybackState::ePlayed) {
@@ -10,8 +10,8 @@ index 677a2f25b16f4cf724b57d86a2b83acf40ec6164..e06f85366866c1cc99d27bc10cbebf2c
        NotifyAudibleStateChanged(mIsOwnerAudible
                                      ? MediaAudibleState::eAudible
                                      : MediaAudibleState::eInaudible);
-@@ -6967,6 +6968,9 @@ void HTMLMediaElement::FireTimeUpdate(TimeupdateType aType) {
+@@ -6955,6 +6956,9 @@ void HTMLMediaElement::FireTimeUpdate(TimeupdateType aType) {
-     DispatchAsyncEvent(std::move(runner));
+     QueueTask(std::move(runner));
      mQueueTimeUpdateRunnerTime = TimeStamp::Now();
      mLastCurrentTime = CurrentTime();
 +    if (aType == TimeupdateType::eMandatory) {

src/dom/script/ScriptLoader-cpp.patch

@@ -1,8 +1,8 @@
 diff --git a/dom/script/ScriptLoader.cpp b/dom/script/ScriptLoader.cpp
-index b3bec3821582d48c79cd88a4efe5c7bae1fd42e6..0bb81a8b0fa9478c894f80cfa81fd04c67fdd79f 100644
+index 51f63f998e47aa4b1dffc3cacdb0a698b33b4623..0387738ce1f29b5db4a5d03a3b2f5f3a91011125 100644
 --- a/dom/script/ScriptLoader.cpp
 +++ b/dom/script/ScriptLoader.cpp
-@@ -2670,6 +2670,36 @@ void ScriptLoader::CalculateBytecodeCacheFlag(ScriptLoadRequest* aRequest) {
+@@ -2679,6 +2679,36 @@ void ScriptLoader::CalculateBytecodeCacheFlag(ScriptLoadRequest* aRequest) {
        hasFetchCountMin = false;
        break;
      }

src/gfx/wr/webrender/src/picture-rs.patch

@@ -1,8 +1,8 @@
 diff --git a/gfx/wr/webrender/src/picture.rs b/gfx/wr/webrender/src/picture.rs
-index 7a811bc074959e0f0e7e25603acc4bf50edce4dc..4954cd9b2b3c9efdbe32343152c877186751ec26 100644
+index 3b0671ec8ffb8cbd0843e18569a948203c2b9cfe..77d4953cc9bf07d38efd26f4fe95e465b244598c 100644
 --- a/gfx/wr/webrender/src/picture.rs
 +++ b/gfx/wr/webrender/src/picture.rs
-@@ -7957,7 +7957,12 @@ fn get_relative_scale_offset(
+@@ -8027,7 +8027,12 @@ fn get_relative_scale_offset(
          CoordinateSpaceMapping::Local => ScaleOffset::identity(),
          CoordinateSpaceMapping::ScaleOffset(scale_offset) => scale_offset,
          CoordinateSpaceMapping::Transform(m) => {

src/image/decoders/nsJXLDecoder-h.patch

@@ -1,8 +1,8 @@
 diff --git a/image/decoders/nsJXLDecoder.h b/image/decoders/nsJXLDecoder.h
-index 6cde7456ca03f79e74401c1d215b9d50453ebf41..2f593ca3b70100c600b86e753d7a458c83b4f15c 100644
+index 0b723878aefdc5a37c2cffb72a561f859ad79cdf..6d39326dbefa9a85cc02b426de5c9f9149fe612d 100644
 --- a/image/decoders/nsJXLDecoder.h
 +++ b/image/decoders/nsJXLDecoder.h
-@@ -48,6 +48,18 @@ class nsJXLDecoder final : public Decoder {
+@@ -46,6 +46,18 @@ class nsJXLDecoder final : public Decoder {
    Vector<uint8_t> mBuffer;
    Vector<uint8_t> mOutBuffer;
    JxlBasicInfo mInfo{};

src/layout/generic/nsIFrame-cpp.patch

@@ -1,8 +1,8 @@
 diff --git a/layout/generic/nsIFrame.cpp b/layout/generic/nsIFrame.cpp
-index 0fff882bd3b643e3ab59cfaada984bef0ae7fee4..71e981251fa9395cbb14927d9bd3473c1e18a2cb 100644
+index fe05efa67f97e0d8cc327a4744a225ed5c6132c9..cce0dfb537fa1735b8e7ff67684d373a3081a527 100644
 --- a/layout/generic/nsIFrame.cpp
 +++ b/layout/generic/nsIFrame.cpp
-@@ -11721,6 +11721,11 @@ gfx::Matrix nsIFrame::ComputeWidgetTransform() const {
+@@ -11810,6 +11810,11 @@ gfx::Matrix nsIFrame::ComputeWidgetTransform() const {
    gfx::Matrix4x4 matrix = nsStyleTransformMatrix::ReadTransforms(
        uiReset->mMozWindowTransform, refBox, float(appUnitsPerDevPixel));
  

src/layout/style/nsStyleStruct-cpp.patch

@@ -1,8 +1,8 @@
 diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
-index f89bade8099183baa55b38ccc3c77c7ba9f1a290..8ada58a7965e7f2c9375d8b9bf64a5c78d80bf3f 100644
+index 8f587542ad248f7c0183e1787c81f37170c7ba54..3b213204e0faabb7ad8988872c8b39c776b87d73 100644
 --- a/layout/style/nsStyleStruct.cpp
 +++ b/layout/style/nsStyleStruct.cpp
-@@ -3204,6 +3204,9 @@ nsStyleUIReset::nsStyleUIReset()
+@@ -3229,6 +3229,9 @@ nsStyleUIReset::nsStyleUIReset()
        mWindowShadow(StyleWindowShadow::Auto),
        mWindowOpacity(1.0),
        mMozWindowInputRegionMargin(StyleLength::Zero()),
@@ -12,7 +12,7 @@ index f89bade8099183baa55b38ccc3c77c7ba9f1a290..8ada58a7965e7f2c9375d8b9bf64a5c7
        mTransitions(
            nsStyleAutoArray<StyleTransition>::WITH_SINGLE_INITIAL_ELEMENT),
        mTransitionTimingFunctionCount(1),
-@@ -3247,6 +3250,7 @@ nsStyleUIReset::nsStyleUIReset(const nsStyleUIReset& aSource)
+@@ -3272,6 +3275,7 @@ nsStyleUIReset::nsStyleUIReset(const nsStyleUIReset& aSource)
        mWindowOpacity(aSource.mWindowOpacity),
        mMozWindowInputRegionMargin(aSource.mMozWindowInputRegionMargin),
        mMozWindowTransform(aSource.mMozWindowTransform),

src/layout/style/nsStyleStruct-h.patch

@@ -1,8 +1,8 @@
 diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
-index 472c15a359ecd7ad0834d479f1acc53b4527f5ac..9f8377ab507b5883b92621160987a97e0be80014 100644
+index 1c6e2b5a3d4a0ca2b5ef50a84c220958885ce3e3..d74f5558ab70c53fc2649f0f3ab40a456c3e1c6a 100644
 --- a/layout/style/nsStyleStruct.h
 +++ b/layout/style/nsStyleStruct.h
-@@ -1876,6 +1876,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleUIReset {
+@@ -2003,6 +2003,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleUIReset {
    // The margin of the window region that should be transparent to events.
    mozilla::StyleLength mMozWindowInputRegionMargin;
    mozilla::StyleTransform mMozWindowTransform;

src/modules/libpref/init/StaticPrefList-yaml.patch

@@ -1,8 +1,8 @@
 diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
-index c4e19fc5231c2378ddb25f462cd1584aa9eac760..eb0cec062abf0c97bf5ca33e85aeacd496c296a8 100644
+index c3b88faf0b3294a143139487d3dac1127b84bd4f..7fdb31b61ced2e1f9131396ed88f1216ce7c5b1f 100644
 --- a/modules/libpref/init/StaticPrefList.yaml
 +++ b/modules/libpref/init/StaticPrefList.yaml
-@@ -18804,6 +18804,7 @@
+@@ -18839,6 +18839,7 @@
    mirror: always
  #endif
  

src/netwerk/protocol/http/moz-build.patch

@@ -1,8 +1,8 @@
 diff --git a/netwerk/protocol/http/moz.build b/netwerk/protocol/http/moz.build
-index a83080d963322d7baa581f1ca61f93d42bb5a938..0741be2ffc5449be829af7f6067d1abcdc86d155 100644
+index 4e60ca2b579aa3e02c7769fd966e36d297dd0068..24dbb5de95d4f7dbec354c30f9b2c4d64384225e 100644
 --- a/netwerk/protocol/http/moz.build
 +++ b/netwerk/protocol/http/moz.build
-@@ -223,7 +223,7 @@ LOCAL_INCLUDES += [
+@@ -222,7 +222,7 @@ LOCAL_INCLUDES += [
      "/netwerk/url-classifier",
  ]
  

src/old-configure-in.patch

@@ -1,13 +0,0 @@
-diff --git a/old-configure.in b/old-configure.in
-index 036734708f20d658248a8b5b3a6d8adc2530a878..4e1f0d96cd355cc1195b58548b29c1a5d6bedaa8 100644
---- a/old-configure.in
-+++ b/old-configure.in
-@@ -89,7 +89,7 @@ dnl Mac bundle identifier (based on MOZ_APP_DISPLAYNAME)
- if test -z "$MOZ_MACBUNDLE_ID"; then
-    MOZ_MACBUNDLE_ID=`echo $MOZ_APP_DISPLAYNAME | tr 'A-Z' 'a-z' | tr -dc 'a-z-'`
- fi
--MOZ_MACBUNDLE_ID=${MOZ_DISTRIBUTION_ID}.${MOZ_MACBUNDLE_ID}
-+MOZ_MACBUNDLE_ID=app.zen-browser.zen
- if test "$MOZ_DEBUG"; then
-   MOZ_MACBUNDLE_ID=${MOZ_MACBUNDLE_ID}debug
- fi

src/toolkit/actors/PictureInPictureChild-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/toolkit/actors/PictureInPictureChild.sys.mjs b/toolkit/actors/PictureInPictureChild.sys.mjs
-index 7ae1aa58bbaeab7a1835a3ea8328735d4f4ecfb1..9d0679dde3c031c2459c09ffbc157f32bc7d003a 100644
+index e4dea54a29e2a1575d76091061781a504da38465..d5248eebdd018feca7bb9d5ee3284d6f253a4b35 100644
 --- a/toolkit/actors/PictureInPictureChild.sys.mjs
 +++ b/toolkit/actors/PictureInPictureChild.sys.mjs
 @@ -291,6 +291,7 @@ export class PictureInPictureLauncherChild extends JSWindowActorChild {

src/toolkit/content/aboutSupport-xhtml.patch

@@ -1,5 +1,5 @@
 diff --git a/toolkit/content/aboutSupport.xhtml b/toolkit/content/aboutSupport.xhtml
-index 296259cd0360a403e8659e22d0c08e968529a38a..bde1ee8d0a05e6ce2eb3ff8ff8a19ba28c20af98 100644
+index 7f57218f3573488445ea363e0c4532b292d53167..511f578b4ae38a496ca936adf2fef1f587249f47 100644
 --- a/toolkit/content/aboutSupport.xhtml
 +++ b/toolkit/content/aboutSupport.xhtml
 @@ -10,6 +10,7 @@

src/toolkit/content/widgets/arrowscrollbox-js.patch

@@ -1,5 +1,5 @@
 diff --git a/toolkit/content/widgets/arrowscrollbox.js b/toolkit/content/widgets/arrowscrollbox.js
-index f9191af09f1b7a1654aff62807e7dad573afc172..f94a8b3dc5871fba5d0dbed5d487d6e32a1ff29a 100644
+index e2000d0f0c33e0e497e79dd206e195235bc5094e..ac69cb75d2be93a1f72fb61bea200d3dcbcdd77f 100644
 --- a/toolkit/content/widgets/arrowscrollbox.js
 +++ b/toolkit/content/widgets/arrowscrollbox.js
 @@ -98,6 +98,7 @@
@@ -10,12 +10,12 @@ index f9191af09f1b7a1654aff62807e7dad573afc172..f94a8b3dc5871fba5d0dbed5d487d6e3
          let contentSize =
            slot.getBoundingClientRect()[this.#verticalMode ? "height" : "width"];
          // NOTE(emilio): This should be contentSize > scrollClientSize, but due
-@@ -639,7 +640,7 @@
+@@ -642,7 +643,7 @@
  
      on_wheel(event) {
        // Don't consume the event if we can't scroll.
 -      if (!this.overflowing) {
-+      if (!this.overflowing || this.id === 'tabbrowser-arrowscrollbox') { // we handle this on ZenStartup
++      if (!this.overflowing || this.id === 'tabbrowser-arrowscrollbox' || ((event.deltaY == 0 || gZenWorkspaces._swipeState?.isGestureActive) && this.classList.contains('workspace-arrowscrollbox'))) {
          return;
        }
  

src/toolkit/content/widgets/infobar-css.patch

@@ -1,8 +1,8 @@
 diff --git a/toolkit/content/widgets/infobar.css b/toolkit/content/widgets/infobar.css
-index 7818f1ef1dcc62e184bd5e3e8d6d936acf77d2ea..4803c07a183e2df70e8fdc9769bb4bb15a73f39b 100644
+index 9b28d3179db134bb14b4c4d840d5f3aac1dc7b3f..5cdd1a379e5a5156d0adeac78b0af300440d84b5 100644
 --- a/toolkit/content/widgets/infobar.css
 +++ b/toolkit/content/widgets/infobar.css
-@@ -94,3 +94,18 @@ strong {
+@@ -96,3 +96,18 @@ strong {
  :host([type=system]) .content {
    margin-inline-start: 0;
  }

src/toolkit/content/widgets/tabbox-js.patch

@@ -1,5 +1,5 @@
 diff --git a/toolkit/content/widgets/tabbox.js b/toolkit/content/widgets/tabbox.js
-index 6775a7635c6cdbb276b3a912d0bba07840acb28f..4ef3eb6a7dbd741cf432668c2ff6e832f5bb97e7 100644
+index 6775a7635c6cdbb276b3a912d0bba07840acb28f..861640d12c6118e11acb3f51723a79098dbbba10 100644
 --- a/toolkit/content/widgets/tabbox.js
 +++ b/toolkit/content/widgets/tabbox.js
 @@ -213,7 +213,7 @@
@@ -7,7 +7,7 @@ index 6775a7635c6cdbb276b3a912d0bba07840acb28f..4ef3eb6a7dbd741cf432668c2ff6e832
        this._inAsyncOperation = false;
        if (oldPanel != this._selectedPanel) {
 -        oldPanel?.classList.remove("deck-selected");
-+        if (!oldPanel?.classList.contains("zen-glance-background")) oldPanel?.classList.remove("deck-selected");
++        if (!(window.gZenGlanceManager && gZenGlanceManager.shouldShowDeckSelected(this._selectedPanel, oldPanel))) oldPanel?.classList.remove("deck-selected");
          this._selectedPanel?.classList.add("deck-selected");
        }
        this.setAttribute("selectedIndex", val);

src/toolkit/content/xul-css.patch

@@ -1,8 +1,8 @@
 diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css
-index 134acec351c818eb824e2c98fa380d99ebaf8fac..3774893d98617634150f1f85568e212d98f9404c 100644
+index f730088432526521037a8933a6ee00af8c378f11..ef2bb2ecd364327a348602ff070814f653843081 100644
 --- a/toolkit/content/xul.css
 +++ b/toolkit/content/xul.css
-@@ -468,7 +468,8 @@ deck > *|*:not(:-moz-native-anonymous) {
+@@ -446,7 +446,8 @@ deck > *|*:not(:-moz-native-anonymous) {
  }
  
  tabpanels > .deck-selected,

src/toolkit/modules/AppConstants-sys-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/toolkit/modules/AppConstants.sys.mjs b/toolkit/modules/AppConstants.sys.mjs
-index bf7a0ec9570a8657d192fd28c9b4852aa8869225..59f5466582757320ab1f70ec26d76fc589e0a335 100644
+index a794e82288d30c979f2d2798bded49fb4dd3118b..cd1875dc048607447e25d30341052a6930d1c08f 100644
 --- a/toolkit/modules/AppConstants.sys.mjs
 +++ b/toolkit/modules/AppConstants.sys.mjs
-@@ -174,6 +174,8 @@ export var AppConstants = Object.freeze({
+@@ -172,6 +172,8 @@ export var AppConstants = Object.freeze({
    MOZ_UPDATE_CHANNEL: "@MOZ_UPDATE_CHANNEL@",
    MOZ_WIDGET_TOOLKIT: "@MOZ_WIDGET_TOOLKIT@",
  

src/toolkit/modules/moz-build.patch

@@ -1,8 +1,8 @@
 diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
-index b7dd298c4ffa1b95531e3646d57a52e524fcf801..da23bcd2a8b4b49ce07f4602f5e624bf4bfbfc8d 100644
+index e6a9634bc5ae26a5bc82402a8a0f37e1fedc27ca..e27cab2a984b2d09033bc956df90519e01f683d7 100644
 --- a/toolkit/modules/moz.build
 +++ b/toolkit/modules/moz.build
-@@ -282,6 +282,7 @@ for var in (
+@@ -277,6 +277,7 @@ for var in (
      "DLL_SUFFIX",
      "DEBUG_JS_MODULES",
      "OMNIJAR_NAME",

src/toolkit/moz-configure.patch

@@ -1,5 +1,5 @@
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index 09b3065c214ecceacb6f264cdacbb777252f33ea..97ee12093d6330ae9da4aa1bea2ecd5b76843110 100644
+index f9b96c0a62ae1e222eebeb6f8ca4fbf4c65703b4..6a439a22ee71a03709411fb8480278104d3996d1 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
 @@ -22,6 +22,7 @@ def check_moz_app_id(moz_app_id, build_project):
@@ -33,7 +33,7 @@ index 09b3065c214ecceacb6f264cdacbb777252f33ea..97ee12093d6330ae9da4aa1bea2ecd5b
      help="Set distribution-specific id",
  )
  set_config("MOZ_DISTRIBUTION_ID", depends("--with-distribution-id")(lambda v: v[0]))
-@@ -881,9 +886,9 @@ set_config("MOZ_SYSTEM_AV1", True, when="--with-system-av1")
+@@ -932,9 +937,9 @@ set_config("MOZ_SYSTEM_AV1", True, when="--with-system-av1")
  option("--disable-jxl", help="Disable jxl image support")
  
  
@@ -46,7 +46,7 @@ index 09b3065c214ecceacb6f264cdacbb777252f33ea..97ee12093d6330ae9da4aa1bea2ecd5b
          return True
  
  
-@@ -2019,7 +2024,7 @@ set_define("A11Y_LOG", True, when=a11y_log)
+@@ -2060,7 +2065,7 @@ set_define("A11Y_LOG", True, when=a11y_log)
  # ==============================================================
  @depends(milestone)
  def require_signing(milestone):

src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/toolkit/mozapps/extensions/AddonManager.sys.mjs b/toolkit/mozapps/extensions/AddonManager.sys.mjs
-index 883e8389eec97815adfdb8c62fc15482f6d7f0e7..234c956ba799666a3cba6fd6dcdad774ffc6b79e 100644
+index e09ea87de86b06d1b505e59d4f0c4a090533ca71..9e8291ee5a83a686f3a129c3c6872bb7c84fdcd9 100644
 --- a/toolkit/mozapps/extensions/AddonManager.sys.mjs
 +++ b/toolkit/mozapps/extensions/AddonManager.sys.mjs
 @@ -1221,12 +1221,12 @@ var AddonManagerInternal = {

src/toolkit/mozapps/extensions/content/aboutaddons-html.patch

@@ -1,8 +1,8 @@
 diff --git a/toolkit/mozapps/extensions/content/aboutaddons.html b/toolkit/mozapps/extensions/content/aboutaddons.html
-index 67808c799aca92a0c71731ab0c345bb478522368..5ddcbcecd43b2b04eb4c0e5b86eebd69b142a5a3 100644
+index 77702576f03cc8db7ec85bd871e6366fef935d54..edd5f27303802091c84572a7a2d3933c03cf09d9 100644
 --- a/toolkit/mozapps/extensions/content/aboutaddons.html
 +++ b/toolkit/mozapps/extensions/content/aboutaddons.html
-@@ -82,6 +82,7 @@
+@@ -86,6 +86,7 @@
        type="module"
        src="chrome://global/content/elements/moz-five-star.mjs"
      ></script>

src/toolkit/profile/nsToolkitProfileService-cpp.patch

@@ -1,5 +1,5 @@
 diff --git a/toolkit/profile/nsToolkitProfileService.cpp b/toolkit/profile/nsToolkitProfileService.cpp
-index e6722fb8f379c3032301fc3c1c49d894a566c28a..f6c560bb3f2ffdba4eaed876f7679245235fde8c 100644
+index 4ebdcd3bd8739955972eab938f1f394e928503d2..f731ff5667bc5f615bb6a780c1cb6a6fb1cb6b48 100644
 --- a/toolkit/profile/nsToolkitProfileService.cpp
 +++ b/toolkit/profile/nsToolkitProfileService.cpp
 @@ -82,6 +82,8 @@ using namespace mozilla;
@@ -11,7 +11,7 @@ index e6722fb8f379c3032301fc3c1c49d894a566c28a..f6c560bb3f2ffdba4eaed876f7679245
  struct KeyValue {
    KeyValue(const char* aKey, const char* aValue) : key(aKey), value(aValue) {}
  
-@@ -1404,7 +1406,7 @@ nsresult nsToolkitProfileService::CreateDefaultProfile(
+@@ -1391,7 +1393,7 @@ nsresult nsToolkitProfileService::CreateDefaultProfile(
    if (mUseDevEditionProfile) {
      name.AssignLiteral(DEV_EDITION_NAME);
    } else if (mUseDedicatedProfile) {

src/toolkit/themes/linux/global/menu-css.patch

@@ -1,12 +0,0 @@
-diff --git a/toolkit/themes/linux/global/menu.css b/toolkit/themes/linux/global/menu.css
-index da47f78790a251bb573d992476dc5dac9a870857..6c7d6cbdaf3f0bd35a52c80785577a6bc0d55e29 100644
---- a/toolkit/themes/linux/global/menu.css
-+++ b/toolkit/themes/linux/global/menu.css
-@@ -52,7 +52,6 @@ menulist > menupopup > :is(menuitem, menucaption, menu) {
- 
- .menu-text {
-   /* This is (18 + the size of end-padding on .menu-iconic-left)px */
--  margin-inline-start: 21px;
- }
- 
- .menu-accel,

src/toolkit/themes/shared/menu-shared-css.patch

@@ -1,19 +0,0 @@
-diff --git a/toolkit/themes/shared/menu-shared.css b/toolkit/themes/shared/menu-shared.css
-index 40b4fdd66cf54f9d16be2c78be1b003abbd91e60..6be265511e625f78551c07cf21234f47fba9ed1d 100644
---- a/toolkit/themes/shared/menu-shared.css
-+++ b/toolkit/themes/shared/menu-shared.css
-@@ -100,13 +100,7 @@ menucaption {
-   list-style-image: none;
-   max-width: 42em;
- 
--  @media (-moz-platform: linux) {
--    padding: 4px 6px;
--  }
--
--  @media (-moz-platform: macos) {
--    padding: 3px 9px;
--  }
-+  padding: 6px 5px;
- }
- 
- menu,

src/toolkit/themes/shared/popup-css.patch

@@ -1,5 +1,5 @@
 diff --git a/toolkit/themes/shared/popup.css b/toolkit/themes/shared/popup.css
-index 5701d305fdfc0407ead51aa52eefee38e7429de8..642325e981e9597eaaefefa725852a49b49ee6dc 100644
+index efc623e403b9517ffe4ec557e7c777274c350a7a..14400c90334be37e53dfbb5e07efa983ef8fef40 100644
 --- a/toolkit/themes/shared/popup.css
 +++ b/toolkit/themes/shared/popup.css
 @@ -22,8 +22,8 @@ panel {

src/tools/signing/macos/mach_commands-py.patch

@@ -1,5 +1,5 @@
 diff --git a/tools/signing/macos/mach_commands.py b/tools/signing/macos/mach_commands.py
-index a513ad723805459c194d27b42dac68e9babba468..3a08bb0987f9d6cf01c05f8ebb56efa91a5b9d0e 100644
+index 454a9bbc35802fbf811065e8e1ca592674016bb3..d6b0cf119664e0534a3898f72ffbcd3aade9c89d 100644
 --- a/tools/signing/macos/mach_commands.py
 +++ b/tools/signing/macos/mach_commands.py
 @@ -37,7 +37,6 @@ from mozbuild.base import MachCommandConditions as conditions

src/xpfe/appshell/AppWindow-cpp.patch

@@ -1,5 +1,5 @@
 diff --git a/xpfe/appshell/AppWindow.cpp b/xpfe/appshell/AppWindow.cpp
-index a5e57d3086c57c4307b2c93b2814064d752d08ed..d0a83dd574ed03028ad3e79f8f0fba868bb5bec1 100644
+index 22dbf9028167d5555a91c7087040a1909a27e2a2..356b9722a1a4815f5fdde0ff13bf8f89d7f26f87 100644
 --- a/xpfe/appshell/AppWindow.cpp
 +++ b/xpfe/appshell/AppWindow.cpp
 @@ -1866,7 +1866,7 @@ nsresult AppWindow::MaybeSaveEarlyWindowPersistentValues(

src/zen/@types/zen.d.ts

@@ -279,10 +279,6 @@ declare namespace MockedExports {
 
   const PlaceUtilsSYSMJS: {
     PlacesUtils: {
-      promiseFaviconData: (
-        pageUrl: string | URL | nsIURI,
-        preferredWidth?: number
-      ) => Promise<FaviconData>;
       // TS-TODO: Add the rest.
     };
   };

src/zen/common/ZenCustomizableUI.sys.mjs

@@ -49,7 +49,7 @@ export var ZenCustomizableUI = new (class {
     const sidebarBox = window.MozXULElement.parseXULToFragment(`
       <toolbar id="zen-sidebar-top-buttons"
         fullscreentoolbar="true"
-        class="browser-toolbar customization-target zen-dont-hide-on-fullscreen"
+        class="browser-toolbar customization-target"
         brighttext="true"
         data-l10n-id="tabs-toolbar"
         customizable="true"

src/zen/common/ZenStartup.mjs

@@ -2,11 +2,21 @@
   var ZenStartup = {
     init() {
       this.openWatermark();
+      this._initBrowserBackground();
       this._changeSidebarLocation();
       this._zenInitBrowserLayout();
       this._initSearchBar();
     },
 
+    _initBrowserBackground() {
+      const background = document.createXULElement('box');
+      background.id = 'zen-browser-background';
+      const grain = document.createXULElement('box');
+      grain.id = 'zen-browser-grain';
+      background.appendChild(grain);
+      document.getElementById('browser').prepend(background);
+    },
+
     _zenInitBrowserLayout() {
       if (this.__hasInitBrowserLayout) return;
       this.__hasInitBrowserLayout = true;
@@ -25,10 +35,9 @@
         // Fix notification deck
         const deckTemplate = document.getElementById('tab-notification-deck-template');
         if (deckTemplate) {
-          document.getElementById('zen-appcontent-navbar-container').appendChild(deckTemplate);
+          document.getElementById('zen-appcontent-wrapper').prepend(deckTemplate);
         }
 
-        this._initSidebarScrolling();
         this._hideUnusedElements();
 
         gZenWorkspaces.init();
@@ -144,40 +153,6 @@
       }
     },
 
-    _initSidebarScrolling() {
-      // Disable smooth scroll
-      const canSmoothScroll = Services.prefs.getBoolPref(
-        'zen.startup.smooth-scroll-in-tabs',
-        false
-      );
-      const tabsWrapper = document.getElementById('zen-tabs-wrapper');
-      gBrowser.tabContainer.addEventListener('wheel', (event) => {
-        if (canSmoothScroll) return;
-        event.preventDefault(); // Prevent the smooth scroll behavior
-        gBrowser.tabContainer.scrollTop += event.deltaY * 20; // Apply immediate scroll
-      });
-      // Detect overflow and underflow
-      const observer = new ResizeObserver((_) => {
-        const tabContainer = gBrowser.tabContainer;
-        // const isVertical = tabContainer.getAttribute('orient') === 'vertical';
-        // let contentSize = tabsWrapper.getBoundingClientRect()[isVertical ? 'height' : 'width'];
-        // NOTE: This should be contentSize > scrollClientSize, but due
-        // to how Gecko internally rounds in those cases, we allow for some
-        // minor differences (the internal Gecko layout size is 1/60th of a
-        // pixel, so 0.02 should cover it).
-        //let overflowing = contentSize - tabContainer.arrowScrollbox.scrollClientSize > 0.02;
-        let overflowing = true; // cheatign the system, because we want to always show make the element overflowing
-
-        window.requestAnimationFrame(() => {
-          tabContainer.arrowScrollbox.toggleAttribute('overflowing', overflowing);
-          tabContainer.arrowScrollbox.dispatchEvent(
-            new CustomEvent(overflowing ? 'overflow' : 'underflow')
-          );
-        });
-      });
-      observer.observe(tabsWrapper);
-    },
-
     _initSearchBar() {
       // Only focus the url bar
       gURLBar.focus();

src/zen/common/ZenUIManager.mjs

@@ -58,7 +58,6 @@ var gZenUIManager = {
     });
 
     window.addEventListener('TabClose', this.onTabClose.bind(this));
-    this.tabsWrapper.addEventListener('scroll', this.saveScrollbarState.bind(this));
 
     gZenMediaController.init();
   },
@@ -88,18 +87,9 @@ var gZenUIManager = {
     return this._tabsWrapper;
   },
 
-  saveScrollbarState() {
-    this._scrollbarState = this.tabsWrapper.scrollTop;
-  },
-
-  restoreScrollbarState() {
-    this.tabsWrapper.scrollTop = this._scrollbarState;
-  },
-
   onTabClose(event = undefined) {
     if (!event?.target?._closedInMultiselection) {
       this.updateTabsToolbar();
-      this.restoreScrollbarState();
     }
   },
 
@@ -407,7 +397,11 @@ var gZenUIManager = {
   },
 
   urlbarTrim(aURL) {
-    if (gZenVerticalTabsManager._hasSetSingleToolbar && this.urlbarShowDomainOnly) {
+    if (
+      gZenVerticalTabsManager._hasSetSingleToolbar &&
+      this.urlbarShowDomainOnly &&
+      !gURLBar.hasAttribute('breakout-extend')
+    ) {
       let url = BrowserUIUtils.removeSingleTrailingSlashFromURL(aURL);
       return url.startsWith('https://') ? url.split('/')[2] : url;
     }
@@ -779,7 +773,7 @@ var gZenVerticalTabsManager = {
       // on purpose, we set the orient to horizontal, because the arrowScrollbox is vertical
       gBrowser.tabContainer.arrowScrollbox.scrollbox.setAttribute(
         'orient',
-        isVerticalTabs && gZenWorkspaces.workspaceEnabled ? 'horizontal' : 'vertical'
+        isVerticalTabs ? 'vertical' : 'horizontal'
       );
 
       const buttonsTarget = document.getElementById('zen-sidebar-top-buttons-customization-target');
@@ -791,7 +785,9 @@ var gZenVerticalTabsManager = {
         document.documentElement.removeAttribute('zen-right-side');
       }
 
+      delete this._hadSidebarCollapse;
       if (isSidebarExpanded) {
+        this._hadSidebarCollapse = !document.documentElement.hasAttribute('zen-sidebar-expanded');
         this.navigatorToolbox.setAttribute('zen-sidebar-expanded', 'true');
         document.documentElement.setAttribute('zen-sidebar-expanded', 'true');
         gBrowser.tabContainer.setAttribute('expanded', 'true');
@@ -802,6 +798,7 @@ var gZenVerticalTabsManager = {
       }
 
       const appContentNavbarContaienr = document.getElementById('zen-appcontent-navbar-container');
+      const appContentNavbarWrapper = document.getElementById('zen-appcontent-navbar-wrapper');
       let shouldHide = false;
       if (
         ((!isRightSide && this.isWindowsStyledButtons) ||
@@ -809,10 +806,10 @@ var gZenVerticalTabsManager = {
           (isCompactMode && isSingleToolbar && this.isWindowsStyledButtons)) &&
         isSingleToolbar
       ) {
-        appContentNavbarContaienr.setAttribute('should-hide', 'true');
+        appContentNavbarWrapper.setAttribute('should-hide', 'true');
         shouldHide = true;
       } else {
-        appContentNavbarContaienr.removeAttribute('should-hide');
+        appContentNavbarWrapper.removeAttribute('should-hide');
       }
 
       // Check if the sidebar is in hover mode
@@ -990,6 +987,7 @@ var gZenVerticalTabsManager = {
   },
 
   async renameTabKeydown(event) {
+    event.stopPropagation();
     if (event.key === 'Enter') {
       let label = this._tabEdited.querySelector('.tab-label-container-editing');
       let input = this._tabEdited.querySelector('#tab-label-input');

src/zen/common/ZenUIMigration.mjs

@@ -6,7 +6,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
 
 class ZenUIMigration {
   PREF_NAME = 'zen.migration.version';
-  MIGRATION_VERSION = 2;
+  MIGRATION_VERSION = 4;
 
   init(isNewProfile, win) {
     if (!isNewProfile) {
@@ -30,6 +30,12 @@ class ZenUIMigration {
     if (this._migrationVersion < 2) {
       this._migrateV2(win);
     }
+    if (this._migrationVersion < 3) {
+      this._migrateV3(win);
+    }
+    if (this._migrationVersion < 4) {
+      this._migrateV4(win);
+    }
   }
 
   clearVariables() {
@@ -67,6 +73,25 @@ class ZenUIMigration {
       Services.prefs.clearUserPref('zen.widget.windows.acrylic');
     }
   }
+
+  _migrateV3(win) {
+    const kArea = win.CustomizableUI.AREA_TABSTRIP;
+    const widgets = win.CustomizableUI.getWidgetsInArea(kArea);
+    for (const widget of widgets) {
+      const widgetId = widget.id;
+      if (widgetId === 'tabbrowser-tabs') {
+        continue;
+      }
+      win.CustomizableUI.removeWidgetFromArea(widgetId);
+    }
+  }
+
+  _migrateV4(win) {
+    Services.prefs.setBoolPref(
+      'browser.tabs.unloadOnLowMemory',
+      Services.prefs.getBoolPref('zen.tab-unloader.enabled', true)
+    );
+  }
 }
 
 export var gZenUIMigration = new ZenUIMigration();

src/zen/common/styles/zen-animations.css

@@ -62,15 +62,6 @@
   }
 }
 
-@keyframes zen-main-app-wrapper-animation {
-  from {
-    opacity: 1;
-  }
-  to {
-    opacity: 0;
-  }
-}
-
 @keyframes zen-jello-out-animation {
   0% {
     transform: scale3d(1, 1, 1);

src/zen/common/styles/zen-browser-container.css

@@ -10,22 +10,14 @@
     position: relative;
     overflow: hidden;
 
-    :root:not([zen-no-padding='true']) & {
+    &.browserSidebarContainer {
-      border-radius: var(--zen-native-inner-radius);
-      box-shadow: var(--zen-big-shadow);
-    }
-
-    & browser[transparent='true'] {
-      background: rgba(255, 255, 255, 0.1);
-    }
-  }
-
-  @media -moz-pref('zen.view.experimental-rounded-view') {
-    #tabbrowser-tabpanels {
       :root:not([zen-no-padding='true']) & {
-        mix-blend-mode: multiply;
+        border-radius: var(--zen-native-inner-radius);
-        -moz-osx-font-smoothing: grayscale;
+        box-shadow: var(--zen-big-shadow);
-        isolation: isolate;
+      }
+
+      & browser[transparent='true'] {
+        background: rgba(255, 255, 255, 0.1);
       }
     }
   }

src/zen/common/styles/zen-browser-ui.css

@@ -32,57 +32,72 @@
 }
 
 #browser {
+  background: transparent !important;
   width: 100%;
-  background: var(--zen-main-browser-background) !important;
+}
 
-  will-change: background-color;
+#zen-browser-background {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 0;
+  pointer-events: none;
 
-  &::after {
+  isolation: isolate;
+
+  &::after,
+  &::before {
     content: '';
-    position: fixed;
+    position: absolute;
-    top: 0;
+    inset: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
     z-index: 0;
     pointer-events: none;
   }
 
-  &:not([post-animating='true'])::after {
-    transition: background-color var(--inactive-window-transition);
-  }
-
   @media -moz-pref('zen.theme.gradient') {
-    &[animating='true']::after {
+    &::after {
-      background: var(--zen-main-browser-background-old);
+      background: var(--zen-main-browser-background);
-      backdrop-filter: blur(5px);
+      opacity: var(--zen-background-opacity);
-      animation: zen-main-app-wrapper-animation 0.4s ease forwards;
       transition: 0s;
     }
+
+    &::before {
+      background: var(--zen-main-browser-background-old);
+      opacity: calc(1 - var(--zen-background-opacity));
+      transition: 0s;
+    }
+
+    :root[animating-background='true'] &::after {
+      mix-blend-mode: normal;
+    }
+  }
+
+  :root:not([animating-background='true']) &::before {
+    transition: background-color var(--inactive-window-transition);
   }
 
   @media (not (-moz-windows-mica)) and -moz-pref('zen.view.grey-out-inactive-windows') {
     transition: color var(--inactive-window-transition);
     :root:not([zen-welcome-stage]) &:-moz-window-inactive {
       color: var(--toolbox-textcolor-inactive);
-      &::after {
+      &::before {
         background-color: var(--toolbox-bgcolor-inactive);
       }
     }
   }
 
-  &::before {
+  #zen-browser-grain {
     content: '';
-    position: fixed;
+    width: 100%;
-    top: 0;
+    height: 100%;
-    left: 0;
-    right: 0;
-    bottom: 0;
     background-image: url(chrome://browser/content/zen-images/grain-bg.png);
     pointer-events: none;
     z-index: 0;
     opacity: var(--zen-grainy-background-opacity, 0);
     mix-blend-mode: overlay;
+    transition: opacity 0.3s ease-in-out;
   }
 }
 
@@ -259,3 +274,13 @@
 :root:not([customizing]) #TabsToolbar-customization-target > #alltabs-button {
   display: none;
 }
+
+:root[customizing] #TabsToolbar-customization-target {
+  visibility: collapse;
+}
+
+:root[customizing] #zen-sidebar-top-buttons-customization-target {
+  border: 1px dashed;
+  border-radius: 2px;
+  margin: 10px 2px 0 0;
+}

src/zen/common/styles/zen-popup.css

@@ -35,12 +35,17 @@
   --uc-permission-item-margin-block: 4px;
   --uc-permission-item-padding-inline: 16px;
   --zen-panel-separator-width: 1px;
+
+  --zen-contextmenu-menuitem-padding-inline: 10px;
+  --zen-contextmenu-menuicon-margin-inline: 12px;
+  --zen-contextmenu-menuitem-margin: 0px 2px;
 }
 
 menupopup,
 panel {
   --panel-background: var(--arrowpanel-background);
   --panel-border-radius: var(--zen-native-inner-radius);
+  --menuitem-padding: 6px 5px !important;
 }
 
 /* split-view popup */
@@ -362,7 +367,7 @@ menuseparator {
     gap: 10px;
     z-index: 1000;
     padding: var(--zen-toast-padding);
-    border-radius: calc(var(--zen-native-inner-radius) + 8px);
+    border-radius: calc(var(--zen-native-inner-radius) + 6px);
     background: linear-gradient(
       170deg,
       var(--zen-primary-color) -40%,
@@ -393,11 +398,12 @@ menuseparator {
     }
 
     & button {
+      color-scheme: dark;
       width: min-content;
       padding: 0 12px !important;
       min-width: unset !important;
       margin: 0px !important;
-      border-radius: calc(var(--zen-native-inner-radius) + 4px) !important;
+      border-radius: calc(var(--zen-native-inner-radius) + 2px) !important;
 
       :root[zen-right-side='true'] & {
         order: -1;

src/zen/common/styles/zen-theme.css

@@ -19,6 +19,8 @@
   --zen-border-radius: 7px;
   --zen-primary-color: #ffb787;
 
+  --zen-background-opacity: 1;
+
   /* Branding */
   --zen-branding-dark: #1d1d1d;
   --zen-branding-coral: #f76f53;
@@ -154,21 +156,6 @@
 
   --tab-icon-overlay-stroke: light-dark(white, black) !important;
 
-  --fp-contextmenu-border-radius: 8px;
-  --fp-contextmenu-padding: calc(4px - var(--fp-contextmenu-menuitem-border-width)) 0;
-  --fp-contextmenu-menuitem-border-radius: calc(4px + var(--fp-contextmenu-menuitem-border-width));
-  --fp-contextmenu-menuitem-padding-block: 6px;
-  --fp-contextmenu-menuitem-padding-inline: 10px;
-  --fp-contextmenu-menuitem-border-width: 2px;
-  --fp-contextmenu-menuicon-margin-inline: 12px;
-  --fp-contextmenu-menuitem-margin-inline: calc(4px - var(--fp-contextmenu-menuitem-border-width));
-  --fp-contextmenu-menuitem-margin-block: 0px;
-  --fp-contextmenu-menuitem-margin: var(--fp-contextmenu-menuitem-margin-block)
-    var(--fp-contextmenu-menuitem-margin-inline);
-  --fp-contextmenu-separator-vertical: calc(4px - var(--fp-contextmenu-menuitem-border-width));
-  --fp-contextmenu-separator-horizontal: 0;
-  --fp-contextmenu-bgcolor: light-dark(Menu, rgb(43 42 51 / 0.95));
-
   --tab-close-button-padding: 5px !important;
 
   --toolbarbutton-active-background: var(--zen-toolbar-element-bg);
@@ -197,6 +184,16 @@
     --zen-themed-toolbar-bg-transparent: transparent;
   }
 
+  &[zen-private-window='true'] {
+    --zen-main-browser-background: linear-gradient(
+      130deg,
+      light-dark(rgb(247, 217, 255), rgb(10, 6, 11)) 0%,
+      light-dark(rgb(242, 198, 255), rgb(19, 7, 22)) 100%
+    );
+    --zen-main-browser-background-toolbar: var(--zen-main-browser-background);
+    --zen-primary-color: light-dark(rgb(93, 42, 107), rgb(110, 48, 125)) !important;
+  }
+
   --toolbar-field-background-color: var(--zen-colors-input-bg) !important;
   --arrowpanel-background: var(--zen-dialog-background) !important;
 

src/zen/common/styles/zen-toolbar.css

@@ -8,6 +8,6 @@
   background: transparent;
 }
 
-:root[inDOMFullscreen='true'] #zen-appcontent-navbar-container {
+:root[inDOMFullscreen='true'] #zen-appcontent-navbar-wrapper {
   visibility: collapse;
 }

src/zen/common/styles/zen-urlbar.css

@@ -24,10 +24,6 @@
   border-radius: calc(var(--toolbarbutton-border-radius) - 2px);
   --urlbarView-results-padding: 10px !important;
 
-  :root:not([zen-single-toolbar='true']) &[zen-floating-urlbar='true'] {
-    --urlbar-container-padding: 2px !important;
-  }
-
   --urlbar-margin-inline: 5px;
   --urlbar-container-padding: 5px;
   :root[zen-single-toolbar='true'] {
@@ -105,6 +101,10 @@
   outline: none !important;
 }
 
+#urlbar .urlbar-input {
+  border-radius: 0 !important;
+}
+
 :root[zen-single-toolbar='true'] #urlbar:not([breakout-extend='true']) {
   & #urlbar-input {
     cursor: default;
@@ -178,9 +178,7 @@
       --zen-urlbar-background-transparent,
       var(--zen-urlbar-background-base)
     ) !important;
-    box-shadow:
+    box-shadow: 0px 0px 90px -10px rgba(0, 0, 0, 0.6) !important;
-      0 20px 25px -5px rgb(0 0 0 / 0.1),
-      0 8px 10px -6px rgb(0 0 0 / 0.1);
     backdrop-filter: none !important;
     border-radius: 12px !important;
     outline: 0.5px solid light-dark(rgba(0, 0, 0, 0.15), rgba(255, 255, 255, 0.15)) !important;

src/zen/common/zen-sets.js

@@ -88,15 +88,6 @@ document.addEventListener(
           case 'cmd_zenRemoveFromEssentials':
             gZenPinnedTabManager.removeEssentials();
             break;
-          case 'cmd_zenUnloadTab':
-            gZenTabUnloader.unloadTab();
-            break;
-          case 'cmd_zenPreventUnloadTab':
-            gZenTabUnloader.preventUnloadTab();
-            break;
-          case 'cmd_zenIgnoreUnloadTab':
-            gZenTabUnloader.ignoreUnloadTab();
-            break;
           default:
             if (event.target.id.startsWith('cmd_zenWorkspaceSwitch')) {
               const index = parseInt(event.target.id.replace('cmd_zenWorkspaceSwitch', ''), 10) - 1;

src/zen/compact-mode/ZenCompactMode.mjs

@@ -51,7 +51,7 @@ var gZenCompactModeManager = {
 
     gZenUIManager.addPopupTrackingAttribute(this.sidebar);
     gZenUIManager.addPopupTrackingAttribute(
-      document.getElementById('zen-appcontent-navbar-container')
+      document.getElementById('zen-appcontent-navbar-wrapper')
     );
 
     // Clear hover states when window state changes (minimize, maximize, etc.)
@@ -76,7 +76,14 @@ var gZenCompactModeManager = {
     return lazyCompactMode.mainAppWrapper.getAttribute('zen-compact-mode') === 'true';
   },
 
+  get shouldBeCompact() {
+    return !document.documentElement.getAttribute('chromehidden').includes('toolbar');
+  },
+
   set preference(value) {
+    if (!this.shouldBeCompact) {
+      value = false;
+    }
     if (
       this.preference === value ||
       document.documentElement.hasAttribute('zen-compact-animating')
@@ -201,18 +208,33 @@ var gZenCompactModeManager = {
     }
     let sidebarWidth = this.sidebar.getBoundingClientRect().width;
     if (sidebarWidth > 1) {
-      gZenUIManager.restoreScrollbarState();
+      if (this.preference && gZenVerticalTabsManager._prefsSidebarExpanded) {
+        sidebarWidth = Math.max(sidebarWidth, 150);
+      }
       // Second variable to get the genuine width of the sidebar
       this.sidebar.style.setProperty('--actual-zen-sidebar-width', `${sidebarWidth}px`);
       window.dispatchEvent(new window.Event('resize')); // To recalculate the layout
-      if (event && this.preference) {
+      if (
+        event &&
+        this.preference &&
+        gZenVerticalTabsManager._prefsSidebarExpanded &&
+        !gZenVerticalTabsManager._hadSidebarCollapse
+      ) {
         return;
       }
+      delete gZenVerticalTabsManager._hadSidebarCollapse;
       this.sidebar.style.setProperty('--zen-sidebar-width', `${sidebarWidth}px`);
     }
     return sidebarWidth;
   },
 
+  get canHideSidebar() {
+    return (
+      Services.prefs.getBoolPref('zen.view.compact.hide-tabbar') ||
+      gZenVerticalTabsManager._hasSetSingleToolbar
+    );
+  },
+
   animateCompactMode() {
     return new Promise((resolve) => {
       // Get the splitter width before hiding it (we need to hide it before animating on right)
@@ -222,9 +244,7 @@ var gZenCompactModeManager = {
         .getElementById('zen-sidebar-splitter')
         .getBoundingClientRect().width;
       const isCompactMode = this.preference;
-      const canHideSidebar =
+      const canHideSidebar = this.canHideSidebar;
-        Services.prefs.getBoolPref('zen.view.compact.hide-tabbar') ||
-        gZenVerticalTabsManager._hasSetSingleToolbar;
       let canAnimate =
         lazyCompactMode.COMPACT_MODE_CAN_ANIMATE_SIDEBAR && !this.isSidebarPotentiallyOpen();
       if (typeof this._wasInCompactMode !== 'undefined') {
@@ -240,6 +260,7 @@ var gZenCompactModeManager = {
       this.sidebar.style.removeProperty('transform');
       window.requestAnimationFrame(() => {
         let sidebarWidth = this.getAndApplySidebarWidth();
+        const elementSeparation = ZenThemeModifier.elementSeparation;
         if (!canAnimate) {
           this.sidebar.removeAttribute('animate');
           document.documentElement.removeAttribute('zen-compact-animating');
@@ -247,17 +268,52 @@ var gZenCompactModeManager = {
           this.getAndApplySidebarWidth({});
           this._ignoreNextResize = true;
 
+          // TODO: Work on this a bit more, needs polishing
+          if (lazyCompactMode.COMPACT_MODE_CAN_ANIMATE_SIDEBAR && false) {
+            gZenUIManager.motion
+              .animate(
+                [
+                  this.sidebar,
+                  ...(gZenVerticalTabsManager._hasSetSingleToolbar &&
+                  !gURLBar.hasAttribute('zen-floating-urlbar')
+                    ? [gURLBar.textbox]
+                    : []),
+                ],
+                {
+                  transform: [
+                    `translateY(${((isCompactMode ? -1 : 1) * elementSeparation) / 2}px) translateX(${
+                      isCompactMode
+                        ? (this.sidebarIsOnRight ? elementSeparation : -elementSeparation) / 2
+                        : (this.sidebarIsOnRight ? -elementSeparation : elementSeparation) / 2
+                    }px)`,
+                    `translateY(0px) translateX(0px)`,
+                  ],
+                },
+                {
+                  ease: 'easeIn',
+                  type: 'spring',
+                  bounce: 0,
+                  duration: 0.2,
+                }
+              )
+              .then(() => {
+                this.sidebar.style.transform = '';
+                gURLBar.textbox.style.transform = '';
+              });
+          }
+
           resolve();
           return;
         }
         if (canHideSidebar && isCompactMode) {
-          const elementSeparation = ZenThemeModifier.elementSeparation;
           if (document.documentElement.hasAttribute('zen-sidebar-expanded')) {
             sidebarWidth -= 0.5 * splitterWidth;
             if (elementSeparation < splitterWidth) {
               // Subtract from the splitter width to end up with the correct element separation
               sidebarWidth += 1.5 * splitterWidth - elementSeparation;
             }
+          } else {
+            sidebarWidth -= elementSeparation;
           }
           gZenUIManager.motion
             .animate(
@@ -406,7 +462,7 @@ var gZenCompactModeManager = {
               keepHoverDuration: 100,
             },
             {
-              element: document.getElementById('zen-appcontent-navbar-container'),
+              element: document.getElementById('zen-appcontent-navbar-wrapper'),
               screenEdge: 'top',
             },
           ]),
@@ -586,7 +642,7 @@ var gZenCompactModeManager = {
   },
 
   toggleToolbar() {
-    let toolbar = document.getElementById('zen-appcontent-navbar-container');
+    let toolbar = document.getElementById('zen-appcontent-navbar-wrapper');
     toolbar.toggleAttribute('zen-user-show');
   },
 
@@ -616,7 +672,8 @@ var gZenCompactModeManager = {
       !this.isSidebarPotentiallyOpen() &&
       this._canShowBackgroundTabToast &&
       !gZenGlanceManager._animating &&
-      !this._nextTimeWillBeActive
+      !this._nextTimeWillBeActive &&
+      this.canHideSidebar
     ) {
       gZenUIManager.showToast('zen-background-tab-opened-toast');
     }

src/zen/compact-mode/zen-compact-mode.css

@@ -38,11 +38,11 @@
         padding-inline-start: calc(var(--zen-toolbox-padding) - var(--toolbarbutton-outer-padding)) !important;
       }
 
-      &:not([zen-window-buttons-reversed='true']) #zen-appcontent-navbar-container #nav-bar {
+      &:not([zen-window-buttons-reversed='true']) #zen-appcontent-navbar-wrapper #nav-bar {
         margin-left: var(--zen-element-separation) !important;
       }
 
-      &[zen-window-buttons-reversed='true'] #zen-appcontent-navbar-container #nav-bar {
+      &[zen-window-buttons-reversed='true'] #zen-appcontent-navbar-wrapper #nav-bar {
         margin-right: var(--zen-element-separation) !important;
         margin-left: calc(var(--zen-element-separation) - 3px) !important;
       }
@@ -64,12 +64,17 @@
           top: 0;
           bottom: var(--zen-element-separation);
           padding: 0 var(--zen-compact-float) !important;
-
           :root[zen-single-toolbar='true'] & {
             top: calc(var(--zen-element-separation) / 2);
             height: calc(100% - var(--zen-element-separation));
           }
-
+          :root:not([zen-single-toolbar='true']) & {
+            top: calc(var(--zen-element-separation) / -2);
+            height: calc(100% - var(--zen-toolbar-height));
+            @media -moz-pref('zen.view.compact.hide-toolbar') {
+              height: 100%;
+            }
+          }
           & #zen-sidebar-top-buttons {
             margin: 0 0 calc(var(--zen-toolbox-padding) / 2) 0;
           }
@@ -114,7 +119,8 @@
         padding: var(--zen-toolbox-padding) !important;
         :root:not([zen-sidebar-expanded='true']) & {
           padding: var(--zen-toolbox-padding) 0 !important;
-          max-width: var(--zen-sidebar-width);
+          max-width: calc(var(--zen-sidebar-width) - var(--zen-toolbox-padding) * 2);
+          width: var(--zen-sidebar-width);
         }
         position: relative;
         min-width: var(--zen-toolbox-min-width);
@@ -146,7 +152,6 @@
           border-radius: calc(var(--zen-native-inner-radius) + var(--zen-element-separation) / 4);
           @media -moz-pref('zen.view.compact.color-sidebar') {
             background: var(--zen-main-browser-background-toolbar) !important;
-            background-attachment: fixed !important;
             background-size: 2000px !important;
             @media -moz-pref('zen.theme.acrylic-elements') {
               backdrop-filter: blur(42px) saturate(110%) brightness(0.25) contrast(100%) !important;
@@ -166,6 +171,7 @@
           z-index: 0;
           opacity: var(--zen-grainy-background-opacity, 0);
           mix-blend-mode: overlay;
+          transition: opacity 0.3s ease-in-out;
         }
       }
 
@@ -334,68 +340,77 @@
         margin-top: calc(var(--zen-element-separation) * 2) !important;
       }
 
-      & #zen-appcontent-navbar-container {
+      & #zen-appcontent-navbar-wrapper {
         --zen-compact-toolbar-offset: 5px;
         position: absolute;
-        top: calc((-1 * var(--zen-toolbar-height)) + var(--zen-element-separation) + 1px);
+        top: calc(-1 * var(--zen-toolbar-height) + 1px);
         left: 0;
         z-index: 20;
-        box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.3) !important;
-        border-bottom-left-radius: var(--zen-border-radius);
-        border-bottom-right-radius: var(--zen-border-radius);
-        border-top-left-radius: env(-moz-gtk-csd-titlebar-radius);
-        border-top-right-radius: env(-moz-gtk-csd-titlebar-radius);
         transition: all 0.15s ease;
         width: 100%;
-        opacity: 0;
-        background: var(--zen-dialog-background);
 
         max-height: var(--zen-toolbar-height);
         overflow: hidden;
 
-        & > * {
-          position: relative !important;
-        }
-
         & #urlbar:not([breakout-extend='true']) {
           opacity: 0 !important;
         }
 
-        @media -moz-pref('zen.view.compact.color-toolbar') {
+        & #zen-appcontent-navbar-container {
-          background-attachment: fixed;
+          visibility: hidden;
-          background: var(--zen-main-browser-background-toolbar);
+
-          background-size: 100% 2000px;
+          box-shadow: var(--zen-big-shadow);
-          border-bottom: 1px solid var(--zen-colors-border);
+          border-bottom-left-radius: var(--zen-border-radius);
+          border-bottom-right-radius: var(--zen-border-radius);
+          :root:not([sizemode='maximized']) & {
+            border-top-left-radius: env(-moz-gtk-csd-titlebar-radius);
+            border-top-right-radius: env(-moz-gtk-csd-titlebar-radius);
+          }
+          transition: all 0.15s ease;
+          width: 100%;
+          background: var(--zen-dialog-background);
+
+          & > * {
+            position: relative !important;
+          }
+
+          @media -moz-pref('zen.view.compact.color-toolbar') {
+            background-attachment: fixed;
+            background: var(--zen-main-browser-background-toolbar);
+            background-size: 100% 2000px;
+          }
         }
       }
 
-      & #zen-appcontent-navbar-container[zen-has-hover]:not(:has(#urlbar[zen-floating-urlbar='true']:hover)),
+      & #zen-appcontent-navbar-wrapper[zen-has-hover]:not(:has(#urlbar[zen-floating-urlbar='true']:hover)),
-      & #zen-appcontent-navbar-container[zen-user-show],
+      & #zen-appcontent-navbar-wrapper[zen-user-show],
-      & #zen-appcontent-navbar-container[has-popup-menu],
+      & #zen-appcontent-navbar-wrapper[has-popup-menu],
-      & #zen-appcontent-navbar-container:has(
+      & #zen-appcontent-navbar-wrapper:has(
           *:is([panelopen='true'], [open='true'], #urlbar:focus-within, [breakout-extend='true']):not(#urlbar[zen-floating-urlbar='true']):not(.zen-compact-mode-ignore)
         ) {
-        opacity: 1;
+        & #zen-appcontent-navbar-container {
+          visibility: visible !important;
+          &::before {
+            content: '';
+            position: absolute;
+            top: 0;
+            left: 0;
+            right: 0;
+            bottom: 0;
+            background-image: url(chrome://browser/content/zen-images/grain-bg.png);
+            pointer-events: none;
+            z-index: 0;
+            opacity: var(--zen-grainy-background-opacity, 0);
+            mix-blend-mode: overlay;
+            transition: opacity 0.3s ease-in-out;
+          }
+        }
         border-top-width: 1px;
 
         top: -1px;
         overflow: initial;
         max-height: unset;
 
-        &::before {
-          content: '';
-          position: absolute;
-          top: 0;
-          left: 0;
-          right: 0;
-          bottom: 0;
-          background-image: url(chrome://browser/content/zen-images/grain-bg.png);
-          pointer-events: none;
-          z-index: 0;
-          opacity: var(--zen-grainy-background-opacity, 0);
-          mix-blend-mode: overlay;
-        }
-
         & #urlbar {
           opacity: 1 !important;
         }
@@ -420,7 +435,7 @@
   }
   @media -moz-pref('zen.view.compact.hide-toolbar') {
     &:not([zen-single-toolbar='true']) {
-      & #zen-appcontent-navbar-container {
+      & #zen-appcontent-navbar-wrapper {
         opacity: 0;
       }
     }