From eb3c90b18cd2395724e95a7eb9a6b4b456704b27 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Sun, 19 Jul 2026 17:19:16 +0200
Subject: [PATCH] closes #14651: Update to Firefox `153.0`

---
 README.md                                     |   2 +-
 build/firefox-cache/l10n-last-commit-hash     |   2 +-
 src/-stylelintrc-js.patch                     |   8 +-
 .../base/content/browser-box-inc-xhtml.patch  |   4 +-
 .../base/content/navigator-toolbox-js.patch   |   8 +-
 .../ui/modules/AIWindow-sys-mjs.patch         |   8 +-
 .../extensions/parent/ext-browser-js.patch    |  10 +-
 .../extensions/parent/ext-tabs-js.patch       |   8 +-
 .../components/nova/NovaPrefs-sys-mjs.patch   |  13 -
 .../places/PlacesUIUtils-sys-mjs.patch        |  11 +-
 .../components/preferences/main-js.patch      |  12 +-
 .../preferences/preferences-js.patch          |  14 +-
 .../preferences/preferences-xhtml.patch       |  10 +-
 .../tabbrowser/content/tabbrowser-js.patch    | 224 +++++++++---------
 .../UrlbarProvidersManager-sys-mjs.patch      |  18 +-
 .../urlbar/UrlbarResult-sys-mjs.patch         |  15 --
 .../urlbar/UrlbarTokenizer-sys-mjs.patch      |  28 ---
 .../urlbar/UrlbarUtils-sys-mjs.patch          |   2 +-
 .../urlbar/UrlbarValueFormatter-sys-mjs.patch |  22 +-
 .../urlbar/content/UrlbarInput-mjs.patch      |  56 ++---
 .../urlbar/content/UrlbarResult-mjs.patch     |  15 ++
 .../urlbar/content/UrlbarShared-mjs.patch     |  28 +++
 .../UrlbarView-mjs.patch}                     |  16 +-
 .../identity-block/identity-block-css.patch   |  16 +-
 src/browser/themes/shared/jar-inc-mn.patch    |   7 +-
 .../shared/tabbrowser/content-area-css.patch  |  12 +-
 .../themes/shared/tabbrowser/tabs-css.patch   |  42 ++--
 .../themes/shared/urlbar-searchbar-css.patch  |  34 +--
 .../themes/shared/urlbar/variables-css.patch  |  13 -
 src/docshell/base/BrowsingContext-h.patch     |   8 +-
 .../MediaController-webidl.patch              |   7 +-
 src/eslint-file-globals-config-mjs.patch      |   8 +-
 ..._urlbar_closeonwindowblur_preference.patch |   6 +-
 src/layout/base/nsPresContext-h.patch         |  10 +-
 src/layout/generic/nsTextPaintStyle-cpp.patch |  16 +-
 src/layout/style/StyleColor-cpp.patch         |  36 +--
 src/layout/svg/SVGImageContext-cpp.patch      |   8 +-
 src/layout/svg/SVGImageContext-h.patch        |  25 +-
 src/servo/ports/geckolib/cbindgen-toml.patch  |   8 +-
 .../extensions/content/aboutaddons-css.patch  |  17 +-
 .../dist/tokens-shared-css.patch              |  12 +-
 .../shared/in-content/common-shared-css.patch |   8 +-
 surfer.json                                   |   2 +-
 43 files changed, 397 insertions(+), 432 deletions(-)
 delete mode 100644 src/browser/components/nova/NovaPrefs-sys-mjs.patch
 delete mode 100644 src/browser/components/urlbar/UrlbarResult-sys-mjs.patch
 delete mode 100644 src/browser/components/urlbar/UrlbarTokenizer-sys-mjs.patch
 create mode 100644 src/browser/components/urlbar/content/UrlbarResult-mjs.patch
 create mode 100644 src/browser/components/urlbar/content/UrlbarShared-mjs.patch
 rename src/browser/components/urlbar/{UrlbarView-sys-mjs.patch => content/UrlbarView-mjs.patch} (72%)
 delete mode 100644 src/browser/themes/shared/urlbar/variables-css.patch

diff --git a/README.md b/README.md
index 78c5ab935..ffbe647e9 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ Zen is a firefox-based browser with the aim of pushing your productivity to a ne
 ### Firefox Versions
 
 - [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `152.0.6`! 🚀
-- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 152.0.6`!
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 153.0`!
 
 ### Contributing
 
diff --git a/build/firefox-cache/l10n-last-commit-hash b/build/firefox-cache/l10n-last-commit-hash
index 2c5d209bf..4e1b64816 100644
--- a/build/firefox-cache/l10n-last-commit-hash
+++ b/build/firefox-cache/l10n-last-commit-hash
@@ -1 +1 @@
-e7fbb446077536139cdd78b6a0386a97237af20f
\ No newline at end of file
+b1d3fe8f65751e6d695fa9ef94b11ad81e70dac1
\ No newline at end of file
diff --git a/src/-stylelintrc-js.patch b/src/-stylelintrc-js.patch
index 2454e3824..baadd6208 100644
--- a/src/-stylelintrc-js.patch
+++ b/src/-stylelintrc-js.patch
@@ -1,5 +1,5 @@
 diff --git a/.stylelintrc.js b/.stylelintrc.js
-index 3c9fecf731126fdbf900d1bdcd3635dd31ed53ef..c3a210b8153e9699c6cbdc0d568bb72433976b2c 100644
+index b484bf6600a7e1b8ad2aed8c8b7fe5e84cc3d023..f89712e2c13dfa0bcb48e55cd3872c67f5c98dad 100644
 --- a/.stylelintrc.js
 +++ b/.stylelintrc.js
 @@ -67,7 +67,7 @@ module.exports = {
@@ -11,9 +11,9 @@ index 3c9fecf731126fdbf900d1bdcd3635dd31ed53ef..c3a210b8153e9699c6cbdc0d568bb724
        {
          ignore: ["blockless-at-rules"],
        },
-@@ -274,7 +274,7 @@ module.exports = {
-     // Remove this line setting `csscontrols/use-logical` to null after implementing fixes
-     "csstools/use-logical": null,
+@@ -280,7 +280,7 @@ module.exports = {
+     "media-query-no-invalid": null,
+     "stylelint-plugin-mozilla/media-query-no-invalid": true,
      "stylelint-plugin-mozilla/no-base-design-tokens": true,
 -    "stylelint-plugin-mozilla/use-design-tokens": true,
 +    "stylelint-plugin-mozilla/use-design-tokens": false,
diff --git a/src/browser/base/content/browser-box-inc-xhtml.patch b/src/browser/base/content/browser-box-inc-xhtml.patch
index e807e8553..a45ec45a0 100644
--- a/src/browser/base/content/browser-box-inc-xhtml.patch
+++ b/src/browser/base/content/browser-box-inc-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-box.inc.xhtml b/browser/base/content/browser-box.inc.xhtml
-index 31cd4f927c273573b38021f84417101c57377902..f293e1c61d3b7a80b7dc472d927893f0439d6af9 100644
+index 4a16fe93daeefb88af024c1dac05bc1f518c3fcb..a420768e4047937c8becefb69c1017e13fc12231 100644
 --- a/browser/base/content/browser-box.inc.xhtml
 +++ b/browser/base/content/browser-box.inc.xhtml
 @@ -3,12 +3,22 @@
@@ -10,7 +10,7 @@ index 31cd4f927c273573b38021f84417101c57377902..f293e1c61d3b7a80b7dc472d927893f0
 +  <html:div id="zen-browser-background" class="zen-browser-generic-background">
 +    <html:div class="zen-browser-grain" />
 +  </html:div>
-   <box context="sidebar-context-menu" id="sidebar-main" class="chrome-block" hidden="true">
+   <box context="sidebar-context-menu" id="sidebar-container" class="chrome-block" hidden="true">
      <html:sidebar-main flex="1">
        <box id="vertical-tabs" slot="tabstrip" customizable="true" contextmenu="toolbar-context-menu"></box>
      </html:sidebar-main>
diff --git a/src/browser/base/content/navigator-toolbox-js.patch b/src/browser/base/content/navigator-toolbox-js.patch
index eb9f6b8ee..320fc6441 100644
--- a/src/browser/base/content/navigator-toolbox-js.patch
+++ b/src/browser/base/content/navigator-toolbox-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/navigator-toolbox.js b/browser/base/content/navigator-toolbox.js
-index 1982ebadbd2df5ea309db487a4f30288f1af43e5..926c681d4733c84768a23407d60ca05859408b6d 100644
+index 10faff18ca0c6df472de81b5dbdba83309fa2eb8..b675df9ad22150f5a1060dedbabf6cb27c951619 100644
 --- a/browser/base/content/navigator-toolbox.js
 +++ b/browser/base/content/navigator-toolbox.js
 @@ -10,7 +10,7 @@ ChromeUtils.defineESModuleGetters(this, {
@@ -37,15 +37,15 @@ index 1982ebadbd2df5ea309db487a4f30288f1af43e5..926c681d4733c84768a23407d60ca058
          case "back-button":
          case "forward-button":
          case "reload-button":
-@@ -329,6 +341,7 @@ document.addEventListener(
+@@ -331,6 +343,7 @@ document.addEventListener(
          #downloads-button,
          #fxa-toolbar-menu-button,
          #unified-extensions-button,
 +        #zen-site-data-icon-button,
          #library-button,
+         #ipprotection-button,
          #split-view-button,
-         #smartwindow-ask-button
-@@ -413,6 +426,16 @@ document.addEventListener(
+@@ -416,6 +429,16 @@ document.addEventListener(
            gUnifiedExtensions.togglePanel(event);
            break;
  
diff --git a/src/browser/components/aiwindow/ui/modules/AIWindow-sys-mjs.patch b/src/browser/components/aiwindow/ui/modules/AIWindow-sys-mjs.patch
index c4f1266bd..22a419454 100644
--- a/src/browser/components/aiwindow/ui/modules/AIWindow-sys-mjs.patch
+++ b/src/browser/components/aiwindow/ui/modules/AIWindow-sys-mjs.patch
@@ -1,12 +1,12 @@
 diff --git a/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs b/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
-index f6f1dd1f6b4d21d27e39b48bb7a57871ad5d019d..bf743120cf9f137cbe06d05896f706fb3d5b9435 100644
+index 88c3545431cf1a300d968c296d9b171871b15fe5..754cd644f2e7b82db40d5c06618ac1764424484c 100644
 --- a/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
 +++ b/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
-@@ -287,6 +287,7 @@ export const AIWindow = {
+@@ -308,6 +308,7 @@ export const AIWindow = {
    },
  
-   _updateToolbarButtonPositions(win, { isToggling = false } = {}) {
+   _updateToolbarButtonPositions(win) {
 +    return;
      const modeSwitcherButton = win.document.getElementById("ai-window-toggle");
      const hamburgerMenu = win.document.getElementById("PanelUI-button");
- 
+     const hamburgerMenuShouldBeAdjacent =
diff --git a/src/browser/components/extensions/parent/ext-browser-js.patch b/src/browser/components/extensions/parent/ext-browser-js.patch
index 05916d78b..23cdaf996 100644
--- a/src/browser/components/extensions/parent/ext-browser-js.patch
+++ b/src/browser/components/extensions/parent/ext-browser-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/extensions/parent/ext-browser.js b/browser/components/extensions/parent/ext-browser.js
-index aca5a23deda6b0f2316b0e108cff20ffd7feda67..a06c90937f97a4994b0807b54984089dbe627a71 100644
+index 91adc6bc3649af47745818e6f9d00cbbdffc35a5..e221b077dbfbe20c8696732f003bd5809d761a02 100644
 --- a/browser/components/extensions/parent/ext-browser.js
 +++ b/browser/components/extensions/parent/ext-browser.js
-@@ -352,6 +352,7 @@ class TabTracker extends TabTrackerBase {
+@@ -362,6 +362,7 @@ class TabTracker extends TabTrackerBase {
    }
  
    getId(nativeTab) {
@@ -10,15 +10,15 @@ index aca5a23deda6b0f2316b0e108cff20ffd7feda67..a06c90937f97a4994b0807b54984089d
      let id = this._tabs.get(nativeTab);
      if (id) {
        return id;
-@@ -386,6 +387,7 @@ class TabTracker extends TabTrackerBase {
+@@ -395,6 +396,7 @@ class TabTracker extends TabTrackerBase {
      if (nativeTab.documentGlobal.closed) {
        throw new Error("Cannot attach ID to a tab in a closed window.");
      }
 +    if (nativeTab.hasAttribute("zen-empty-tab")) return;
  
      this._tabs.set(nativeTab, id);
-     if (nativeTab.linkedBrowser) {
-@@ -1276,6 +1278,10 @@ class TabManager extends TabManagerBase {
+     this._tabIds.set(id, nativeTab);
+@@ -1262,6 +1264,10 @@ class TabManager extends TabManagerBase {
    }
  
    canAccessTab(nativeTab) {
diff --git a/src/browser/components/extensions/parent/ext-tabs-js.patch b/src/browser/components/extensions/parent/ext-tabs-js.patch
index c0136e1e0..fa1206baf 100644
--- a/src/browser/components/extensions/parent/ext-tabs-js.patch
+++ b/src/browser/components/extensions/parent/ext-tabs-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/extensions/parent/ext-tabs.js b/browser/components/extensions/parent/ext-tabs.js
-index 8f5fdecc9394d42a1460a1b73fb8c4e92f63c41e..82c03e234289c7b00f49f73854be45fb95fb91d7 100644
+index f342748d4b680a5de3a8b7c90df79f7c380b9e1c..65091cf370e00a580ae2cb1fad9cde76f10c8bd9 100644
 --- a/browser/components/extensions/parent/ext-tabs.js
 +++ b/browser/components/extensions/parent/ext-tabs.js
-@@ -514,6 +514,7 @@ this.tabs = class extends ExtensionAPIPersistent {
+@@ -438,6 +438,7 @@ this.tabs = class extends ExtensionAPIPersistent {
          }
  
          let tab = tabManager.getWrapper(updatedTab);
@@ -10,11 +10,11 @@ index 8f5fdecc9394d42a1460a1b73fb8c4e92f63c41e..82c03e234289c7b00f49f73854be45fb
  
          let changeInfo = {};
          for (let prop of needed) {
-@@ -883,6 +884,7 @@ this.tabs = class extends ExtensionAPIPersistent {
+@@ -806,6 +807,7 @@ this.tabs = class extends ExtensionAPIPersistent {
                });
              }
  
 +            window.gZenCompactModeManager._nextTimeWillBeActive = active;
              let nativeTab = window.gBrowser.addTab(url, options);
+             tabTracker.addTabReadyBlocker(nativeTab);
  
-             if (active) {
diff --git a/src/browser/components/nova/NovaPrefs-sys-mjs.patch b/src/browser/components/nova/NovaPrefs-sys-mjs.patch
deleted file mode 100644
index a8e46884d..000000000
--- a/src/browser/components/nova/NovaPrefs-sys-mjs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/browser/components/nova/NovaPrefs.sys.mjs b/browser/components/nova/NovaPrefs.sys.mjs
-index 3d22c881c481643fcffbc581523905a1847a7d41..453dd4d9c43d7483c037a993afbf2b854533497c 100644
---- a/browser/components/nova/NovaPrefs.sys.mjs
-+++ b/browser/components/nova/NovaPrefs.sys.mjs
-@@ -18,7 +18,7 @@ const PLATFORM_PREFS = (() => {
- })();
- 
- function applyNovaPlatformDefaults() {
--  const on = Services.prefs.getBoolPref("browser.nova.enabled", false);
-+  const on = true;
-   const defaults = Services.prefs.getDefaultBranch("");
-   for (const pref of PLATFORM_PREFS) {
-     defaults.setBoolPref(pref, on);
diff --git a/src/browser/components/places/PlacesUIUtils-sys-mjs.patch b/src/browser/components/places/PlacesUIUtils-sys-mjs.patch
index e31abe1c0..0a549c356 100644
--- a/src/browser/components/places/PlacesUIUtils-sys-mjs.patch
+++ b/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 7c2786cc1be512ddfc165fb8f6514131ac033040..5846aff53030ef0fad2f87d017ba3713889b474d 100644
+index 7c11a2004c87aa6f0c61cf05ca522c7471c7be71..0f92f9925221cadbd258402f1b6a86a71fdb42e9 100644
 --- a/browser/components/places/PlacesUIUtils.sys.mjs
 +++ b/browser/components/places/PlacesUIUtils.sys.mjs
 @@ -61,6 +61,7 @@ class BookmarkState {
@@ -157,12 +157,3 @@ index 7c2786cc1be512ddfc165fb8f6514131ac033040..5846aff53030ef0fad2f87d017ba3713
    /**
     * Append transactions to update tags by given information.
     *
-@@ -915,7 +1024,7 @@ export var PlacesUIUtils = {
-     aNode,
-     aWhere,
-     aWindow,
--    { aPrivate = false, userContextId = 0 } = {}
-+    { aPrivate = false, userContextId = undefined } = {}
-   ) {
-     if (
-       aNode &&
diff --git a/src/browser/components/preferences/main-js.patch b/src/browser/components/preferences/main-js.patch
index e5053ab79..8e57adb8c 100644
--- a/src/browser/components/preferences/main-js.patch
+++ b/src/browser/components/preferences/main-js.patch
@@ -1,10 +1,10 @@
 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
-index c86e54bb6f5e00d9d7bdd81154857a5be97f909c..4035f6a667a361ad106e816a172342724a770435 100644
+index fcbd421c99b24e53e46131a1e21ec690814cbf4f..fe3778a57aaeebc53f7f6763ea234cbb41816186 100644
 --- a/browser/components/preferences/main.js
 +++ b/browser/components/preferences/main.js
-@@ -643,6 +643,11 @@ function createStartupConfig(hidden = false) {
-         id: "browserRestoreSession",
-         l10nId: "startup-restore-windows-and-tabs",
+@@ -662,6 +662,11 @@ function createStartupConfig(hidden = false) {
+           },
+         ],
        },
 +      {
 +        id: "zenWorkspaceContinueWhereLeftOff",
@@ -14,7 +14,7 @@ index c86e54bb6f5e00d9d7bdd81154857a5be97f909c..4035f6a667a361ad106e816a17234272
        {
          id: "windowsLaunchOnLogin",
          l10nId: "windows-launch-on-login",
-@@ -690,7 +695,7 @@ function createStartupConfig(hidden = false) {
+@@ -709,7 +714,7 @@ function createStartupConfig(hidden = false) {
  SettingGroupManager.registerGroups({
    defaultBrowser: createDefaultBrowserConfig(),
    startup: createStartupConfig(
@@ -23,7 +23,7 @@ index c86e54bb6f5e00d9d7bdd81154857a5be97f909c..4035f6a667a361ad106e816a17234272
    ),
  });
  
-@@ -743,7 +748,7 @@ function getBundleForLocales(newLocales) {
+@@ -762,7 +767,7 @@ function getBundleForLocales(newLocales) {
      ])
    );
    return new Localization(
diff --git a/src/browser/components/preferences/preferences-js.patch b/src/browser/components/preferences/preferences-js.patch
index 4aa64e88f..918e727ef 100644
--- a/src/browser/components/preferences/preferences-js.patch
+++ b/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 57add34d876fb885275f1147209c6fbeee367a7c..be0ab43b299317c0022a5e719f47a070c1574714 100644
+index c76a0647e14bac806d9428483bb565b3e10c31e7..2188f7808aca090f92574c7f5c55a28a9c5bb3f8 100644
 --- a/browser/components/preferences/preferences.js
 +++ b/browser/components/preferences/preferences.js
-@@ -132,6 +132,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () {
+@@ -131,6 +131,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () {
        styleSheets: [
          "chrome://browser/skin/preferences/dialog.css",
          "chrome://browser/skin/preferences/preferences.css",
@@ -10,7 +10,7 @@ index 57add34d876fb885275f1147209c6fbeee367a7c..be0ab43b299317c0022a5e719f47a070
        ],
        resizeCallback: async ({ title, frame }) => {
          // Search within main document and highlight matched keyword.
-@@ -437,6 +437,8 @@ const CONFIG_PANES = Object.freeze({
+@@ -437,6 +438,8 @@ const CONFIG_PANES = Object.freeze({
    tabsBrowsing: {
      l10nId: "tabs-browsing-section",
      groupIds: [
@@ -19,7 +19,7 @@ index 57add34d876fb885275f1147209c6fbeee367a7c..be0ab43b299317c0022a5e719f47a070
        "browserLayout",
        "tabs",
        "pageNavigation",
-@@ -477,7 +480,7 @@ function register_module(categoryName, categoryObject) {
+@@ -483,7 +486,7 @@ function register_module(categoryName, categoryObject) {
        }
        this._initted = true;
        let template = document.getElementById("template-" + categoryName);
@@ -28,10 +28,10 @@ index 57add34d876fb885275f1147209c6fbeee367a7c..be0ab43b299317c0022a5e719f47a070
          // Replace the template element with the nodes inside of it.
          template.replaceWith(template.content);
  
-@@ -522,6 +525,10 @@ function init_all() {
+@@ -527,6 +530,10 @@ function init_all() {
+   register_module("paneHome", gHomePane);
    register_module("paneSearch", gSearchPane);
    register_module("panePrivacy", gPrivacyPane);
-   register_module("paneContainers", gContainersPane);
 +  register_module("paneZenLooks", gZenLooksAndFeel);
 +  register_module("paneZenTabManagement", gZenWorkspacesSettings);
 +  register_module("paneZenCKS", gZenCKSSettings);
@@ -39,7 +39,7 @@ index 57add34d876fb885275f1147209c6fbeee367a7c..be0ab43b299317c0022a5e719f47a070
  
    // Restore the cached Firefox Labs nav button visibility so it shows
    // immediately when recipes are expected to be available, before
-@@ -651,9 +658,9 @@ async function gotoPref(
+@@ -656,9 +663,9 @@ async function gotoPref(
    let redesignEnabled = srdSectionPrefs.all;
    let categories = document.getElementById("categories");
    const kDefaultCategoryInternalName = redesignEnabled
diff --git a/src/browser/components/preferences/preferences-xhtml.patch b/src/browser/components/preferences/preferences-xhtml.patch
index dccd50ec5..2c2c134fb 100644
--- a/src/browser/components/preferences/preferences-xhtml.patch
+++ b/src/browser/components/preferences/preferences-xhtml.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
-index 9760a4a35b0b3bd21edec07a70c10bccc23e4a09..9f22146c259ea5b45005be660bfcb9ea2c1297ee 100644
+index 1b8c38159314b6edee9e6f455beb2b63db1ad3f0..1308345db640dba6b2848b49ef7c11819f9f5727 100644
 --- a/browser/components/preferences/preferences.xhtml
 +++ b/browser/components/preferences/preferences.xhtml
-@@ -42,6 +42,8 @@
+@@ -39,6 +39,8 @@
    <link rel="stylesheet" href="chrome://browser/content/preferences/widgets/setting-pane.css" />
    <link rel="stylesheet" href="chrome://browser/content/preferences/widgets/setting-control.css" />
  
@@ -11,7 +11,7 @@ index 9760a4a35b0b3bd21edec07a70c10bccc23e4a09..9f22146c259ea5b45005be660bfcb9ea
    <link rel="localization" href="branding/brand.ftl"/>
    <link rel="localization" href="browser/browser.ftl"/>
      <!-- Used by fontbuilder.js -->
-@@ -121,6 +123,26 @@
+@@ -118,6 +120,26 @@
          iconsrc="chrome://browser/skin/preferences/category-general.svg"
          data-l10n-id="pane-general-title">
        </html:moz-page-nav-button>
@@ -38,8 +38,8 @@ index 9760a4a35b0b3bd21edec07a70c10bccc23e4a09..9f22146c259ea5b45005be660bfcb9ea
        <html:moz-page-nav-button id="category-sync"
          hidden="true"
          view="paneSync"
-@@ -253,6 +275,10 @@
- #include containers.inc.xhtml
+@@ -248,6 +270,10 @@
+ #include privacy.inc.xhtml
  #include sync.inc.xhtml
  #include moreFromMozilla.inc.xhtml
 +#include zenLooksAndFeel.inc.xhtml
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index a696d2299..92fa6a69f 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b79604f6d 100644
+index c42b1a1a8df6b38886c17f71ea88e5aaa7eebc80..c741404ed973ee3ac246fe246c0f645eb49d12e9 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -511,6 +511,7 @@
+@@ -509,6 +509,7 @@
       * @type {MozBrowser[]}
       */
      get splitViewBrowsers() {
@@ -10,7 +10,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        const browsers = [];
        if (this.#activeSplitView) {
          for (const tab of this.#activeSplitView.tabs) {
-@@ -584,15 +585,66 @@
+@@ -578,15 +579,66 @@
        return this.tabContainer.visibleTabs;
      }
  
@@ -79,7 +79,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
      set selectedTab(val) {
        if (
          gSharedTabWarning.willShowSharedTabWarning(val) ||
-@@ -601,6 +653,9 @@
+@@ -595,6 +647,9 @@
        ) {
          return;
        }
@@ -89,7 +89,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        // Update the tab
        this.tabbox.selectedTab = val;
      }
-@@ -668,6 +723,10 @@
+@@ -662,6 +717,10 @@
          userContextId = parseInt(tabArgument.getAttribute("usercontextid"), 10);
        }
  
@@ -97,10 +97,10 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
 +        userContextId = window._zenStartupUnsyncedUserContextId;
 +      }
 +
-       if (tabArgument && tabArgument.linkedBrowser) {
-         remoteType = tabArgument.linkedBrowser.remoteType;
-         initialBrowsingContextGroupId =
-@@ -760,6 +819,8 @@
+       if (openWindowInfo) {
+         userContextId = openWindowInfo.originAttributes.userContextId;
+       }
+@@ -763,6 +822,8 @@
        this.tabpanels.appendChild(panel);
  
        let tab = this.tabs[0];
@@ -109,7 +109,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        tab.linkedPanel = uniqueId;
        this._selectedTab = tab;
        this._selectedBrowser = browser;
-@@ -1126,18 +1187,24 @@
+@@ -1129,18 +1190,24 @@
        aTab,
        { telemetrySource = this.TabMetrics.METRIC_SOURCE.UNKNOWN } = {}
      ) {
@@ -135,7 +135,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
  
        aTab.setAttribute("pinned", "true");
        this._updateTabBarForPinnedTabs();
-@@ -1145,16 +1212,25 @@
+@@ -1148,16 +1215,25 @@
      }
  
      unpinTab(aTab) {
@@ -162,7 +162,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        });
  
        aTab.style.marginInlineStart = "";
-@@ -1369,6 +1445,9 @@
+@@ -1372,6 +1448,9 @@
  
        let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
  
@@ -172,7 +172,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        if (
          aIconURL &&
          !LOCAL_PROTOCOLS.some(protocol => aIconURL.startsWith(protocol))
-@@ -1378,6 +1457,9 @@
+@@ -1381,6 +1460,9 @@
          );
          return;
        }
@@ -182,23 +182,23 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
  
        let browser = this.getBrowserForTab(aTab);
        browser.mIconURL = aIconURL;
-@@ -1700,7 +1782,6 @@
+@@ -1703,7 +1785,6 @@
  
        // Preview mode should not reset the owner
-       if (!this._previewMode && !oldTab.selected) {
+       if (!this.#previewMode && !oldTab.selected) {
 -        oldTab.owner = null;
        }
  
-       let lastRelatedTab = this._lastRelatedTabMap.get(oldTab);
-@@ -1791,6 +1872,7 @@
-       if (!this._previewMode) {
+       let lastRelatedTab = this.#lastRelatedTabMap.get(oldTab);
+@@ -1794,6 +1875,7 @@
+       if (!this.#previewMode) {
          newTab.recordTimeFromUnloadToReload();
          newTab.updateLastAccessed();
 +        newTab.removeAttribute("unread");
          oldTab.updateLastAccessed();
          // if this is the foreground window, update the last-seen timestamps.
          if (this.documentGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -2005,6 +2087,9 @@
+@@ -2008,6 +2090,9 @@
        }
  
        let activeEl = document.activeElement;
@@ -208,7 +208,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        // If focus is on the old tab, move it to the new tab.
        if (activeEl == oldTab) {
          newTab.focus();
-@@ -2043,7 +2128,7 @@
+@@ -2046,7 +2131,7 @@
        // Focus the location bar if it was previously focused for that tab.
        // In full screen mode, only bother making the location bar visible
        // if the tab is a blank one.
@@ -217,7 +217,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
          let selectURL = () => {
            if (this._asyncTabSwitching) {
              // Set _awaitingSetURI flag to suppress popup notification
-@@ -2331,7 +2416,12 @@
+@@ -2334,7 +2419,12 @@
        return this._setTabLabel(aTab, aLabel);
      }
  
@@ -231,7 +231,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        if (!aLabel || (isURL && /^about:reader\?url=/.test(aLabel))) {
          return false;
        }
-@@ -2457,7 +2547,7 @@
+@@ -2460,7 +2550,7 @@
          newIndex = this.selectedTab._tPos + 1;
        }
  
@@ -240,7 +240,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
          if (this.isTabGroupLabel(targetTab)) {
            throw new Error(
              "Replacing a tab group label with a tab is not supported"
-@@ -2737,6 +2827,7 @@
+@@ -2735,6 +2825,7 @@
        uriIsAboutBlank,
        userContextId,
        skipLoad,
@@ -248,7 +248,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
      } = {}) {
        let b = document.createXULElement("browser");
        // Use the JSM global to create the permanentKey, so that if the
-@@ -2810,8 +2901,7 @@
+@@ -2808,8 +2899,7 @@
          // we use a different attribute name for this?
          b.setAttribute("name", name);
        }
@@ -258,7 +258,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
          b.setAttribute("transparent", "true");
        }
  
-@@ -2981,7 +3071,7 @@
+@@ -2964,7 +3054,7 @@
  
        let panel = this.getPanel(browser);
        let uniqueId = this._generateUniquePanelID();
@@ -267,7 +267,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        aTab.linkedPanel = uniqueId;
  
        // Inject the <browser> into the DOM if necessary.
-@@ -3041,8 +3131,8 @@
+@@ -3024,8 +3114,8 @@
        // If we transitioned from one browser to two browsers, we need to set
        // hasSiblings=false on both the existing browser and the new browser.
        if (this.tabs.length == 2) {
@@ -278,7 +278,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        } else {
          aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
        }
-@@ -3227,7 +3317,6 @@
+@@ -3210,7 +3300,6 @@
              this.selectedTab = this.addTrustedTab(BROWSER_NEW_TAB_URL, {
                tabIndex: tab._tPos + 1,
                userContextId: tab.userContextId,
@@ -286,7 +286,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
                focusUrlBar: true,
              });
              resolve(this.selectedBrowser);
-@@ -3337,6 +3426,10 @@
+@@ -3320,6 +3409,10 @@
          schemelessInput,
          hasValidUserGestureActivation = false,
          textDirectiveUserActivation = false,
@@ -297,7 +297,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        } = {}
      ) {
        // all callers of addTab that pass a params object need to pass
-@@ -3347,10 +3440,25 @@
+@@ -3330,10 +3423,25 @@
          );
        }
  
@@ -323,7 +323,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        // If we're opening a foreground tab, set the owner by default.
        ownerTab ??= inBackground ? null : this.selectedTab;
  
-@@ -3358,6 +3466,7 @@
+@@ -3341,6 +3449,7 @@
        if (this.selectedTab.owner) {
          this.selectedTab.owner = null;
        }
@@ -331,7 +331,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
  
        // Find the tab that opened this one, if any. This is used for
        // determining positioning, and inherited attributes such as the
-@@ -3410,6 +3519,22 @@
+@@ -3393,6 +3502,22 @@
            noInitialLabel,
            skipBackgroundNotify,
          });
@@ -354,7 +354,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
          if (insertTab) {
            // Insert the tab into the tab container in the correct position.
            this.#insertTabAtIndex(t, {
-@@ -3418,6 +3543,7 @@
+@@ -3401,6 +3526,7 @@
              ownerTab,
              openerTab,
              pinned,
@@ -362,7 +362,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
              bulkOrderedOpen,
              tabGroup: tabGroup ?? openerTab?.group,
            });
-@@ -3436,6 +3562,7 @@
+@@ -3419,6 +3545,7 @@
            openWindowInfo,
            skipLoad,
            triggeringRemoteType,
@@ -370,7 +370,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
          }));
  
          if (focusUrlBar) {
-@@ -3560,6 +3687,12 @@
+@@ -3543,6 +3670,12 @@
          }
        }
  
@@ -383,7 +383,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        // Additionally send pinned tab events
        if (pinned) {
          this.#notifyPinnedStatus(t);
-@@ -3570,6 +3703,15 @@
+@@ -3553,6 +3686,15 @@
        if (!inBackground) {
          this.selectedTab = t;
        }
@@ -399,7 +399,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        return t;
      }
  
-@@ -3802,6 +3944,7 @@
+@@ -3785,6 +3927,7 @@
          isAdoptingGroup = false,
          isUserTriggered = false,
          telemetryUserCreateSource = "unknown",
@@ -407,7 +407,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        } = {}
      ) {
        if (
-@@ -3812,9 +3955,6 @@
+@@ -3795,9 +3938,6 @@
              !this.isSplitViewWrapper(tabOrSplitView)
          )
        ) {
@@ -417,7 +417,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        }
  
        if (!color) {
-@@ -3835,9 +3975,14 @@
+@@ -3818,9 +3958,14 @@
          label,
          isAdoptingGroup
        );
@@ -434,7 +434,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        );
        group.addTabs(tabsAndSplitViews);
  
-@@ -3958,7 +4103,7 @@
+@@ -3941,7 +4086,7 @@
        }
  
        this.#handleTabMove(tab, () =>
@@ -443,7 +443,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        );
      }
  
-@@ -4044,6 +4189,7 @@
+@@ -4027,6 +4172,7 @@
          color: group.color,
          insertBefore: newTabs[0],
          isAdoptingGroup: true,
@@ -451,7 +451,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        });
      }
  
-@@ -4254,6 +4400,7 @@
+@@ -4237,6 +4383,7 @@
          openWindowInfo,
          skipLoad,
          triggeringRemoteType,
@@ -459,7 +459,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        }
      ) {
        // If we don't have a preferred remote type (or it is `NOT_REMOTE`), and
-@@ -4323,6 +4470,7 @@
+@@ -4297,6 +4444,7 @@
            openWindowInfo,
            name,
            skipLoad,
@@ -467,7 +467,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
          });
        }
  
-@@ -4536,9 +4684,9 @@
+@@ -4510,9 +4658,9 @@
          }
  
          // Add a new tab if needed.
@@ -479,7 +479,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
  
            let url = "about:blank";
            if (tabData.entries?.length) {
-@@ -4575,8 +4723,10 @@
+@@ -4545,8 +4693,10 @@
              insertTab: false,
              skipLoad: true,
              preferredRemoteType,
@@ -491,7 +491,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
            if (select) {
              tabToSelect = tab;
            }
-@@ -4598,7 +4748,8 @@
+@@ -4568,7 +4718,8 @@
            this.pinTab(tab);
            // Then ensure all the tab open/pinning information is sent.
            this._fireTabOpen(tab, {});
@@ -501,7 +501,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
            let { groupId } = tabData;
            const tabGroup = tabGroupWorkingData.get(groupId);
            // if a tab refers to a tab group we don't know, skip any group
-@@ -4618,7 +4769,10 @@
+@@ -4588,7 +4739,10 @@
                  tabGroup.stateData.id,
                  tabGroup.stateData.color,
                  tabGroup.stateData.collapsed,
@@ -513,7 +513,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
                );
                tabsFragment.appendChild(tabGroup.node);
              }
-@@ -4673,9 +4827,21 @@
+@@ -4643,9 +4797,21 @@
        // to remove the old selected tab.
        if (tabToSelect) {
          let leftoverTab = this.selectedTab;
@@ -535,7 +535,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
  
        if (tabs.length > 1 || !tabs[0].selected) {
          this._updateTabsAfterInsert();
-@@ -4866,11 +5032,17 @@
+@@ -4836,11 +5002,17 @@
        if (ownerTab) {
          tab.owner = ownerTab;
        }
@@ -554,16 +554,16 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -4882,7 +5054,7 @@
+@@ -4852,7 +5024,7 @@
            let lastRelatedTab =
-             openerTab && this._lastRelatedTabMap.get(openerTab);
+             openerTab && this.#lastRelatedTabMap.get(openerTab);
            let previousTab = lastRelatedTab || openerTab || this.selectedTab;
 -          if (!tabGroup) {
 +          if (!tabGroup && pinned === previousTab.group?.pinned) {
              tabGroup = previousTab.group;
            }
            if (
-@@ -4898,7 +5070,7 @@
+@@ -4868,7 +5040,7 @@
                  previousTab.splitview
                ) + 1;
            } else if (previousTab.visible) {
@@ -572,7 +572,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
            } else if (previousTab == FirefoxViewHandler.tab) {
              elementIndex = 0;
            }
-@@ -4926,14 +5098,14 @@
+@@ -4896,14 +5068,14 @@
        }
        // Ensure index is within bounds.
        if (tab.pinned) {
@@ -591,7 +591,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
  
        if (pinned && !itemAfter?.pinned) {
          itemAfter = null;
-@@ -4950,7 +5122,7 @@
+@@ -4920,7 +5092,7 @@
  
        this.tabContainer._invalidateCachedTabs();
  
@@ -600,7 +600,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
          if (
            (this.isTab(itemAfter) && itemAfter.group == tabGroup) ||
            this.isSplitViewWrapper(itemAfter)
-@@ -4981,7 +5153,11 @@
+@@ -4951,7 +5123,11 @@
          const tabContainer = pinned
            ? this.tabContainer.pinnedTabsContainer
            : this.tabContainer;
@@ -612,7 +612,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        }
  
        if (tab.group?.collapsed) {
-@@ -4996,6 +5172,7 @@
+@@ -4966,6 +5142,7 @@
        if (pinned) {
          this._updateTabBarForPinnedTabs();
        }
@@ -620,7 +620,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
  
        TabBarVisibility.update();
      }
-@@ -5544,6 +5721,7 @@
+@@ -5514,6 +5691,7 @@
          telemetrySource,
        } = {}
      ) {
@@ -628,7 +628,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        // When 'closeWindowWithLastTab' pref is enabled, closing all tabs
        // can be considered equivalent to closing the window.
        if (
-@@ -5633,6 +5811,7 @@
+@@ -5603,6 +5781,7 @@
          if (lastToClose) {
            this.removeTab(lastToClose, aParams);
          }
@@ -636,7 +636,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        } catch (e) {
          console.error(e);
        }
-@@ -5678,6 +5857,14 @@
+@@ -5648,6 +5827,14 @@
          return;
        }
  
@@ -651,7 +651,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        let isVisibleTab = aTab.visible;
        // We have to sample the tab width now, since _beginRemoveTab might
        // end up modifying the DOM in such a way that aTab gets a new
-@@ -5685,6 +5872,9 @@
+@@ -5655,6 +5842,9 @@
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
        let isLastTab = this.#isLastTabInWindow(aTab);
@@ -661,7 +661,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -5696,13 +5886,14 @@
+@@ -5666,13 +5856,14 @@
            telemetrySource,
          })
        ) {
@@ -677,7 +677,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        let lockTabSizing =
          !this.tabContainer.verticalMode &&
          !aTab.pinned &&
-@@ -5733,7 +5924,13 @@
+@@ -5703,7 +5894,13 @@
          // We're not animating, so we can cancel the animation stopwatch.
          Glean.browserTabclose.timeAnim.cancel(aTab._closeTimeAnimTimerId);
          aTab._closeTimeAnimTimerId = null;
@@ -692,7 +692,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
          return;
        }
  
-@@ -5776,7 +5973,7 @@
+@@ -5746,7 +5943,7 @@
       */
      #isLastTabInWindow(tab) {
        for (const otherTab of this.tabs) {
@@ -701,7 +701,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
            return false;
          }
        }
-@@ -5867,7 +6064,7 @@
+@@ -5837,7 +6034,7 @@
            closeWindowWithLastTab != null
              ? closeWindowWithLastTab
              : !window.toolbar.visible ||
@@ -710,7 +710,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5891,6 +6088,7 @@
+@@ -5861,6 +6058,7 @@
  
          newTab = true;
        }
@@ -718,7 +718,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        aTab._endRemoveArgs = [closeWindow, newTab];
  
        // swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -5931,13 +6129,7 @@
+@@ -5901,13 +6099,7 @@
        aTab._mouseleave();
  
        if (newTab) {
@@ -733,15 +733,15 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        } else {
          TabBarVisibility.update();
        }
-@@ -6070,6 +6262,7 @@
+@@ -6040,6 +6232,7 @@
          this.tabs[i]._tPos = i;
        }
  
 +      gZenWorkspaces.updateTabsContainers();
-       if (!this._windowIsClosing) {
+       if (!this.#windowIsClosing) {
          // update tab close buttons state
          this.tabContainer._updateCloseButtons();
-@@ -6255,6 +6448,7 @@
+@@ -6225,6 +6418,7 @@
          memory_after: await getTotalMemoryUsage(),
          time_to_unload_in_ms: timeElapsed,
        });
@@ -749,7 +749,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
      }
  
      /**
-@@ -6300,6 +6494,7 @@
+@@ -6270,6 +6464,7 @@
        }
  
        let excludeTabs = new Set(aExcludeTabs);
@@ -757,7 +757,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
  
        // If this tab has a successor, it should be selectable, since
        // hiding or closing a tab removes that tab as a successor.
-@@ -6312,15 +6507,22 @@
+@@ -6282,15 +6477,22 @@
          !excludeTabs.has(aTab.owner) &&
          Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
        ) {
@@ -782,7 +782,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        let tab = this.tabContainer.findNextTab(aTab, {
          direction: 1,
          filter: _tab => remainingTabs.includes(_tab),
-@@ -6334,7 +6536,7 @@
+@@ -6304,7 +6506,7 @@
        }
  
        if (tab) {
@@ -791,7 +791,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        }
  
        // If no qualifying visible tab was found, see if there is a tab in
-@@ -6355,7 +6557,7 @@
+@@ -6325,7 +6527,7 @@
          });
        }
  
@@ -800,7 +800,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
      }
  
      _blurTab(aTab) {
-@@ -6366,7 +6568,7 @@
+@@ -6336,7 +6538,7 @@
       * @returns {boolean}
       *   False if swapping isn't permitted, true otherwise.
       */
@@ -809,7 +809,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        // Do not allow transfering a private tab to a non-private window
        // and vice versa.
        if (
-@@ -6420,6 +6622,7 @@
+@@ -6390,6 +6592,7 @@
        // fire the beforeunload event in the process.  Close the other
        // window if this was its last tab.
        if (
@@ -817,7 +817,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
          !remoteBrowser._beginRemoveTab(aOtherTab, {
            adoptedByTab: aOurTab,
            closeWindowWithLastTab: true,
-@@ -6431,7 +6634,7 @@
+@@ -6401,7 +6604,7 @@
        // If this is the last tab of the window, hide the window
        // immediately without animation before the docshell swap, to avoid
        // about:blank being painted.
@@ -826,7 +826,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        if (closeWindow) {
          let win = aOtherTab.documentGlobal;
          win.windowUtils.suppressAnimation(true);
-@@ -6565,11 +6768,13 @@
+@@ -6535,11 +6738,13 @@
        }
  
        // Finish tearing down the tab that's going away.
@@ -840,7 +840,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
  
        this.setTabTitle(aOurTab);
  
-@@ -6771,10 +6976,10 @@
+@@ -6759,10 +6964,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -853,7 +853,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -6834,7 +7039,8 @@
+@@ -6822,7 +7027,8 @@
       * @param {object} [aOptions={}]
       *   Key-value pairs that will be serialized into the features string.
       */
@@ -863,7 +863,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        if (this.tabs.length == 1) {
          return null;
        }
-@@ -6851,7 +7057,7 @@
+@@ -6839,7 +7045,7 @@
        // tell a new window to take the "dropped" tab
        let args = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
        args.appendElement(aTab.splitview ?? aTab);
@@ -872,7 +872,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
          private: PrivateBrowsingUtils.isWindowPrivate(window),
          features: Object.entries(aOptions)
            .map(([key, value]) => `${key}=${value}`)
-@@ -6859,6 +7065,8 @@
+@@ -6847,6 +7053,8 @@
          openerWindow: window,
          args,
        });
@@ -881,7 +881,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
      }
  
      /**
-@@ -6971,7 +7179,7 @@
+@@ -6959,7 +7167,7 @@
       *   `true` if element is a `<tab-group>`
       */
      isTabGroup(element) {
@@ -890,7 +890,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
      }
  
      /**
-@@ -7056,8 +7264,8 @@
+@@ -7044,8 +7252,8 @@
        }
  
        // Don't allow mixing pinned and unpinned tabs.
@@ -901,7 +901,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        } else {
          tabIndex = Math.max(tabIndex, this.pinnedTabCount);
        }
-@@ -7103,8 +7311,8 @@
+@@ -7091,8 +7299,8 @@
        this.#handleTabMove(
          element,
          () => {
@@ -912,7 +912,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
              neighbor = neighbor.group;
            }
            if (neighbor?.splitview) {
-@@ -7115,6 +7323,12 @@
+@@ -7103,6 +7311,12 @@
                return;
              }
            }
@@ -925,7 +925,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
  
            if (movingForwards && neighbor) {
              neighbor.after(element);
-@@ -7173,23 +7387,31 @@
+@@ -7161,23 +7375,31 @@
      #moveTabNextTo(element, targetElement, moveBefore = false, metricsContext) {
        if (this.isTabGroupLabel(targetElement)) {
          targetElement = targetElement.group;
@@ -963,7 +963,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        } else if (!element.pinned && targetElement && targetElement.pinned) {
          // If the caller asks to move an unpinned element next to a pinned
          // tab, move the unpinned element to be the first unpinned element
-@@ -7202,12 +7424,35 @@
+@@ -7190,12 +7412,35 @@
          //    move the tab group right before the first unpinned tab.
          // 4. Moving a tab group and the first unpinned tab is grouped:
          //    move the tab group right before the first unpinned tab's tab group.
@@ -1000,7 +1000,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
  
        // We want to include the splitview wrapper if it's the targetElement, but
        // not in the case where we want to reverse tabs within the same splitview.
-@@ -7216,6 +7461,7 @@
+@@ -7204,6 +7449,7 @@
        }
  
        let getContainer = () =>
@@ -1008,7 +1008,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
          element.pinned
            ? this.tabContainer.pinnedTabsContainer
            : this.tabContainer;
-@@ -7224,11 +7470,15 @@
+@@ -7212,11 +7458,15 @@
          element,
          () => {
            if (moveBefore) {
@@ -1025,7 +1025,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
            }
          },
          metricsContext
-@@ -7302,11 +7552,15 @@
+@@ -7290,11 +7540,15 @@
       * @param {TabMetricsContext} [metricsContext]
       */
      moveTabToExistingGroup(aTab, aGroup, metricsContext) {
@@ -1044,7 +1044,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        }
        if (aTab.group && aTab.group.id === aGroup.id) {
          return;
-@@ -7378,6 +7632,7 @@
+@@ -7366,6 +7620,7 @@
  
        let state = {
          tabIndex: tab._tPos,
@@ -1052,7 +1052,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        };
        if (tab.visible) {
          state.elementIndex = tab.elementIndex;
-@@ -7409,7 +7664,7 @@
+@@ -7397,7 +7652,7 @@
        let changedSplitView =
          previousTabState.splitViewId != currentTabState.splitViewId;
  
@@ -1061,7 +1061,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
          tab.dispatchEvent(
            new CustomEvent("TabMove", {
              bubbles: true,
-@@ -7456,6 +7711,10 @@
+@@ -7444,6 +7699,10 @@
  
        moveActionCallback();
  
@@ -1072,7 +1072,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        // Clear tabs cache after moving nodes because the order of tabs may have
        // changed.
        this.tabContainer._invalidateCachedTabs();
-@@ -7506,7 +7765,22 @@
+@@ -7494,7 +7753,22 @@
       * @returns {object}
       *    The new tab in the current window, null if the tab couldn't be adopted.
       */
@@ -1096,7 +1096,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        // Swap the dropped tab with a new one we create and then close
        // it in the other window (making it seem to have moved between
        // windows). We also ensure that the tab we create to swap into has
-@@ -7549,6 +7823,8 @@
+@@ -7537,6 +7811,8 @@
        }
        params.skipLoad = true;
        let newTab = this.addWebTab("about:blank", params);
@@ -1105,7 +1105,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
  
        aTab.container.tabDragAndDrop.finishAnimateTabMove();
  
-@@ -8259,7 +8535,7 @@
+@@ -8247,7 +8523,7 @@
          // preventDefault(). It will still raise the window if appropriate.
          return;
        }
@@ -1114,7 +1114,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        window.focus();
        aEvent.preventDefault();
      }
-@@ -8276,7 +8552,6 @@
+@@ -8264,7 +8540,6 @@
  
      on_TabGroupCollapse(aEvent) {
        aEvent.target.tabs.forEach(tab => {
@@ -1122,38 +1122,38 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
        });
      }
  
-@@ -8630,7 +8905,9 @@
+@@ -8618,7 +8893,9 @@
  
-         let filter = this._tabFilters.get(tab);
+         let filter = this.#tabFilters.get(tab);
          if (filter) {
 +          try {
            browser.webProgress.removeProgressListener(filter);
 +          } catch {}
  
-           let listener = this._tabListeners.get(tab);
+           let listener = this.#tabListeners.get(tab);
            if (listener) {
-@@ -9435,6 +9712,7 @@
+@@ -9423,6 +9700,7 @@
              aWebProgress.isTopLevel
            ) {
-             this.mTab.setAttribute("busy", "true");
-+            if (!this.mTab.selected) this.mTab.setAttribute("unread", "true");
-             gBrowser._tabAttrModified(this.mTab, ["busy"]);
-             this.mTab._notselectedsinceload = !this.mTab.selected;
+             this._tab.setAttribute("busy", "true");
++            if (!this._tab.selected) this._tab.setAttribute("unread", "true");
+             gBrowser._tabAttrModified(this._tab, ["busy"]);
+             this._tab._notselectedsinceload = !this._tab.selected;
            }
-@@ -9515,6 +9793,7 @@
+@@ -9503,6 +9781,7 @@
          // known defaults. Note we use the original URL since about:newtab
          // redirects to a prerendered page.
          const shouldRemoveFavicon =
-+          !this.mTab.zenStaticIcon &&
-           !this.mBrowser.mIconURL &&
++          !this._tab.zenStaticIcon &&
+           !this._browser.mIconURL &&
            !ignoreBlank &&
            !(originalLocation.spec in FAVICON_DEFAULTS);
-@@ -9689,13 +9968,6 @@
-             this.mBrowser.originalURI = aRequest.originalURI;
+@@ -9677,13 +9956,6 @@
+             this._browser.originalURI = aRequest.originalURI;
            }
  
 -          if (!gBrowser._allowTransparentBrowser) {
--            this.mBrowser.toggleAttribute(
+-            this._browser.toggleAttribute(
 -              "transparent",
 -              AIWindow.isAIWindowActive(window) &&
 -                AIWindow.isAIWindowContentPage(aLocation)
@@ -1161,8 +1161,8 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..515035c4c65e96982473605a150e4b0b
 -          }
          }
  
-         let userContextId = this.mBrowser.getAttribute("usercontextid") || 0;
-@@ -10587,7 +10859,8 @@ var TabContextMenu = {
+         let userContextId = this._browser.getAttribute("usercontextid") || 0;
+@@ -10532,7 +10804,8 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !this.multiselected;
diff --git a/src/browser/components/urlbar/UrlbarProvidersManager-sys-mjs.patch b/src/browser/components/urlbar/UrlbarProvidersManager-sys-mjs.patch
index 83a3c92b0..d2f40925c 100644
--- a/src/browser/components/urlbar/UrlbarProvidersManager-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarProvidersManager-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarProvidersManager.sys.mjs b/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
-index 8de151f473ac6b95bc606251f78a4bede093ee0c..dbd302259c54b0196a370b9ff12ba0dcf1545272 100644
+index d2e2415e6b7c8833617dd1d4d01b16b110afbfa5..4a1e6e0940789b55144afd0566ecb91d88f7d590 100644
 --- a/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
 +++ b/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
-@@ -913,6 +913,7 @@ export class Query {
+@@ -914,6 +914,7 @@ export class Query {
      if (
        result.heuristic &&
        this.context.searchMode &&
@@ -10,21 +10,21 @@ index 8de151f473ac6b95bc606251f78a4bede093ee0c..dbd302259c54b0196a370b9ff12ba0dc
        (!this.context.trimmedSearchString ||
          (!this.context.searchMode.engineName && !result.autofill))
      ) {
-@@ -1043,6 +1044,7 @@ function updateSourcesIfEmpty(context) {
-             lazy.UrlbarTokenizer.TYPE.RESTRICT_TITLE,
-             lazy.UrlbarTokenizer.TYPE.RESTRICT_URL,
-             lazy.UrlbarTokenizer.TYPE.RESTRICT_ACTION,
-+            lazy.UrlbarTokenizer.TYPE.RESTRICT_WORKSPACE,
+@@ -1044,6 +1045,7 @@ function updateSourcesIfEmpty(context) {
+             lazy.UrlbarShared.TOKEN_TYPE.RESTRICT_TITLE,
+             lazy.UrlbarShared.TOKEN_TYPE.RESTRICT_URL,
+             lazy.UrlbarShared.TOKEN_TYPE.RESTRICT_ACTION,
++            lazy.UrlbarShared.TOKEN_TYPE.RESTRICT_WORKSPACE,
            ].includes(t.type)
          );
  
-@@ -1100,6 +1102,14 @@ function updateSourcesIfEmpty(context) {
+@@ -1103,6 +1105,14 @@ function updateSourcesIfEmpty(context) {
            acceptedSources.push(source);
          }
          break;
 +      case lazy.UrlbarUtils.RESULT_SOURCE.WORKSPACES:
 +        if (
-+          restrictTokenType === lazy.UrlbarTokenizer.TYPE.RESTRICT_WORKSPACE ||
++          restrictTokenType === lazy.UrlbarShared.TOKEN_TYPE.RESTRICT_WORKSPACE ||
 +          !restrictTokenType
 +        ) {
 +          acceptedSources.push(source);
diff --git a/src/browser/components/urlbar/UrlbarResult-sys-mjs.patch b/src/browser/components/urlbar/UrlbarResult-sys-mjs.patch
deleted file mode 100644
index 0b5a8b9b8..000000000
--- a/src/browser/components/urlbar/UrlbarResult-sys-mjs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/browser/components/urlbar/UrlbarResult.sys.mjs b/browser/components/urlbar/UrlbarResult.sys.mjs
-index 21f7938f76375e7230f9509e4932cafa4d0e57f2..ab96b160b6c65da3bf267d9fe2f1f35c7507466e 100644
---- a/browser/components/urlbar/UrlbarResult.sys.mjs
-+++ b/browser/components/urlbar/UrlbarResult.sys.mjs
-@@ -181,6 +181,10 @@ export class UrlbarResult {
-     return this.#heuristic;
-   }
- 
-+  set heuristic(value) {
-+    this.#heuristic = value;
-+  }
-+
-   get hideRowLabel() {
-     return this.#hideRowLabel;
-   }
diff --git a/src/browser/components/urlbar/UrlbarTokenizer-sys-mjs.patch b/src/browser/components/urlbar/UrlbarTokenizer-sys-mjs.patch
deleted file mode 100644
index c195ba7d9..000000000
--- a/src/browser/components/urlbar/UrlbarTokenizer-sys-mjs.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/browser/components/urlbar/UrlbarTokenizer.sys.mjs b/browser/components/urlbar/UrlbarTokenizer.sys.mjs
-index d4af0ee5138a69139b94d898fb07e2345172f025..f750aae3f9f0a849ca009784510575b2b7119e6d 100644
---- a/browser/components/urlbar/UrlbarTokenizer.sys.mjs
-+++ b/browser/components/urlbar/UrlbarTokenizer.sys.mjs
-@@ -66,6 +66,7 @@ export var UrlbarTokenizer = {
-     // `looksLikeOrigin()` returned `LOOKS_LIKE_ORIGIN.OTHER` for this token. It
-     // may or may not be an origin.
-     POSSIBLE_ORIGIN_BUT_SEARCH_ALLOWED: 12,
-+    RESTRICT_WORKSPACE: 13,
-   }),
- 
-   // The special characters below can be typed into the urlbar to restrict
-@@ -83,6 +84,7 @@ export var UrlbarTokenizer = {
-     TITLE: "#",
-     URL: "$",
-     ACTION: ">",
-+    WORKSPACE: "`",
-   }),
- 
-   // The keys of characters in RESTRICT that will enter search mode.
-@@ -97,6 +99,7 @@ export var UrlbarTokenizer = {
-     if (lazy.UrlbarPrefs.get("scotchBonnet.enableOverride")) {
-       keys.push(this.RESTRICT.ACTION);
-     }
-+    keys.push(this.RESTRICT.WORKSPACE);
-     return new Set(keys);
-   },
- 
diff --git a/src/browser/components/urlbar/UrlbarUtils-sys-mjs.patch b/src/browser/components/urlbar/UrlbarUtils-sys-mjs.patch
index 3b3dd4315..479b45005 100644
--- a/src/browser/components/urlbar/UrlbarUtils-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarUtils-sys-mjs.patch
@@ -26,7 +26,7 @@ index aa7c67f2bfaa3f15d592a14b527a8721dfc9bc6f..d2fe012796ea3a5be05090a732011b3c
        },
 +      {
 +        source: this.RESULT_SOURCE.WORKSPACES,
-+        restrict: lazy.UrlbarTokenizer.RESTRICT.WORKSPACE,
++        restrict: lazy.UrlbarShared.RESTRICT_TOKENS.WORKSPACE,
 +        icon: "chrome://browser/skin/zen-icons/selectable/layers.svg",
 +        pref: "shortcuts.workspaces",
 +        telemetryLabel: "workspaces",
diff --git a/src/browser/components/urlbar/UrlbarValueFormatter-sys-mjs.patch b/src/browser/components/urlbar/UrlbarValueFormatter-sys-mjs.patch
index 432482c51..07511ad10 100644
--- a/src/browser/components/urlbar/UrlbarValueFormatter-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarValueFormatter-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarValueFormatter.sys.mjs b/browser/components/urlbar/UrlbarValueFormatter.sys.mjs
-index 8def83509f097ba034b9d94ae00d2ee474ec2d30..ebdb84b9af928b132b848bd4c5bb506d813e5e06 100644
+index 7ccffa60be42ba5e554b0e91bc831c56c24dfb42..ca5d6f983490f6cfc392c92f3570a5fb1bb3c43d 100644
 --- a/browser/components/urlbar/UrlbarValueFormatter.sys.mjs
 +++ b/browser/components/urlbar/UrlbarValueFormatter.sys.mjs
 @@ -77,7 +77,7 @@ export class UrlbarValueFormatter {
@@ -11,7 +11,7 @@ index 8def83509f097ba034b9d94ae00d2ee474ec2d30..ebdb84b9af928b132b848bd4c5bb506d
      });
    }
  
-@@ -105,6 +105,18 @@ export class UrlbarValueFormatter {
+@@ -126,6 +126,18 @@ export class UrlbarValueFormatter {
    }
  
    #ensureFormattedHostVisible(urlMetaData) {
@@ -30,7 +30,7 @@ index 8def83509f097ba034b9d94ae00d2ee474ec2d30..ebdb84b9af928b132b848bd4c5bb506d
      // Make sure the host is always visible. Since it is aligned on
      // the first strong directional character, we set scrollLeft
      // appropriately to ensure the domain stays visible in case of an
-@@ -381,7 +393,7 @@ export class UrlbarValueFormatter {
+@@ -403,7 +415,7 @@ export class UrlbarValueFormatter {
     * @returns {boolean}
     *   True if formatting was applied and false if not.
     */
@@ -39,11 +39,15 @@ index 8def83509f097ba034b9d94ae00d2ee474ec2d30..ebdb84b9af928b132b848bd4c5bb506d
      let urlMetaData = this.#getUrlMetaData();
      if (!urlMetaData) {
        return false;
-@@ -650,6 +662,7 @@ export class UrlbarValueFormatter {
-       this.#window.requestAnimationFrame(() => {
-         if (instance == this.#resizeInstance) {
-           this.#ensureFormattedHostVisible();
-+          this._formatURL();
+@@ -688,9 +700,10 @@ export class UrlbarValueFormatter {
+           ) {
+             // The host range is no longer valid.
+             this.#removeURLFormat();
+-            this.#formatURL();
++            this._formatURL();
+           } else {
+             this.#ensureFormattedHostVisible();
++            this._formatURL();
+           }
          }
        });
-     }, 100);
diff --git a/src/browser/components/urlbar/content/UrlbarInput-mjs.patch b/src/browser/components/urlbar/content/UrlbarInput-mjs.patch
index 916c5d764..f4b47877d 100644
--- a/src/browser/components/urlbar/content/UrlbarInput-mjs.patch
+++ b/src/browser/components/urlbar/content/UrlbarInput-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/content/UrlbarInput.mjs b/browser/components/urlbar/content/UrlbarInput.mjs
-index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07ed57bd36 100644
+index 0b1b4b2f0f8d6b0fb126aa1224409ab6f1ffb8d8..942c6e1e3b6cd9de65df54a1d83884f2633c1284 100644
 --- a/browser/components/urlbar/content/UrlbarInput.mjs
 +++ b/browser/components/urlbar/content/UrlbarInput.mjs
 @@ -98,6 +98,13 @@ const lazy = XPCOMUtils.declareLazy({
@@ -61,10 +61,10 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
    }
  
    /**
-@@ -1627,7 +1656,11 @@ ${
-     }
+@@ -1630,7 +1659,11 @@ ${
+     openParams.avoidBrowserFocus = keepViewOpen;
  
-     if (!this.#providesSearchMode(result)) {
+     if (!this.#providesSearchMode(result) && !keepViewOpen) {
 -      this.view.close({ elementPicked: true });
 +      if (this._zenHandleUrlbarClose) {
 +        this._zenHandleUrlbarClose(true, true);
@@ -74,7 +74,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
      }
  
      if (isCanonized) {
-@@ -2936,6 +2969,42 @@ ${
+@@ -2940,6 +2973,42 @@ ${
      await this.#updateLayoutBreakoutDimensions();
    }
  
@@ -117,9 +117,9 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
    startLayoutExtend() {
      if (!this.#allowBreakout || this.hasAttribute("breakout-extend")) {
        // Do not expand if the Urlbar does not support being expanded or it is
-@@ -2954,6 +3023,13 @@ ${
- 
+@@ -2957,6 +3026,13 @@ ${
      this.toggleAttribute("breakout-extend", true);
+     this.#updateTextboxPosition();
  
 +    this.window.gZenUIManager.onUrlbarOpen();
 +    if (this.zenUrlbarBehavior == 'float' || (this.zenUrlbarBehavior == 'floating-on-type' && !this.focusedViaMousedown)) {
@@ -131,7 +131,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
      // 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")) {
-@@ -2981,6 +3057,29 @@ ${
+@@ -2984,6 +3060,29 @@ ${
        return;
      }
  
@@ -161,7 +161,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
      this.toggleAttribute("breakout-extend", false);
      this.#updateTextboxPosition();
    }
-@@ -3028,7 +3127,7 @@ ${
+@@ -3031,7 +3130,7 @@ ${
      forceUnifiedSearchButtonAvailable = false
    ) {
      let prevState = this.getAttribute("pageproxystate");
@@ -170,7 +170,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
      this.setAttribute("pageproxystate", state);
      this._inputContainer.setAttribute("pageproxystate", state);
      this._identityBox?.setAttribute("pageproxystate", state);
-@@ -3309,10 +3408,12 @@ ${
+@@ -3314,10 +3413,12 @@ ${
      }
  
      this.style.top = px(
@@ -183,7 +183,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
      );
    }
  
-@@ -3371,9 +3472,10 @@ ${
+@@ -3376,9 +3477,10 @@ ${
            return;
          }
  
@@ -195,7 +195,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
          );
          this.style.setProperty(
            "--urlbar-height",
-@@ -3878,6 +3980,7 @@ ${
+@@ -3883,6 +3985,7 @@ ${
    }
  
    _toggleActionOverride(event) {
@@ -203,7 +203,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
      if (
        event.keyCode == KeyEvent.DOM_VK_SHIFT ||
        event.keyCode == KeyEvent.DOM_VK_ALT ||
-@@ -3990,8 +4093,8 @@ ${
+@@ -3995,8 +4098,8 @@ ${
      if (!this.#isAddressbar) {
        return val;
      }
@@ -214,15 +214,15 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
        : val;
      // Only trim value if the directionality doesn't change to RTL and we're not
      // showing a strikeout https protocol.
-@@ -4290,6 +4393,7 @@ ${
-     resultDetails = null,
-     browser = this.window.gBrowser.selectedBrowser
+@@ -4298,6 +4401,7 @@ ${
+     browser = this.window.gBrowser.selectedBrowser,
+     keepViewOpen = false
    ) {
 +    openUILinkWhere = this.window.gZenUIManager.getOpenUILinkWhere(url, browser, openUILinkWhere);
      if (this.#isAddressbar) {
        this.#prepareAddressbarLoad(
          url,
-@@ -4401,6 +4505,10 @@ ${
+@@ -4411,6 +4515,10 @@ ${
        }
        reuseEmpty = true;
      }
@@ -233,7 +233,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
      if (
        where == "tab" &&
        reuseEmpty &&
-@@ -4408,6 +4516,9 @@ ${
+@@ -4418,6 +4526,9 @@ ${
      ) {
        where = "current";
      }
@@ -243,7 +243,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
      return where;
    }
  
-@@ -4662,6 +4773,7 @@ ${
+@@ -4672,6 +4783,7 @@ ${
        this.setResultForCurrentValue(null);
        this.handleCommand();
        this.controller.clearLastQueryContextCache();
@@ -251,7 +251,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
  
        this._suppressStartQuery = false;
      });
-@@ -4669,7 +4781,6 @@ ${
+@@ -4679,7 +4791,6 @@ ${
      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.
@@ -259,7 +259,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
  
        let controller =
          this.document.commandDispatcher.getControllerForCommand("cmd_paste");
-@@ -4825,7 +4936,11 @@ ${
+@@ -4842,7 +4953,11 @@ ${
      if (!engineName && !source && !this.hasAttribute("searchmode")) {
        return;
      }
@@ -272,7 +272,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
      if (this._searchModeIndicatorTitle) {
        this._searchModeIndicatorTitle.textContent = "";
        this._searchModeIndicatorTitle.removeAttribute("data-l10n-id");
-@@ -5141,6 +5256,7 @@ ${
+@@ -5159,6 +5274,7 @@ ${
  
      this.document.l10n.setAttributes(
        this.inputField,
@@ -280,7 +280,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
        l10nId,
        l10nId == "urlbar-placeholder-with-name"
          ? { name: engineName }
-@@ -5264,6 +5380,11 @@ ${
+@@ -5282,6 +5398,11 @@ ${
    }
  
    _on_click(event) {
@@ -292,7 +292,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
      switch (event.target) {
        case this.inputField:
        case this._inputContainer:
-@@ -5356,7 +5477,7 @@ ${
+@@ -5374,7 +5495,7 @@ ${
        }
      }
  
@@ -301,7 +301,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
        this.view.autoOpen({ event });
      } else {
        if (this._untrimOnFocusAfterKeydown) {
-@@ -5396,9 +5517,16 @@ ${
+@@ -5414,9 +5535,16 @@ ${
    }
  
    _on_mousedown(event) {
@@ -319,7 +319,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
          if (
            event.composedTarget != this.inputField &&
            event.composedTarget != this._inputContainer
-@@ -5408,6 +5536,10 @@ ${
+@@ -5426,6 +5554,10 @@ ${
  
          this.focusedViaMousedown = !this.focused;
          this.#preventClickSelectsAll = this.focused;
@@ -330,7 +330,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
  
          // Keep the focus status, since the attribute may be changed
          // upon calling this.focus().
-@@ -5443,7 +5575,7 @@ ${
+@@ -5461,7 +5593,7 @@ ${
          }
          // 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.
@@ -339,7 +339,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
            break;
          }
  
-@@ -5732,7 +5864,7 @@ ${
+@@ -5750,7 +5882,7 @@ ${
      // When we are in actions search mode we can show more results so
      // increase the limit.
      let maxResults =
diff --git a/src/browser/components/urlbar/content/UrlbarResult-mjs.patch b/src/browser/components/urlbar/content/UrlbarResult-mjs.patch
new file mode 100644
index 000000000..ec4496a54
--- /dev/null
+++ b/src/browser/components/urlbar/content/UrlbarResult-mjs.patch
@@ -0,0 +1,15 @@
+diff --git a/browser/components/urlbar/content/UrlbarResult.mjs b/browser/components/urlbar/content/UrlbarResult.mjs
+index 30662cbb0551a5efe12926eb1524719ece24ee48..1ed598c8b8c0836759b5af10e6cc9f5e334744ef 100644
+--- a/browser/components/urlbar/content/UrlbarResult.mjs
++++ b/browser/components/urlbar/content/UrlbarResult.mjs
+@@ -184,6 +184,10 @@ export class UrlbarResult {
+     return this.#heuristic;
+   }
+ 
++  set heuristic(value) {
++    this.#heuristic = value;
++  }
++
+   get hideRowLabel() {
+     return this.#hideRowLabel;
+   }
diff --git a/src/browser/components/urlbar/content/UrlbarShared-mjs.patch b/src/browser/components/urlbar/content/UrlbarShared-mjs.patch
new file mode 100644
index 000000000..08bbdf807
--- /dev/null
+++ b/src/browser/components/urlbar/content/UrlbarShared-mjs.patch
@@ -0,0 +1,28 @@
+diff --git a/browser/components/urlbar/content/UrlbarShared.mjs b/browser/components/urlbar/content/UrlbarShared.mjs
+index 5522d8a8c8d9549453c1700ff6fec40be52747ce..7b8ad33cc337907249749074057254bf7e316994 100644
+--- a/browser/components/urlbar/content/UrlbarShared.mjs
++++ b/browser/components/urlbar/content/UrlbarShared.mjs
+@@ -32,6 +32,7 @@ export const UrlbarShared = {
+     // `looksLikeOrigin()` returned `LOOKS_LIKE_ORIGIN.OTHER` for this token.
+     // It may or may not be an origin.
+     POSSIBLE_ORIGIN_BUT_SEARCH_ALLOWED: 12,
++    RESTRICT_WORKSPACE: 13,
+   }),
+ 
+   /**
+@@ -52,6 +53,7 @@ export const UrlbarShared = {
+     TITLE: "#",
+     URL: "$",
+     ACTION: ">",
++    WORKSPACE: "`",
+   }),
+ 
+   /**
+@@ -68,6 +70,7 @@ export const UrlbarShared = {
+     if (lazy.UrlbarPrefs.get("scotchBonnet.enableOverride")) {
+       keys.push(this.RESTRICT_TOKENS.ACTION);
+     }
++    keys.push(this.RESTRICT_TOKENS.WORKSPACE);
+     return new Set(keys);
+   },
+ };
diff --git a/src/browser/components/urlbar/UrlbarView-sys-mjs.patch b/src/browser/components/urlbar/content/UrlbarView-mjs.patch
similarity index 72%
rename from src/browser/components/urlbar/UrlbarView-sys-mjs.patch
rename to src/browser/components/urlbar/content/UrlbarView-mjs.patch
index 55f97628c..21d69f2b0 100644
--- a/src/browser/components/urlbar/UrlbarView-sys-mjs.patch
+++ b/src/browser/components/urlbar/content/UrlbarView-mjs.patch
@@ -1,8 +1,8 @@
-diff --git a/browser/components/urlbar/UrlbarView.sys.mjs b/browser/components/urlbar/UrlbarView.sys.mjs
-index b665adb1a1ce8bbae8df4cbea6c3248c3e4fb431..1de7f9461b8ccbd4680b917e6dd5ba3c02f69a94 100644
---- a/browser/components/urlbar/UrlbarView.sys.mjs
-+++ b/browser/components/urlbar/UrlbarView.sys.mjs
-@@ -640,7 +640,7 @@ export class UrlbarView {
+diff --git a/browser/components/urlbar/content/UrlbarView.mjs b/browser/components/urlbar/content/UrlbarView.mjs
+index 8afb2bf4a757b3ef7902f5a6e6eed6b70ca2845e..440dea1e66540ca1998cb7464b6695ac823fedcb 100644
+--- a/browser/components/urlbar/content/UrlbarView.mjs
++++ b/browser/components/urlbar/content/UrlbarView.mjs
+@@ -674,7 +674,7 @@ export class UrlbarView {
        !this.input.value ||
        this.input.getAttribute("pageproxystate") == "valid"
      ) {
@@ -11,7 +11,7 @@ index b665adb1a1ce8bbae8df4cbea6c3248c3e4fb431..1de7f9461b8ccbd4680b917e6dd5ba3c
          // Try to reuse the cached top-sites context. If it's not cached, then
          // there will be a gap of time between when the input is focused and
          // when the view opens that can be perceived as flicker.
-@@ -777,10 +777,6 @@ export class UrlbarView {
+@@ -812,10 +812,6 @@ export class UrlbarView {
      }
  
      // If search mode isn't active, close the view.
@@ -22,7 +22,7 @@ index b665adb1a1ce8bbae8df4cbea6c3248c3e4fb431..1de7f9461b8ccbd4680b917e6dd5ba3c
  
      // Search mode is active.  If the one-offs should be shown, make sure they
      // are enabled and show the view.
-@@ -2988,6 +2984,8 @@ export class UrlbarView {
+@@ -3031,6 +3027,8 @@ export class UrlbarView {
        if (row?.hasAttribute("row-selectable")) {
          row?.toggleAttribute("selected", true);
        }
@@ -31,7 +31,7 @@ index b665adb1a1ce8bbae8df4cbea6c3248c3e4fb431..1de7f9461b8ccbd4680b917e6dd5ba3c
        if (element != row) {
          row?.toggleAttribute("descendant-selected", true);
        }
-@@ -3477,7 +3475,7 @@ export class UrlbarView {
+@@ -3544,7 +3542,7 @@ export class UrlbarView {
    }
  
    #enableOrDisableRowWrap() {
diff --git a/src/browser/themes/shared/identity-block/identity-block-css.patch b/src/browser/themes/shared/identity-block/identity-block-css.patch
index 9ba08a4b0..9508f6716 100644
--- a/src/browser/themes/shared/identity-block/identity-block-css.patch
+++ b/src/browser/themes/shared/identity-block/identity-block-css.patch
@@ -1,18 +1,18 @@
 diff --git a/browser/themes/shared/identity-block/identity-block.css b/browser/themes/shared/identity-block/identity-block.css
-index f239438ce661ae2c33a3e04ecc6d403b3a56a42b..c3a237aa78cff7aaaf0a7b931dd2b4d99049c051 100644
+index 82c3e319f783e6383ce437131808bbde14293379..6b4444b8ad68664f746be057aae4c59e01e8d170 100644
 --- a/browser/themes/shared/identity-block/identity-block.css
 +++ b/browser/themes/shared/identity-block/identity-block.css
-@@ -7,7 +7,7 @@
- #identity-box {
-   margin-inline-end: var(--identity-box-margin-inline);
+@@ -12,7 +12,7 @@
+ }
  
+ #identity-box {
 -  &[pageproxystate="invalid"] {
 +  :root[zen-has-empty-tab='true'] & {
      pointer-events: none;
      -moz-user-focus: ignore;
-   }
-@@ -85,13 +85,6 @@
-   }
+ 
+@@ -96,13 +96,6 @@
+   margin: 0;
  }
  
 -#identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button,
@@ -25,7 +25,7 @@ index f239438ce661ae2c33a3e04ecc6d403b3a56a42b..c3a237aa78cff7aaaf0a7b931dd2b4d9
  
  #urlbar[focused] {
    #identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button:not(:hover, [open]),
-@@ -182,16 +175,17 @@
+@@ -193,16 +186,17 @@
    }
  
    #identity-icon {
diff --git a/src/browser/themes/shared/jar-inc-mn.patch b/src/browser/themes/shared/jar-inc-mn.patch
index b07bcd68e..e912cc075 100644
--- a/src/browser/themes/shared/jar-inc-mn.patch
+++ b/src/browser/themes/shared/jar-inc-mn.patch
@@ -1,11 +1,10 @@
 diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn
-index e3bdc11e449fb2cd2a4033a1d8c1bba00455e748..f928bc1a3a668dcc1a9ecde9945c6349e5903828 100644
+index 7892988bd5994d5183d25bf575d486f89ac888d0..a837672bb2fa1a404640fc8b2908fe4bd68d3c04 100644
 --- a/browser/themes/shared/jar.inc.mn
 +++ b/browser/themes/shared/jar.inc.mn
-@@ -352,3 +352,5 @@
- 
+@@ -357,3 +357,5 @@
    skin/classic/browser/illustrations/market-opt-in.svg         (../shared/illustrations/market-opt-in.svg)
+   skin/classic/browser/illustrations/tab-groups.svg            (../shared/illustrations/tab-groups.svg)
    skin/classic/browser/illustrations/yelpRealtime-opt-in.svg   (../shared/illustrations/yelpRealtime-opt-in.svg)
 +
 +#include zen-sources.inc.mn
-\ No newline at end of file
diff --git a/src/browser/themes/shared/tabbrowser/content-area-css.patch b/src/browser/themes/shared/tabbrowser/content-area-css.patch
index 0c5d741bc..678dc33ec 100644
--- a/src/browser/themes/shared/tabbrowser/content-area-css.patch
+++ b/src/browser/themes/shared/tabbrowser/content-area-css.patch
@@ -1,16 +1,16 @@
 diff --git a/browser/themes/shared/tabbrowser/content-area.css b/browser/themes/shared/tabbrowser/content-area.css
-index dff8162a84dbbe6873fa771828698b47b80d0472..e0c378af7a5cc607c2de1c9b5693adb04ac6adbd 100644
+index 3acdec2b8e043fe27919cfa54e73f4d3c491bfc8..267a1087134464a8193a824a2d7f8ac15ff8ad60 100644
 --- a/browser/themes/shared/tabbrowser/content-area.css
 +++ b/browser/themes/shared/tabbrowser/content-area.css
-@@ -171,7 +171,6 @@
+@@ -157,7 +157,6 @@
    min-height: 0;
  
    /* We want to be able to show the frame color behind the clipped radiused corner */
 -  background: var(--tabpanel-background-color);
  
-   /* stylelint-disable-next-line media-query-no-invalid */
    @media -moz-pref("sidebar.revamp") {
-@@ -235,7 +234,6 @@
+     outline: 0.01px solid var(--chrome-content-separator-color);
+@@ -216,7 +215,6 @@
    }
  
    browser:is([blank], [pendingpaint]) {
@@ -18,7 +18,7 @@ index dff8162a84dbbe6873fa771828698b47b80d0472..e0c378af7a5cc607c2de1c9b5693adb0
    }
  
    /* Exclude browsers with smartwindow-content attribute which inherit
-@@ -555,7 +553,7 @@ split-view-footer {
+@@ -553,7 +551,7 @@ split-view-footer {
  
  .dialogStack {
    z-index: var(--browser-stack-z-index-dialog-stack);
@@ -27,7 +27,7 @@ index dff8162a84dbbe6873fa771828698b47b80d0472..e0c378af7a5cc607c2de1c9b5693adb0
    inset: 0;
    /* --browser-with-dialog set on browser[tabDialogShowing], we want to position the overlay
       only on the top of the <browser> element so it doesn't overlap the DevTools toolbox */
-@@ -722,7 +720,7 @@ split-view-footer {
+@@ -718,7 +716,7 @@ split-view-footer {
  
  .dialogOverlay[topmost="true"],
  #window-modal-dialog::backdrop {
diff --git a/src/browser/themes/shared/tabbrowser/tabs-css.patch b/src/browser/themes/shared/tabbrowser/tabs-css.patch
index f64d8892b..ebd860758 100644
--- a/src/browser/themes/shared/tabbrowser/tabs-css.patch
+++ b/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 b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf272870987 100644
+index 24ad9ab050a67d4a375eb1d05261a7f7c267d7d1..b2f2ae8e765ad1f052aa07ab1d47f285062fbbcc 100644
 --- a/browser/themes/shared/tabbrowser/tabs.css
 +++ b/browser/themes/shared/tabbrowser/tabs.css
-@@ -34,7 +34,7 @@
+@@ -33,7 +33,7 @@
    --tab-group-line-thickness: 2px;
    --tab-group-line-toolbar-border-distance: 1px;
    /* Collapsed tabs should be square, so set width to match the min height */
@@ -11,7 +11,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
    --tab-collapsed-width: calc(var(--tab-collapsed-background-width) + 2 * var(--tab-inner-inline-margin));
    --tab-pinned-min-width-expanded: calc(var(--tab-pinned-expanded-background-width) + 2 * var(--tab-pinned-margin-inline-expanded));
    --tab-note-icon-end-margin: var(--dimension-4);
-@@ -285,7 +285,6 @@ tab-split-view-wrapper[dragtarget] {
+@@ -282,7 +282,6 @@ tab-split-view-wrapper[dragtarget] {
    }
  
    :root:not([uidensity="compact"], [sidebar-expand-on-hover]) &[pinned] {
@@ -19,7 +19,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
    }
  
    &:is([selected], [multiselected]) {
-@@ -299,6 +298,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -296,6 +295,7 @@ tab-split-view-wrapper[dragtarget] {
      border-radius: inherit;
      position: relative;
      overflow: hidden;
@@ -27,8 +27,8 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
  
      &::before {
        position: absolute;
-@@ -498,10 +498,6 @@ tab-split-view-wrapper[dragtarget] {
-   /* stylelint-disable-next-line media-query-no-invalid */
+@@ -493,10 +493,6 @@ tab-split-view-wrapper[dragtarget] {
+ 
    @media -moz-pref("browser.tabs.fadeOutUnloadedTabs") {
      &[pending] {
 -      filter: grayscale(100%);
@@ -38,8 +38,8 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
        opacity: 0.5;
        /* Fade the favicon out */
        transition-property: filter, opacity;
-@@ -518,10 +514,6 @@ tab-split-view-wrapper[dragtarget] {
-   /* stylelint-disable-next-line media-query-no-invalid */
+@@ -512,10 +508,6 @@ tab-split-view-wrapper[dragtarget] {
+ 
    @media -moz-pref("browser.tabs.fadeOutExplicitlyUnloadedTabs") {
      &[pending][discarded] {
 -      filter: grayscale(100%);
@@ -49,7 +49,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
        opacity: 0.5;
        /* Fade the favicon out */
        transition-property: filter, opacity;
-@@ -596,7 +588,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -589,7 +581,7 @@ tab-split-view-wrapper[dragtarget] {
    }
  
    #tabbrowser-tabs[orient="vertical"] & {
@@ -58,7 +58,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
    }
  
    &[crashed] {
-@@ -604,7 +596,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -597,7 +589,7 @@ tab-split-view-wrapper[dragtarget] {
    }
  
    #tabbrowser-tabs[orient="vertical"]:not([expanded]) &:not([crashed]),
@@ -67,7 +67,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
      &[soundplaying] {
        list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-playing-small.svg");
      }
-@@ -661,7 +653,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -651,7 +643,7 @@ tab-split-view-wrapper[dragtarget] {
      }
    }
  
@@ -76,7 +76,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
    &[crashed] {
      display: revert;
    }
-@@ -829,7 +821,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -811,7 +803,7 @@ tab-split-view-wrapper[dragtarget] {
        has not been added to root. There are certain scenarios when that attribute is temporarily
        removed from root such as when toggling the sidebar to expand with the toolbar button. */
      #tabbrowser-tabs[orient="horizontal"] &:not([pinned]):not([crashed]),
@@ -85,7 +85,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
        &:is([soundplaying], [muted], [activemedia-blocked]) {
          display: flex;
        }
-@@ -1053,7 +1045,6 @@ tab-split-view-wrapper[dragtarget] {
+@@ -1031,7 +1023,6 @@ tab-split-view-wrapper[dragtarget] {
  .tabbrowser-tab:is([image], [pinned]) > .tab-stack > .tab-content[attention]:not([selected]),
  .tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([selected]),
  #tabbrowser-tabs[orient="vertical"] .tabbrowser-tab > .tab-stack > .tab-content[titlechanged]:not([selected]) {
@@ -93,7 +93,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
    background-position: center bottom 6.5px;
    background-size: 4px 4px;
    background-repeat: no-repeat;
-@@ -1813,7 +1804,7 @@ tab-group {
+@@ -1780,7 +1771,7 @@ tab-group {
  }
  
  #tabbrowser-tabs[orient="vertical"][expanded] {
@@ -102,7 +102,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
    &[movingtab][movingtab-addToGroup]:not([movingtab-group], [movingtab-ungroup]) .tabbrowser-tab:is(:active, [multiselected]) {
      margin-inline-start: var(--space-medium);
    }
-@@ -2378,7 +2369,7 @@ tab-group {
+@@ -2335,7 +2326,7 @@ tab-group {
    }
  }
  
@@ -111,7 +111,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
  #vertical-tabs-newtab-button {
    appearance: none;
    min-height: var(--tab-min-height);
-@@ -2389,7 +2380,7 @@ tab-group {
+@@ -2346,7 +2337,7 @@ tab-group {
    margin-inline: var(--tab-inner-inline-margin);
  
    #tabbrowser-tabs[orient="vertical"]:not([expanded]) & > .toolbarbutton-text {
@@ -120,7 +120,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
    }
  
    &:hover {
-@@ -2413,7 +2404,7 @@ tab-group {
+@@ -2370,7 +2361,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.
   */
@@ -129,7 +129,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
    margin-block: var(--tab-block-margin);
  }
  
-@@ -2610,7 +2601,6 @@ tab-group {
+@@ -2560,7 +2551,6 @@ tab-group {
  
    &:not([expanded]) {
      .tabbrowser-tab[pinned] {
@@ -137,7 +137,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
      }
  
      .tab-background {
-@@ -2651,8 +2641,8 @@ tab-group {
+@@ -2599,8 +2589,8 @@ tab-group {
        display: block;
        position: absolute;
        inset: auto;
@@ -148,7 +148,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
  
        &:-moz-window-inactive {
          background-image:
-@@ -2753,9 +2743,6 @@ tab-group {
+@@ -2698,9 +2688,6 @@ tab-group {
    ~ #tabbrowser-tabs[orient="horizontal"]::before {
      display: flex;
      content: "";
@@ -158,7 +158,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
    }
  }
  
-@@ -2788,7 +2775,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
+@@ -2733,7 +2720,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
    list-style-image: url(chrome://global/skin/icons/plus.svg);
  }
  
diff --git a/src/browser/themes/shared/urlbar-searchbar-css.patch b/src/browser/themes/shared/urlbar-searchbar-css.patch
index 2fb638c24..148b7b911 100644
--- a/src/browser/themes/shared/urlbar-searchbar-css.patch
+++ b/src/browser/themes/shared/urlbar-searchbar-css.patch
@@ -1,17 +1,19 @@
 diff --git a/browser/themes/shared/urlbar-searchbar.css b/browser/themes/shared/urlbar-searchbar.css
-index cbd074b9bacfbf7cc82a67ad586ebc31c4d85970..993c61ba389cb9d912b2cebee9d71bec772e3a7d 100644
+index cc595de7e3839f7e688122552bca95f9f9ad3988..da4b1e1b5013d7a1a9af3d45d94db7194a1826f7 100644
 --- a/browser/themes/shared/urlbar-searchbar.css
 +++ b/browser/themes/shared/urlbar-searchbar.css
-@@ -12,7 +12,7 @@
-   /* Usually we wouldn't need snapping border widths manually, but we use this
-    * for other layout calculations too */
-   --urlbar-container-border-width: max(env(hairline), round(down, 1px, env(hairline)));
--  --urlbar-container-padding: round(up, 1px, env(hairline));
-+  --urlbar-container-padding: 2px;
-   --urlbar-container-inset: calc(var(--urlbar-container-border-width) + var(--urlbar-container-padding));
+@@ -19,8 +19,8 @@
  
+   @media not -moz-pref("browser.nova.enabled") {
+     --urlbar-basic-component-size: calc(var(--urlbar-min-height) - 2 * (var(--urlbar-input-container-border-width) + var(--urlbar-input-container-padding)));
+-    --urlbar-icon-padding: calc((var(--urlbar-min-height) - 2px /* border */ - 2px /* padding */ - 16px /* icon */) / 2);
+-    --urlbar-input-container-padding: round(up, 1px, env(hairline));
++    --urlbar-icon-padding: calc((var(--urlbar-min-height) - 2px /* border */ - 14px /* icon */) / 2);
++    --urlbar-input-container-padding: 2px;
+   }
    @media (max-width: 770px) {
-@@ -55,7 +55,7 @@ toolbar[inactive="true"] .urlbar,
+     --urlbar-container-min-width: 240px;
+@@ -114,7 +114,7 @@ toolbar[inactive="true"] .urlbar,
  .urlbar:not([usertyping]) > .urlbar-input-container > .urlbar-go-button,
  .urlbar:not(#searchbar-new, [focused]) > .urlbar-input-container > .urlbar-go-button,
  #urlbar-revert-button-container {
@@ -20,7 +22,7 @@ index cbd074b9bacfbf7cc82a67ad586ebc31c4d85970..993c61ba389cb9d912b2cebee9d71bec
  }
  
  /* Document Picture-in-Picture API window */
-@@ -205,6 +205,10 @@ toolbar[inactive="true"] .urlbar,
+@@ -350,6 +350,10 @@ toolbar[inactive="true"] .urlbar,
      mask-image: linear-gradient(to right, transparent var(--urlbar-scheme-size), black calc(var(--urlbar-scheme-size) + 3ch));
    }
  
@@ -28,10 +30,10 @@ index cbd074b9bacfbf7cc82a67ad586ebc31c4d85970..993c61ba389cb9d912b2cebee9d71bec
 +    mask-image: linear-gradient(to right, transparent, black 3ch, black calc(100% - 3ch), transparent);
 +  }
 +
-   /* stylelint-disable-next-line media-query-no-invalid */
-   @media -moz-pref("browser.nova.enabled") {
-     &::selection {
-@@ -429,10 +433,14 @@ toolbar[inactive="true"] .urlbar,
+   &::selection {
+     border-radius: var(--urlbar-selection-border-radius);
+   }
+@@ -464,10 +468,14 @@ toolbar[inactive="true"] .urlbar,
  
    .urlbar[breakout][breakout-extend] {
      height: auto;
@@ -44,5 +46,5 @@ index cbd074b9bacfbf7cc82a67ad586ebc31c4d85970..993c61ba389cb9d912b2cebee9d71bec
      > .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));
+       padding-block: calc((var(--urlbar-container-height) - var(--urlbar-height)) / 2 + var(--urlbar-input-container-padding));
+       padding-inline: calc(var(--urlbar-margin-inline) + var(--urlbar-input-container-padding));
diff --git a/src/browser/themes/shared/urlbar/variables-css.patch b/src/browser/themes/shared/urlbar/variables-css.patch
deleted file mode 100644
index 7fe83c809..000000000
--- a/src/browser/themes/shared/urlbar/variables-css.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/browser/themes/shared/urlbar/variables.css b/browser/themes/shared/urlbar/variables.css
-index 64eb46b3061504e590d3fcee0c30c902f68764fe..6e7ffe043c5676da27a6eb5b105dac2fde3309da 100644
---- a/browser/themes/shared/urlbar/variables.css
-+++ b/browser/themes/shared/urlbar/variables.css
-@@ -9,7 +9,7 @@
- :root {
-   --identity-box-margin-inline: 4px;
-   --urlbar-min-height: max(32px, 1.4em);
--  --urlbar-icon-padding: calc((var(--urlbar-min-height) - 2px /* border */ - 2px /* padding */ - 16px /* icon */) / 2);
-+  --urlbar-icon-padding: calc((var(--urlbar-min-height) - 2px /* border */ - 14px /* icon */) / 2);
- 
-   /* This should be used for icons and chiclets inside the input field, as well
-      as result rows. It makes the gap around them more uniform when they are
diff --git a/src/docshell/base/BrowsingContext-h.patch b/src/docshell/base/BrowsingContext-h.patch
index 12860e76c..4be5e028b 100644
--- a/src/docshell/base/BrowsingContext-h.patch
+++ b/src/docshell/base/BrowsingContext-h.patch
@@ -1,5 +1,5 @@
 diff --git a/docshell/base/BrowsingContext.h b/docshell/base/BrowsingContext.h
-index 02abb6ab9562a7b41f4a95a6289c80da8d1176e8..1722802021f331338fc10c768301a953e582b711 100644
+index 6f7f58bba3be6f08b3b27e81f30864c61d683351..3b8f2c14c80d931ec03c124d96f797ddda3f5431 100644
 --- a/docshell/base/BrowsingContext.h
 +++ b/docshell/base/BrowsingContext.h
 @@ -265,6 +265,9 @@ struct EmbedderColorSchemes {
@@ -24,7 +24,7 @@ index 02abb6ab9562a7b41f4a95a6289c80da8d1176e8..1722802021f331338fc10c768301a953
    float FullZoom() const { return GetFullZoom(); }
    float TextZoom() const { return GetTextZoom(); }
  
-@@ -1275,6 +1283,9 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
+@@ -1290,6 +1298,9 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
    }
  
    void DidSet(FieldIndex<IDX_SessionStoreEpoch>, uint32_t aOldValue);
@@ -32,5 +32,5 @@ index 02abb6ab9562a7b41f4a95a6289c80da8d1176e8..1722802021f331338fc10c768301a953
 +  void DidSet(FieldIndex<IDX_ZenBoostsComplementaryRotation>, float aOldValue);
 +  void DidSet(FieldIndex<IDX_IsZenBoostsInverted>, bool aOldValue);
  
-   using CanSetResult = syncedcontext::CanSetResult;
- 
+   // Ensure that opener is in the same BrowsingContextGroup.
+   bool CanSet(FieldIndex<IDX_OpenerId>, const uint64_t& aValue,
diff --git a/src/dom/chrome-webidl/MediaController-webidl.patch b/src/dom/chrome-webidl/MediaController-webidl.patch
index 86de13b0d..49307428f 100644
--- a/src/dom/chrome-webidl/MediaController-webidl.patch
+++ b/src/dom/chrome-webidl/MediaController-webidl.patch
@@ -1,5 +1,5 @@
 diff --git a/dom/chrome-webidl/MediaController.webidl b/dom/chrome-webidl/MediaController.webidl
-index 6063e86e747dac87aafc865af95800daef2a5b9d..7fc4e72ee73a16b9ec2c1b9d11d926246fb7f7b6 100644
+index 790bc66a31253a861b21658e67c83796ae939298..0fb7e6cfbb1d1d35aeceb8d7b903cd86bf64403c 100644
 --- a/dom/chrome-webidl/MediaController.webidl
 +++ b/dom/chrome-webidl/MediaController.webidl
 @@ -23,6 +23,12 @@ enum MediaControlKey {
@@ -15,12 +15,15 @@ index 6063e86e747dac87aafc865af95800daef2a5b9d..7fc4e72ee73a16b9ec2c1b9d11d92624
  /**
   * MediaController is used to control media playback for a tab, and each tab
   * would only have one media controller, which can be accessed from the
-@@ -36,10 +42,14 @@ interface MediaController : EventTarget {
+@@ -36,6 +42,7 @@ interface MediaController : EventTarget {
    readonly attribute boolean isPlaying;
    readonly attribute boolean isAnyMediaBeingControlled;
    readonly attribute MediaSessionPlaybackState playbackState;
 +  readonly attribute boolean isBeingUsedInPIPModeOrFullscreen;
  
+   // The effective audio-session type the tab is currently claiming. Chrome
+   // consumers can use this to apply tab/application level audio-focus
+@@ -46,6 +53,9 @@ interface MediaController : EventTarget {
    [Throws]
    MediaMetadataInit getMetadata();
  
diff --git a/src/eslint-file-globals-config-mjs.patch b/src/eslint-file-globals-config-mjs.patch
index 5eb4a2eda..64d789e29 100644
--- a/src/eslint-file-globals-config-mjs.patch
+++ b/src/eslint-file-globals-config-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/eslint-file-globals.config.mjs b/eslint-file-globals.config.mjs
-index bf1341a84382380d45b936aeffde3f167301a9ed..b6aa373252888dcdefd528a40329f1959086d8e5 100644
+index c15744aeaf940cea9e438e7b9924a328d2615b9f..df5c6c3f36e78537e0a54fb89dfd5b3d510a51a4 100644
 --- a/eslint-file-globals.config.mjs
 +++ b/eslint-file-globals.config.mjs
 @@ -22,6 +22,7 @@
@@ -10,9 +10,9 @@ index bf1341a84382380d45b936aeffde3f167301a9ed..b6aa373252888dcdefd528a40329f195
  
  export default [
    {
-@@ -550,4 +551,9 @@ export default [
-     ],
-     languageOptions: { globals: globals.worker },
+@@ -576,4 +577,9 @@ export default [
+       globals: globals.audioWorklet,
+     },
    },
 +  {
 +    name: "zen-globals",
diff --git a/src/external-patches/firefox/add_urlbar_closeonwindowblur_preference.patch b/src/external-patches/firefox/add_urlbar_closeonwindowblur_preference.patch
index e1c9b63ad..e30eb8049 100644
--- a/src/external-patches/firefox/add_urlbar_closeonwindowblur_preference.patch
+++ b/src/external-patches/firefox/add_urlbar_closeonwindowblur_preference.patch
@@ -32,9 +32,9 @@ diff --git a/browser/components/urlbar/UrlbarPrefs.sys.mjs b/browser/components/
    // or remote settings.
    ["flightStatus.minKeywordLength", 0],
  
-diff --git a/browser/components/urlbar/UrlbarView.sys.mjs b/browser/components/urlbar/UrlbarView.sys.mjs
---- a/browser/components/urlbar/UrlbarView.sys.mjs
-+++ b/browser/components/urlbar/UrlbarView.sys.mjs
+diff --git a/browser/components/urlbar/content/UrlbarView.mjs b/browser/components/urlbar/content/UrlbarView.mjs
+--- a/browser/components/urlbar/content/UrlbarView.mjs
++++ b/browser/components/urlbar/content/UrlbarView.mjs
 @@ -3909,10 +3909,16 @@
        }
      }
diff --git a/src/layout/base/nsPresContext-h.patch b/src/layout/base/nsPresContext-h.patch
index f408114e4..93a597a68 100644
--- a/src/layout/base/nsPresContext-h.patch
+++ b/src/layout/base/nsPresContext-h.patch
@@ -1,5 +1,5 @@
 diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h
-index 13aa7141c8e5297d0dd6aa9bd78fd32f050e8123..149a89e928d354f116c54f71605830f5ec6b7f8a 100644
+index 5f27c288fd027cf245421e7f049103a7e19da18a..fcd65b74c5881a75d9cb6847379e32d0a0652e67 100644
 --- a/layout/base/nsPresContext.h
 +++ b/layout/base/nsPresContext.h
 @@ -594,6 +594,22 @@ class nsPresContext : public nsISupports,
@@ -23,11 +23,11 @@ index 13aa7141c8e5297d0dd6aa9bd78fd32f050e8123..149a89e928d354f116c54f71605830f5
 +  bool ZenBoostsOverrideInverted() const { return mZenBoostsOverrideInverted; }
 +
    /**
-    * Return the device's screen size in inches, for font size
-    * inflation.
-@@ -1441,6 +1457,11 @@ class nsPresContext : public nsISupports,
-   mozilla::dom::PrefersColorSchemeOverride mOverriddenOrEmbedderColorScheme;
+    * Sets the effective link parameters overrides, and invalidate stuff as
+    * needed.
+@@ -1434,6 +1450,11 @@ class nsPresContext : public nsISupports,
    mozilla::StyleForcedColors mForcedColors;
+   mozilla::StyleLinkParameters mLinkParameters;
  
 +  nscolor mZenBoostsOverrideAccent = 0;
 +  float mZenBoostsOverrideComplementaryRotation = 0.0f;
diff --git a/src/layout/generic/nsTextPaintStyle-cpp.patch b/src/layout/generic/nsTextPaintStyle-cpp.patch
index 9ff579abb..2bd0f3b9b 100644
--- a/src/layout/generic/nsTextPaintStyle-cpp.patch
+++ b/src/layout/generic/nsTextPaintStyle-cpp.patch
@@ -1,5 +1,5 @@
 diff --git a/layout/generic/nsTextPaintStyle.cpp b/layout/generic/nsTextPaintStyle.cpp
-index 5d1bf44687e925aff67f44c8e0629f7f06e84e98..1fa60a4d91edc60ba733cefc5f73ab8b7684d02a 100644
+index f741ab5eb83778ec2460a5d975757f09b3f2865e..f39a019c0d82db7ba9a122ce5269d0833ae04568 100644
 --- a/layout/generic/nsTextPaintStyle.cpp
 +++ b/layout/generic/nsTextPaintStyle.cpp
 @@ -240,7 +240,7 @@ bool nsTextPaintStyle::GetTargetTextColor(nscolor* aForeColor) {
@@ -39,18 +39,8 @@ index 5d1bf44687e925aff67f44c8e0629f7f06e84e98..1fa60a4d91edc60ba733cefc5f73ab8b
    return NS_GET_A(*aBackColor) != 0;
  }
  
-@@ -466,19 +467,19 @@ bool nsTextPaintStyle::InitSelectionColorsAndShadow() {
-     // this is web content or chrome content. See bug 2029839.
-     if (!mFrame->PresContext()->Document()->ChromeRulesEnabled()) {
-       mSelectionBGColor = mSelectionPseudoStyle->GetVisitedDependentColor(
--          &nsStyleBackground::mBackgroundColor);
--      mSelectionTextColor =
--          mSelectionPseudoStyle->GetVisitedDependentColor(&nsStyleText::mColor);
-+          &nsStyleBackground::mBackgroundColor, mFrame);
-+      mSelectionTextColor = mSelectionPseudoStyle->GetVisitedDependentColor(
-+          &nsStyleText::mColor, mFrame);
-       return true;
-     }
+@@ -462,12 +463,12 @@ bool nsTextPaintStyle::InitSelectionColorsAndShadow() {
+     mSelectionPseudoStyle = std::move(style);
  
      if (nscolor bgColor = mSelectionPseudoStyle->GetVisitedDependentColor(
 -            &nsStyleBackground::mBackgroundColor);
diff --git a/src/layout/style/StyleColor-cpp.patch b/src/layout/style/StyleColor-cpp.patch
index f5aa44115..b95dbad1a 100644
--- a/src/layout/style/StyleColor-cpp.patch
+++ b/src/layout/style/StyleColor-cpp.patch
@@ -1,8 +1,8 @@
 diff --git a/layout/style/StyleColor.cpp b/layout/style/StyleColor.cpp
-index 95c7ae6abea5032bef0466e8d59d212374d7a4d0..85a48f27251756c72db8ed03a673a18e96cf76f9 100644
+index bbee32af30f35525730a10d0b242c0e8a8fe4695..a590fff105b30bc96fa7a0d8a8d3b1d5aa997e08 100644
 --- a/layout/style/StyleColor.cpp
 +++ b/layout/style/StyleColor.cpp
-@@ -8,6 +8,7 @@
+@@ -9,6 +9,7 @@
  #include "mozilla/dom/BindingDeclarations.h"
  #include "nsIFrame.h"
  #include "nsStyleStruct.h"
@@ -10,7 +10,7 @@ index 95c7ae6abea5032bef0466e8d59d212374d7a4d0..85a48f27251756c72db8ed03a673a18e
  
  namespace mozilla {
  
-@@ -34,23 +35,24 @@ StyleAbsoluteColor StyleColor::ResolveColor(
+@@ -96,23 +97,24 @@ StyleAbsoluteColor StyleColor::ResolveColor(
  
  template <>
  nscolor StyleColor::CalcColor(nscolor aColor) const {
@@ -40,27 +40,31 @@ index 95c7ae6abea5032bef0466e8d59d212374d7a4d0..85a48f27251756c72db8ed03a673a18e
  }
  
  StyleAbsoluteColor StyleAbsoluteColor::ToColorSpace(
-@@ -58,7 +60,7 @@ StyleAbsoluteColor StyleAbsoluteColor::ToColorSpace(
+@@ -120,7 +122,7 @@ StyleAbsoluteColor StyleAbsoluteColor::ToColorSpace(
    return Servo_ConvertColorSpace(this, aColorSpace);
  }
  
 -nscolor StyleAbsoluteColor::ToColor() const {
 +nscolor StyleAbsoluteColor::ToColor(const nsIFrame* aFrame) const {
-   auto srgb = ToColorSpace(StyleColorSpace::Srgb);
+   constexpr StyleColorSpace DEST_COLOR_SPACE = StyleColorSpace::Srgb;
  
-   // TODO(tlouw): Needs gamut mapping here. Right now we just hard clip the
-@@ -68,10 +70,12 @@ nscolor StyleAbsoluteColor::ToColor() const {
-   auto green = std::clamp(srgb.components._1, 0.0f, 1.0f);
-   auto blue = std::clamp(srgb.components._2, 0.0f, 1.0f);
+   constexpr float MIN = 0.0f;
+@@ -162,11 +164,13 @@ nscolor StyleAbsoluteColor::ToColor() const {
+     }
+   }
  
--  return NS_RGBA(nsStyleUtil::FloatToColorComponent(red),
+-  return NS_RGBA(
+-      nsStyleUtil::FloatToColorComponent(translatedColor.components._0),
+-      nsStyleUtil::FloatToColorComponent(translatedColor.components._1),
+-      nsStyleUtil::FloatToColorComponent(translatedColor.components._2),
+-      nsStyleUtil::FloatToColorComponent(translatedColor.alpha));
 +  return zen::nsZenBoostsBackend::ResolveStyleColor(
-+         NS_RGBA(nsStyleUtil::FloatToColorComponent(red),
-                  nsStyleUtil::FloatToColorComponent(green),
-                  nsStyleUtil::FloatToColorComponent(blue),
--                 nsStyleUtil::FloatToColorComponent(srgb.alpha));
-+                 nsStyleUtil::FloatToColorComponent(srgb.alpha)),
-+         aFrame);
++      NS_RGBA(
++          nsStyleUtil::FloatToColorComponent(translatedColor.components._0),
++          nsStyleUtil::FloatToColorComponent(translatedColor.components._1),
++          nsStyleUtil::FloatToColorComponent(translatedColor.components._2),
++          nsStyleUtil::FloatToColorComponent(translatedColor.alpha)),
++      aFrame);
  }
  
  }  // namespace mozilla
diff --git a/src/layout/svg/SVGImageContext-cpp.patch b/src/layout/svg/SVGImageContext-cpp.patch
index 4e8258689..9a8fbd935 100644
--- a/src/layout/svg/SVGImageContext-cpp.patch
+++ b/src/layout/svg/SVGImageContext-cpp.patch
@@ -1,5 +1,5 @@
 diff --git a/layout/svg/SVGImageContext.cpp b/layout/svg/SVGImageContext.cpp
-index ecbda963b75fb70b62885a0c8f7a517011a8d5dc..5f55f0a4174db830656d434b5295835ab18e6619 100644
+index 384401ae2cb80a1bf438b1fb3d849254de100210..e5ef332bc529e6588c33b507993880ca9def51d1 100644
 --- a/layout/svg/SVGImageContext.cpp
 +++ b/layout/svg/SVGImageContext.cpp
 @@ -10,6 +10,7 @@
@@ -30,8 +30,8 @@ index ecbda963b75fb70b62885a0c8f7a517011a8d5dc..5f55f0a4174db830656d434b5295835a
  /* static */
  void SVGImageContext::MaybeStoreContextPaint(SVGImageContext& aContext,
                                               nsIFrame* aFromFrame,
-@@ -43,6 +57,8 @@ void SVGImageContext::MaybeStoreContextPaint(SVGImageContext& aContext,
-     aContext.SetColorScheme(Some(scheme));
+@@ -50,6 +64,8 @@ void SVGImageContext::MaybeStoreContextPaint(SVGImageContext& aContext,
+     }
    }
  
 +  MaybeStoreZenBoosts(aContext, aPresContext);
@@ -39,7 +39,7 @@ index ecbda963b75fb70b62885a0c8f7a517011a8d5dc..5f55f0a4174db830656d434b5295835a
    const nsStyleSVG* style = aStyle.StyleSVG();
    if (!style->ExposesContextProperties()) {
      // Content must have '-moz-context-properties' set to the names of the
-@@ -57,12 +73,14 @@ void SVGImageContext::MaybeStoreContextPaint(SVGImageContext& aContext,
+@@ -64,12 +80,14 @@ void SVGImageContext::MaybeStoreContextPaint(SVGImageContext& aContext,
    if ((style->mMozContextProperties.bits & StyleContextPropertyBits::FILL) &&
        style->mFill.kind.IsColor()) {
      haveContextPaint = true;
diff --git a/src/layout/svg/SVGImageContext-h.patch b/src/layout/svg/SVGImageContext-h.patch
index c0cff0a5d..591d42ada 100644
--- a/src/layout/svg/SVGImageContext-h.patch
+++ b/src/layout/svg/SVGImageContext-h.patch
@@ -1,5 +1,5 @@
 diff --git a/layout/svg/SVGImageContext.h b/layout/svg/SVGImageContext.h
-index 159d9cbbd0711076ee6c2a71a3da04bd92a0102c..daefc40590c4d7d7fac9db25c6ec4ba2424dded5 100644
+index b1f811989697966e30859610f4fc07579d0385ab..f6f4cd5a45fc49b416111d980fab4e612788903e 100644
 --- a/layout/svg/SVGImageContext.h
 +++ b/layout/svg/SVGImageContext.h
 @@ -6,6 +6,7 @@
@@ -44,12 +44,12 @@ index 159d9cbbd0711076ee6c2a71a3da04bd92a0102c..daefc40590c4d7d7fac9db25c6ec4ba2
    const Maybe<SVGPreserveAspectRatio>& GetPreserveAspectRatio() const {
      return mPreserveAspectRatio;
    }
-@@ -107,7 +128,11 @@ class SVGImageContext {
- 
+@@ -116,7 +137,11 @@ class SVGImageContext {
      return contextPaintIsEqual && mViewportSize == aOther.mViewportSize &&
             mPreserveAspectRatio == aOther.mPreserveAspectRatio &&
--           mColorScheme == aOther.mColorScheme;
-+           mColorScheme == aOther.mColorScheme &&
+            mColorScheme == aOther.mColorScheme &&
+-           mLinkParameters == aOther.mLinkParameters;
++           mLinkParameters == aOther.mLinkParameters &&
 +           mZenBoostsAccent == aOther.mZenBoostsAccent &&
 +           mZenBoostsComplementaryRotation ==
 +               aOther.mZenBoostsComplementaryRotation &&
@@ -57,21 +57,20 @@ index 159d9cbbd0711076ee6c2a71a3da04bd92a0102c..daefc40590c4d7d7fac9db25c6ec4ba2
    }
  
    bool operator!=(const SVGImageContext&) const = default;
-@@ -119,7 +144,9 @@ class SVGImageContext {
-     }
+@@ -129,7 +154,8 @@ class SVGImageContext {
      return HashGeneric(hash, mViewportSize.map(HashSize).valueOr(0),
                         mPreserveAspectRatio.map(HashPAR).valueOr(0),
--                       mColorScheme.map(HashColorScheme).valueOr(0));
-+                       mColorScheme.map(HashColorScheme).valueOr(0),
-+                       mZenBoostsAccent, mZenBoostsComplementaryRotation,
-+                       mZenBoostsInverted);
+                        mColorScheme.map(HashColorScheme).valueOr(0),
+-                       HashLinkParameters(mLinkParameters));
++                       HashLinkParameters(mLinkParameters), mZenBoostsAccent,
++                       mZenBoostsComplementaryRotation, mZenBoostsInverted);
    }
  
   private:
-@@ -138,6 +165,9 @@ class SVGImageContext {
-   Maybe<CSSIntSize> mViewportSize;
+@@ -167,6 +193,9 @@ class SVGImageContext {
    Maybe<SVGPreserveAspectRatio> mPreserveAspectRatio;
    Maybe<ColorScheme> mColorScheme;
+   StyleLinkParameters mLinkParameters;
 +  nscolor mZenBoostsAccent = 0;
 +  float mZenBoostsComplementaryRotation = 0.0f;
 +  bool mZenBoostsInverted = false;
diff --git a/src/servo/ports/geckolib/cbindgen-toml.patch b/src/servo/ports/geckolib/cbindgen-toml.patch
index 7ceec28b5..b094044c6 100644
--- a/src/servo/ports/geckolib/cbindgen-toml.patch
+++ b/src/servo/ports/geckolib/cbindgen-toml.patch
@@ -1,8 +1,8 @@
 diff --git a/servo/ports/geckolib/cbindgen.toml b/servo/ports/geckolib/cbindgen.toml
-index 17937bd70ead3b86e59b3da8c8d90591ee48e0a2..2bddfd549243ddc387107df00625ea5f38e5c655 100644
+index 10c0c702dbad97d5e73d84e2c913a3541380c4dd..2291871e58ae259f3bc3d573eb32e7cb47cc8953 100644
 --- a/servo/ports/geckolib/cbindgen.toml
 +++ b/servo/ports/geckolib/cbindgen.toml
-@@ -666,9 +666,9 @@ renaming_overrides_prefixing = true
+@@ -673,9 +673,9 @@ renaming_overrides_prefixing = true
    nscolor CalcColor(const nsIFrame*) const;
    /**
     * Compute the final color, taking into account the foreground color from the
@@ -14,7 +14,7 @@ index 17937bd70ead3b86e59b3da8c8d90591ee48e0a2..2bddfd549243ddc387107df00625ea5f
    /**
     * Compute the final color, making the argument the foreground color.
     */
-@@ -691,9 +691,11 @@ renaming_overrides_prefixing = true
+@@ -698,9 +698,11 @@ renaming_overrides_prefixing = true
  
    /**
     * Convert this color to an nscolor. The color will be converted to sRGB first
@@ -27,4 +27,4 @@ index 17937bd70ead3b86e59b3da8c8d90591ee48e0a2..2bddfd549243ddc387107df00625ea5f
 +  nscolor ToColor(const nsIFrame*) const;
  """
  
- "OwnedSlice" = """
+ "ColorFunction" = """
diff --git a/src/toolkit/mozapps/extensions/content/aboutaddons-css.patch b/src/toolkit/mozapps/extensions/content/aboutaddons-css.patch
index e45f09187..085ab3862 100644
--- a/src/toolkit/mozapps/extensions/content/aboutaddons-css.patch
+++ b/src/toolkit/mozapps/extensions/content/aboutaddons-css.patch
@@ -1,18 +1,17 @@
 diff --git a/toolkit/mozapps/extensions/content/aboutaddons.css b/toolkit/mozapps/extensions/content/aboutaddons.css
-index 619ae975710359fe879f197c689969ed726de7c0..542adaf0aa4f9d7336d969754228c1a93640b6af 100644
+index d0af33257f01df0deb5469d964a53be687a15f2f..2ef7fc1f0d8b0b67743b7d67df3719be0b46a4b0 100644
 --- a/toolkit/mozapps/extensions/content/aboutaddons.css
 +++ b/toolkit/mozapps/extensions/content/aboutaddons.css
-@@ -105,6 +105,13 @@ h2 {
- .category[name="theme"] {
-   background-image: url("chrome://mozapps/skin/extensions/category-themes.svg");
+@@ -713,6 +713,12 @@ section:not(:empty) ~ #empty-addons-message {
+   font-weight: var(--font-weight-bold);
  }
-+
+ 
 +@media -moz-pref('zen.theme.disable-lightweight') {
-+  .category[name="theme"] {
++  #category-theme {
 +    display: none;
 +  }
 +}
 +
- .category[name="plugin"] {
-   background-image: url("chrome://mozapps/skin/extensions/category-plugins.svg");
- }
+ /* Position the badged dot in the top-end (right in ltr, left in rtl)
+  * corner of the badged category icon. */
+ @media (max-width: 950px) {
diff --git a/src/toolkit/themes/shared/design-system/dist/tokens-shared-css.patch b/src/toolkit/themes/shared/design-system/dist/tokens-shared-css.patch
index 280ba70ce..0dcc3ed65 100644
--- a/src/toolkit/themes/shared/design-system/dist/tokens-shared-css.patch
+++ b/src/toolkit/themes/shared/design-system/dist/tokens-shared-css.patch
@@ -1,19 +1,19 @@
 diff --git a/toolkit/themes/shared/design-system/dist/tokens-shared.css b/toolkit/themes/shared/design-system/dist/tokens-shared.css
-index 94afbe630914eef375967f2eff310d69c61fa1aa..04b42529d43c5100a76c883220875c0b70ad0616 100644
+index 15c0d98a18b4f19e7f2e03d2b78066b0353f416a..b32f6244c7a07e93894bab422691a605456034a1 100644
 --- a/toolkit/themes/shared/design-system/dist/tokens-shared.css
 +++ b/toolkit/themes/shared/design-system/dist/tokens-shared.css
 @@ -7,6 +7,8 @@
  
- @layer tokens-foundation, tokens-foundation-nova, tokens-prefers-contrast, tokens-prefers-contrast-nova, tokens-forced-colors, tokens-forced-colors-nova, tokens-browser-theme, tokens-browser-theme-nova;
+ @layer tokens-foundation, tokens-browser-theme, tokens-foundation-brand, tokens-foundation-nova, tokens-browser-theme-nova, tokens-foundation-brand-nova, tokens-prefers-contrast, tokens-prefers-contrast-nova, tokens-forced-colors, tokens-forced-colors-nova;
  
 +@import url("chrome://browser/content/zen-styles/zen-theme.css");
 +
  @layer tokens-foundation {
    :root,
    :host(.anonymous-content-host) {
-@@ -368,8 +370,8 @@
-     --panel-background-color-dimmed-further: color-mix(in srgb, currentColor 30%, transparent);
-     --panel-border-color: ThreeDShadow;
+@@ -424,8 +426,8 @@
+     --panel-background-color-dimmed-further: var(--background-color-dimmed-further);
+     --panel-border-color: light-dark(rgb(240, 240, 244), rgb(82, 82, 94));
      --panel-border-radius: var(--border-radius-medium);
 -    --panel-box-shadow: 0 0 var(--panel-box-shadow-margin) hsla(0, 0%, 0%, 0.2);
 -    --panel-box-shadow-margin: 4px;
@@ -21,4 +21,4 @@ index 94afbe630914eef375967f2eff310d69c61fa1aa..04b42529d43c5100a76c883220875c0b
 +    --panel-box-shadow-margin: 8px;
      --panel-menuitem-border-radius: var(--border-radius-small);
      --panel-menuitem-margin: var(--panel-menuitem-margin-block) var(--panel-menuitem-margin-inline);
-     --panel-menuitem-margin-block: 0px;
+     --panel-menuitem-margin-block: 0;
diff --git a/src/toolkit/themes/shared/in-content/common-shared-css.patch b/src/toolkit/themes/shared/in-content/common-shared-css.patch
index 5d60ff2e8..18134512d 100644
--- a/src/toolkit/themes/shared/in-content/common-shared-css.patch
+++ b/src/toolkit/themes/shared/in-content/common-shared-css.patch
@@ -1,17 +1,17 @@
 diff --git a/toolkit/themes/shared/in-content/common-shared.css b/toolkit/themes/shared/in-content/common-shared.css
-index 8cbeb5d266b19c2c5b3d605b23c8c421a03c2a0e..7db0baeee11b99a5da1c143c682e38751a9ac03c 100644
+index 087d356b80886b22692f948a97f229ccf75737fd..9c2d370e94d1f901ded4a7a786a475fdf867de07 100644
 --- a/toolkit/themes/shared/in-content/common-shared.css
 +++ b/toolkit/themes/shared/in-content/common-shared.css
-@@ -57,7 +57,7 @@
+@@ -40,7 +40,7 @@
     * this in forced colors mode, as we should be using system colours then.
     */
    :root[dialogroot] {
--    --background-color-canvas: #42414d;
+-    --background-color-canvas: var(--color-gray-80);
 +    --background-color-canvas: var(--zen-dialog-background);
    }
  }
  
-@@ -158,7 +158,7 @@ xul|menulist {
+@@ -141,7 +141,7 @@ xul|menulist {
    border-radius: var(--button-border-radius);
    background-color: var(--button-background-color);
    font-weight: normal;
diff --git a/surfer.json b/surfer.json
index 74a473e8c..d9de16b16 100644
--- a/surfer.json
+++ b/surfer.json
@@ -6,7 +6,7 @@
   "version": {
     "product": "firefox",
     "version": "152.0.6",
-    "candidate": "152.0.6",
+    "candidate": "153.0",
     "candidateBuild": 1
   },
   "buildOptions": {