feat: Fix data path, b=no-bug, c=workflows

feat: Start implementing PGO profiling on different steps, b=no-bug, c=workflows, configs
2026-01-11 15:45:31 +00:00 · 2026-01-08 14:31:07 +01:00 · 2026-01-07 13:42:42 +01:00
143 changed files with 1118 additions and 1067 deletions
--- a/.formal-git/components
+++ b/.formal-git/components
@@ -15,7 +15,7 @@ fonts
 welcome
 scripts
 workflows
-windows
+winsign
 flatpak
 configs
 l10n
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -336,7 +336,7 @@ jobs:
      MOZ_BUILD_DATE: ${{needs.buildid.outputs.buildids}}
      use-sccache: ${{ inputs.use-sccache }}

-  mac:
+  mac-pgo-generate:
    name: macOS build
    uses: ./.github/workflows/macos-release-build.yml
    permissions:
@@ -348,6 +348,21 @@ jobs:
      release-branch: ${{ inputs.update_branch }}
      MOZ_BUILD_DATE: ${{needs.buildid.outputs.buildids}}
      use-sccache: ${{ inputs.use-sccache }}
+      generate-pgo-data: true
+
+  mac:
+    name: macOS build
+    uses: ./.github/workflows/macos-release-build.yml
+    permissions:
+      contents: write
+    secrets: inherit
+    needs: [build-data, buildid, mac-pgo-generate]
+    with:
+      build-version: ${{ needs.build-data.outputs.version }}
+      release-branch: ${{ inputs.update_branch }}
+      MOZ_BUILD_DATE: ${{needs.buildid.outputs.buildids}}
+      use-sccache: ${{ inputs.use-sccache }}
+      generate-pgo-data: false

  mac-uni:
    name: macOS build (Universal)
--- a/.github/workflows/macos-release-build.yml
+++ b/.github/workflows/macos-release-build.yml
@@ -22,6 +22,11 @@ on:
        required: true
        type: boolean
        default: false
+      generate-pgo-data:
+        description: 'Generate PGO data'
+        required: false
+        type: boolean
+        default: false

 jobs:
  mac-build:
@@ -68,8 +73,8 @@ jobs:

      - name: Setup Git
        run: |
-          git config --global user.email "mauro-balades@users.noreply.github.com"
-          git config --global user.name "mauro-balades"
+          git config --global user.email "mr-cheffy@users.noreply.github.com"
+          git config --global user.name "mr-cheffy"

      - name: Install system dependencies
        run: |
@@ -120,15 +125,28 @@ jobs:
          SURFER_COMPAT: ${{ matrix.arch }}
        run: npm run import -- --verbose

+      - name: Download PGO data
+        if: ${{ inputs.generate-pgo-data == false }}
+        uses: actions/download-artifact@v4
+        with:
+          name: zen-macos-pgo-data-${{ matrix.arch }}
+
+      - name: Move PGO data
+        if: ${{ inputs.generate-pgo-data == false }}
+        run: |
+          mkdir -p $(echo ~)/artifact
+          mv $GITHUB_WORKSPACE/zen-macos-pgo-data-${{ matrix.arch }}/* $(echo ~)/artifact
+          chmod +x ~/artifact/en-US.log
+          chmod +x ~/artifact/merged.profdata
+
      - name: Bootstrap
        run: |
          cd engine
          export SURFER_PLATFORM="darwin"
          export PATH="$(python3 -m site --user-base)/bin":$PATH
          # Always exist with 0, even if bootstrap fails
-          ./mach --no-interactive bootstrap --application-choice browser --exclude macos-sdk || true
+          ./mach --no-interactive bootstrap --application-choice browser --no-system-changes --exclude macos-sdk || true
          cd ..
-          ls /Library/Developer/CommandLineTools/SDKs/MacOSX26.2.sdk

      - name: Build language packs
        run: sh scripts/download-language-packs.sh
@@ -142,6 +160,7 @@ jobs:
        env:
          SURFER_COMPAT: ${{ matrix.arch }}
          ZEN_RELEASE_BRANCH: ${{ inputs.release-branch }}
+          ZEN_GENERATE_PGO_DATA: ${{ inputs.generate-pgo-data && '1' || '0' }}
        run: |
          export SURFER_PLATFORM="darwin"
          if [[ -n ${{ inputs.MOZ_BUILD_DATE }} ]];then
@@ -150,6 +169,7 @@ jobs:
          bash .github/workflows/src/release-build.sh

      - name: Package
+        if: ${{ !inputs.generate-pgo-data }}
        env:
          SURFER_COMPAT: ${{ matrix.arch }}
          ZEN_GA_DISABLE_PGO: true
@@ -163,6 +183,7 @@ jobs:
          rm -rf ~/.zen-keys

      - name: Rename artifacts
+        if: ${{ !inputs.generate-pgo-data }}
        run: |
          echo "Tarballing DMG"
          set -ex
@@ -172,6 +193,7 @@ jobs:

      - name: Upload dist dmg
        uses: actions/upload-artifact@v4
+        if: ${{ !inputs.generate-pgo-data }}
        with:
          retention-days: 1
          name: zen-${{ matrix.arch }}-apple-darwin-dist.dmg
@@ -179,7 +201,7 @@ jobs:

      - name: Upload host mar
        uses: actions/upload-artifact@v4
-        if: matrix.arch == 'aarch64'
+        if: matrix.arch == 'aarch64' && !inputs.generate-pgo-data
        with:
          retention-days: 1
          name: zen-macos-host-mar
@@ -187,8 +209,16 @@ jobs:

      - name: Upload platform.ini
        uses: actions/upload-artifact@v4
-        if: matrix.arch == 'x86_64'
+        if: matrix.arch == 'x86_64' && !inputs.generate-pgo-data
        with:
          retention-days: 1
          name: platform.ini
          path: ./platform.ini
+
+      - name: Upload PGO data
+        uses: actions/upload-artifact@v4
+        if: inputs.generate-pgo-data
+        with:
+          retention-days: 1
+          name: zen-macos-pgo-data-${{ matrix.arch }}
+          path: ./zen-macos-pgo-data
--- a/.github/workflows/macos-universal-release-build.yml
+++ b/.github/workflows/macos-universal-release-build.yml
@@ -92,7 +92,6 @@ jobs:
      - name: Populate mozconfig
        env:
          SURFER_MOZCONFIG_ONLY: true
-          ZEN_RELEASE: 1
        run: |
          npm run build
          cd engine
--- a/.github/workflows/src/release-build.sh
+++ b/.github/workflows/src/release-build.sh
@@ -28,3 +28,22 @@ else
  export ZEN_RELEASE=1
  npm run build
 fi
+
+if test "$ZEN_GENERATE_PGO_DATA" = "1"; then
+  cd engine
+  export UPLOAD_PATH=../zen-macos-pgo-data
+  export MOZ_FETCHES_DIR=/Users/runner/.mozbuild
+  mkdir -p $UPLOAD_PATH
+
+  export JARLOG_FILE="en-US.log"
+
+  export LLVM_PROFDATA=$MOZ_FETCHES_DIR/clang/bin/llvm-profdata
+
+  set -v
+
+  ./mach python build/pgo/profileserver.py --binary obj-*-apple-darwin/dist/*.app/Contents/MacOS/zen
+
+  mv merged.profdata $UPLOAD_PATH/
+  mv $JARLOG_FILE $UPLOAD_PATH/
+  cd ..
+fi
--- a/.github/workflows/windows-release-build.yml
+++ b/.github/workflows/windows-release-build.yml
@@ -197,14 +197,12 @@ jobs:
          else
            rustup target add x86_64-pc-windows-msvc
          fi
-          # Stored in build/windows/.windows-rs-version
-          WINDOWS_RS_VERSION=$(cat build/windows/.windows-rs-version)
          cd engine/
          cargo install cargo-download --locked
-          cargo download -x windows=$WINDOWS_RS_VERSION
+          cargo download -x windows=0.58.0
          export CARGO_INCREMENTAL=0
          echo "" >> ../configs/common/mozconfig
-          echo "export MOZ_WINDOWS_RS_DIR=$(pwd)/windows-$WINDOWS_RS_VERSION" >> ../configs/common/mozconfig
+          echo "export MOZ_WINDOWS_RS_DIR=$(pwd)/windows-0.58.0" >> ../configs/common/mozconfig

      - name: Build language packs
        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
--- 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 `146.0.1`! 🚀
- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 147.0`!
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 146.0.1`!

 ### Contributing

--- a/build/firefox-cache/l10n-last-commit-hash
+++ b/build/firefox-cache/l10n-last-commit-hash
@@ -1 +1 @@
-459ca9dfb9642c48c4ae314ce489d462b25448a8
+b6f4d18893d4f547f01d5e8aa8a4b364b168c84f
--- a/build/windows/.windows-rs-version
+++ b/build/windows/.windows-rs-version
@@ -1 +0,0 @@
-0.62.2
--- a/build/winsign/bootstrap.ps1
+++ b/build/winsign/bootstrap.ps1
--- a/build/winsign/firefox_update.ps1
+++ b/build/winsign/firefox_update.ps1
--- a/build/winsign/mar.exe
+++ b/build/winsign/mar.exe
--- a/build/winsign/sign.ps1
+++ b/build/winsign/sign.ps1
--- a/configs/common/mozconfig
+++ b/configs/common/mozconfig
@@ -47,8 +47,6 @@ if test "$ZEN_RELEASE"; then
  # ac_add_options --enable-clang-plugin
  ac_add_options --enable-bootstrap=-sccache

-  ac_add_options --enable-optimize
-
  ac_add_options --enable-release
  ac_add_options --disable-debug
  ac_add_options --disable-debug-symbols
@@ -58,6 +56,8 @@ if test "$ZEN_RELEASE"; then
  ac_add_options --enable-rust-simd
  ac_add_options --enable-wasm-simd

+  mk_add_options MOZ_PARALLEL_COMPILE=1
+
  ac_add_options --disable-geckodriver
  ac_add_options --disable-rust-tests

@@ -73,6 +73,8 @@ if test "$ZEN_RELEASE"; then
    fi
  fi

+  ac_add_options --enable-jemalloc
+
  mk_add_options MOZILLA_OFFICIAL=1
  MOZILLA_OFFICIAL=1
  export MOZILLA_OFFICIAL=1
@@ -80,6 +82,9 @@ if test "$ZEN_RELEASE"; then
  mk_add_options AUTOCLOBBER=1
  export AUTOCLOBBER=1

+  ac_add_options --enable-updater
+
+  ac_add_options --enable-js-shell
  export MOZ_PACKAGE_JSSHELL=1

  ac_add_options --disable-crashreporter
--- a/configs/linux/mozconfig
+++ b/configs/linux/mozconfig
@@ -17,16 +17,30 @@ if test "$ZEN_RELEASE"; then
        ac_add_options --enable-eme=widevine

        # Enable Profile Guided Optimization
-        if ! test "$ZEN_GA_DISABLE_PGO"; then
-            export MOZ_PGO=1
-            ac_add_options MOZ_PGO=1
+        if test "$ZEN_GA_DISABLE_PGO"; then
+        export ZEN_DUMMY=1
+        else
+        export MOZ_PGO=1
+        ac_add_options MOZ_PGO=1
        fi
+
+        # Optimization flags for SURFER_COMPAT
+        ac_add_options --enable-optimize="-O3 -w -ftree-vectorize -mfpmath=sse -mprfchw -msse3 -mcx16 -msahf"
+
+        export LDFLAGS="$LDFLAGS -Wl,-O3"
    elif test "$SURFER_COMPAT" = "aarch64"; then
        ac_add_options --target=aarch64-linux-gnu

+        ac_add_options --enable-optimize="-O3"
+
        # override LTO settings
        export MOZ_LTO=cross,thin
        ac_add_options --enable-lto=cross,thin
+
+        export CFLAGS="$CFLAGS -O3"
+        export CPPFLAGS="$CPPFLAGS -O3"
+        export CXXFLAGS="$CXXFLAGS -O3"
+        export LDFLAGS="$LDFLAGS -Wl,-O3"
    fi

    # Disable DMD and ELF hacks, enable linker lld
--- a/configs/macos/mozconfig
+++ b/configs/macos/mozconfig
@@ -14,26 +14,20 @@ if test "$ZEN_RELEASE"; then
  ac_add_options --enable-lto=cross,thin
 fi

-if test "$ZEN_RELEASE"; then
-  if test "$ZEN_GA_DISABLE_PGO"; then
-    export ZEN_DUMMY=1
-  else
-    export MOZ_PGO=1
-    ac_add_options MOZ_PGO=1
-  fi
-fi
-
 if test "$SURFER_COMPAT" = "x86_64"; then
  ac_add_options --target=x86_64-apple-darwin

  if test "$ZEN_RELEASE"; then
    ac_add_options --enable-wasm-avx
+    ac_add_options --enable-optimize="-march=nehalem -mtune=haswell -O2 -w"
  fi
 else
  ac_add_options --enable-clang-plugin
  ac_add_options --target=aarch64-apple-darwin

  if test "$ZEN_RELEASE"; then
+    ac_add_options --enable-optimize="-O2 -mcpu=apple-m1"
+
    # As of Clang 13, the default is -mcpu=apple-m1 when using a aarch64-apple-macos target,
    # but we're using apple64-apple-darwin, which defaults to -mcpu=apple-a7, which disables
    # a bunch of # performance-enabling CPU features.
@@ -43,16 +37,21 @@ else
  fi
 fi

-if test "$ZEN_RELEASE"; then
-  ac_add_options --with-macos-sdk=/Library/Developer/CommandLineTools/SDKs/MacOSX26.2.sdk
-fi
-
 # Keep using ld64 on PGO/LTO builds because of performance regressions when using lld.
 # Mozilla sets "MOZ_LD64_KNOWN_GOOD" to true when they do automated builds with PGO/LTO on macOS.
 # See https://searchfox.org/firefox-main/rev/e61d59b5c9a651fd7bf28043f87c0dc669833496/build/moz.configure/lto-pgo.configure#261
-# export MOZ_LD64_KNOWN_GOOD=1
-# ac_add_options --enable-linker=ld64
-# 
-# if test "$ZEN_RELEASE"; then
-#   mk_add_options MOZ_MAKE_FLAGS="-j4"
-# fi
+export MOZ_LD64_KNOWN_GOOD=1
+ac_add_options --enable-linker=ld64
+
+if test "$ZEN_RELEASE"; then
+  if ! test "$ZEN_GA_DISABLE_PGO"; then
+    if test "$ZEN_GENERATE_PGO_DATA"; then
+      mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0"
+      ac_add_options --enable-profile-generate=cross
+    else
+      ac_add_options --enable-profile-use=cross
+      ac_add_options --with-pgo-profile-path=$(echo ~)/artifact/merged.profdata
+      ac_add_options --with-pgo-jarlog=$(echo ~)/artifact/en-US.log
+    fi
+  fi
+fi
--- a/configs/windows/mozconfig
+++ b/configs/windows/mozconfig
@@ -30,26 +30,39 @@ ac_add_options --disable-maintenance-service
 ac_add_options --disable-bits-download

 if test "$SURFER_COMPAT" = "x86_64"; then
+
  ac_add_options --target=x86_64-pc-windows-msvc
  ac_add_options --enable-eme=widevine,wmfcdm
+
+  ac_add_options --enable-optimize="-O3 -w -ftree-vectorize -mfpmath=sse -mprfchw -msse3 -mcx16 -msahf"
+
+  export LDFLAGS="$LDFLAGS -Wl,-O3"
+  export RUSTFLAGS="$RUSTFLAGS -Clink-args=--icf=safe"
 elif test "$SURFER_COMPAT" = "aarch64"; then
  ac_add_options --target=aarch64-pc-windows-msvc
  ac_add_options --enable-eme=widevine

+  ac_add_options --enable-optimize="-O2 -mtune=cortex-a55 -march=armv8.2-a+simd"
+
  # override LTO settings
  export MOZ_LTO=cross,thin
  ac_add_options --enable-lto=cross,thin
+
+  export CFLAGS="-O2 -march=armv8.2-a+simd -mtune=cortex-a55"
+  export CPPFLAGS="-O2 -march=armv8.2-a+simd -mtune=cortex-a55"
+  export CXXFLAGS="-O2 -march=armv8.2-a+simd -mtune=cortex-a55"
+  export LDFLAGS="-Wl,-O2 -march=armv8.2-a+simd -mtune=cortex-a55"
+  export RUSTFLAGS="-C target-feature=+v8.2a -Ctarget-cpu=cortex-a55"
 fi

 if test "$ZEN_CROSS_COMPILING"; then
  if test "$ZEN_GA_GENERATE_PROFILE"; then
+    export CXXFLAGS="$CXXFLAGS -fprofile-generate -mllvm -enable-name-compression=false -mllvm -pgo-temporal-instrumentation -fprofile-update=atomic"
    mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0"
    ac_add_options --enable-profile-generate=cross
  elif test "$SURFER_COMPAT" = "x86_64"; then
    # Dont use PGO on aarch64 builds and the ZEN_GA_DISABLE_PGO flag is not set
-    if test "$ZEN_GA_DISABLE_PGO"; then
-      export ZEN_DUMMY=1
-    else
+    if ! test "$ZEN_GA_DISABLE_PGO"; then
      ac_add_options --enable-profile-use=cross
      ac_add_options --with-pgo-profile-path=$(echo ~)/artifact/merged.profdata
      ac_add_options --with-pgo-jarlog=$(echo ~)/artifact/en-US.log
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -49,11 +49,13 @@
    "url": "https://github.com/zen-browser/desktop/issues"
  },
  "homepage": "https://github.com/zen-browser/desktop#readme",
+  "dependencies": {
+    "@zen-browser/surfer": "^1.12.1"
+  },
  "devDependencies": {
    "@babel/preset-typescript": "^7.27.0",
    "@eslint/js": "^9.32.0",
    "@microsoft/eslint-plugin-sdl": "^1.1.0",
-    "@zen-browser/surfer": "^1.13.0",
    "eslint": "^9.32.0",
    "eslint-config-prettier": "^10.1.8",
    "eslint-plugin-html": "^8.1.3",
--- a/prefs/firefox/browser.yaml
+++ b/prefs/firefox/browser.yaml
@@ -65,7 +65,3 @@

 - name: browser.tabs.closeWindowWithLastTab
  value: false
-
- name: browser.tabs.dragDrop.multiselectStacking
-  value: false
-  locked: true
--- a/prefs/zen/kbs.yaml
+++ b/prefs/zen/kbs.yaml
@@ -2,6 +2,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+- name: zen.keyboard.shortcuts.enabled
+  value: true
+
 - name: zen.keyboard.shortcuts.version
  value: 0 # Empty string means default shortcuts

--- a/prefs/zen/theme.yaml
+++ b/prefs/zen/theme.yaml
@@ -41,7 +41,12 @@

 # ==== Mark: border radius ====

-# -1 will use platform-native values
-# Set to a positive value to override with a custom radius
+# macOS border radius
 - name: zen.theme.border-radius
-  value: -1
+  value: 10
+  condition: 'defined(XP_MACOSX)'
+
+# non-macOS border radius
+- name: zen.theme.border-radius
+  value: 8
+  condition: '!defined(XP_MACOSX)'
--- a/prefs/zen/workspaces.yaml
+++ b/prefs/zen/workspaces.yaml
@@ -32,9 +32,6 @@
 - name: zen.workspaces.separate-essentials
  value: true

- name: zen.workspaces.dnd-switch-padding
-  value: 10
-
 - name: zen.workspaces.debug
  value: '@cond'
  condition: '!defined(MOZILLA_OFFICIAL)' # Section: Pinned tabs management
--- a/scripts/check_rc_response.py
+++ b/scripts/check_rc_response.py
@@ -17,7 +17,7 @@ def get_current_version() -> Optional[str]:
  try:
    with open(METADATA_FILENAME) as f:
      metadata = json.load(f)
-      return metadata["version"]["candidate"], metadata["version"]["candidateBuild"]
+      return metadata["version"]["candidate"]
  except (FileNotFoundError, json.JSONDecodeError) as e:
    print(f"Error reading current version: {e}")
    return None
@@ -43,10 +43,8 @@ def get_rc_response() -> Optional[str]:
      tag = tag_dict["tag"]
      if (tag.startswith("FIREFOX") and tag.endswith("_BUILD1")
              and "ESR" not in tag and "b" not in tag and "ANDROID" not in tag):
-        version = (tag.replace("FIREFOX_", "").replace("_BUILD1",
-                                                       "").replace("_", "."))
-        build = int(tag.split("_BUILD")[-1])
-        return version, build
+        return (tag.replace("FIREFOX_", "").replace("_BUILD1",
+                                                    "").replace("_", "."))
  except (FileNotFoundError, json.JSONDecodeError) as e:
    print(f"Error reading RC response: {e}")
  return None
@@ -78,15 +76,15 @@ def send_webhook(rc: str) -> None:
    print("Webhook URL not set.")


-def rc_should_be_updated(rc_response: str, current_version: str, rc_build: int, current_build: int) -> bool:
-  return rc_response and (rc_response != current_version or rc_build != current_build)
+def rc_should_be_updated(rc_response: str, current_version: str) -> bool:
+  return rc_response and rc_response != current_version


 def main() -> int:
-  current_version, current_build = get_current_version()
-  rc_response, rc_build = get_rc_response()
+  current_version = get_current_version()
+  rc_response = get_rc_response()

-  if rc_should_be_updated(rc_response, current_version, rc_build, current_build):
+  if rc_should_be_updated(rc_response, current_version):
    send_webhook(rc_response)
    return 0

--- a/scripts/fetch-formal-git-components.sh
+++ b/scripts/fetch-formal-git-components.sh
@@ -10,7 +10,7 @@ COMPONENT_ROOT=$(pwd)/src/zen
 EXTRA_COMPONENTS=(
  "scripts"
  "workflows"
-  "windows"
+  "winsign"
  "flatpak"
  "configs"
 )
--- a/scripts/recalculate-patches.sh
+++ b/scripts/recalculate-patches.sh
@@ -16,7 +16,7 @@ IGNORE_FILES=(
 # Recursively find all .patch files in the current directory and its subdirectories
 find src -type f -name "*.patch" | while read -r patch_file; do
  # Get the file from the inside of the file as indicated by the patch
-  target_file=$(grep -m 1 -E '^\+\+\+ b/' "$patch_file" | sed 's/^\+\+\+ b\///')
+  target_file=$(grep -m 1 -oP '(?<=\+\+\+ b/).+' "$patch_file")
  if [[ -z "$target_file" ]]; then
    echo "No target file found in patch: $patch_file"
    continue
--- a/scripts/update-surfer.sh
+++ b/scripts/update-surfer.sh
@@ -10,4 +10,4 @@ if [ ! -f "package.json" ]; then
 fi

 npm update @zen-browser/surfer
-npm i @zen-browser/surfer@latest -D
+npm i @zen-browser/surfer@latest
--- a/scripts/update_ff.py
+++ b/scripts/update_ff.py
@@ -10,9 +10,9 @@ import shutil
 from check_rc_response import get_rc_response, rc_should_be_updated


-def update_rc(last_version: str, last_build: int):
-  rc_version, rc_build = get_rc_response()
-  if rc_should_be_updated(rc_version, last_version, rc_build, last_build):
+def update_rc(last_version: str):
+  rc_version = get_rc_response()
+  if rc_should_be_updated(rc_version, last_version):
    print(f"New Firefox RC version is available: {rc_version}")
    print("Removing engine directory and updating surfer.json.")
    if os.path.exists("engine"):
@@ -21,7 +21,6 @@ def update_rc(last_version: str, last_build: int):
      data = json.load(f)
    with open("surfer.json", "w") as f:
      data["version"]["candidate"] = rc_version
-      data["version"]["candidateBuild"] = rc_build
      json.dump(data, f, indent=2)
    print("Download the new engine by running 'npm run download'.")
    os.system("npm run download")
@@ -29,10 +28,10 @@ def update_rc(last_version: str, last_build: int):
    print("No new Firefox RC version available.")


-def update_ff(is_rc: bool = False, last_version: str = "", last_build: int = 0):
+def update_ff(is_rc: bool = False, last_version: str = ""):
  """Runs the npm command to sync Firefox."""
  if is_rc:
-    return update_rc(last_version, last_build)
+    return update_rc(last_version)
  result = os.system("npm run sync:raw")
  if result != 0:
    raise RuntimeError("Failed to sync Firefox.")
@@ -43,8 +42,7 @@ def get_version_from_file(filename, is_rc):
  try:
    with open(filename, "r") as f:
      data = json.load(f)
-      return (data["version"]["version"] if not is_rc else data["version"]["candidate"],
-              data["version"]["candidateBuild"])
+      return data["version"]["version"] if not is_rc else data["version"]["candidate"]
  except (FileNotFoundError, json.JSONDecodeError) as e:
    raise RuntimeError(f"Error reading version from {filename}: {e}")

@@ -93,9 +91,9 @@ def main():

  try:
    if not args.just_l10n:
-      last_version, last_build = get_version_from_file("surfer.json", args.rc)
-      update_ff(args.rc, last_version, last_build)
-      new_version, new_build = get_version_from_file("surfer.json", args.rc)
+      last_version = get_version_from_file("surfer.json", args.rc)
+      update_ff(args.rc, last_version)
+      new_version = get_version_from_file("surfer.json", args.rc)
      update_readme(last_version, new_version, args.rc)
      print(
          f"Updated version from {last_version} to {new_version} in README.md.")
--- a/src/Cargo-lock.patch
+++ b/src/Cargo-lock.patch
@@ -1,8 +1,8 @@
 diff --git a/Cargo.lock b/Cargo.lock
-index 723445447f491058784992e66245e0e0f8e61e19..02816c1df3e20d96ce68f16970b8a6e38080533e 100644
+index 6f6632e9747e281aac3ea177225c03b73f25456e..06756e08041835c203490057855d537118647cd0 100644
 --- a/Cargo.lock
 +++ b/Cargo.lock
-@@ -4214,8 +4214,6 @@ dependencies = [
+@@ -4171,8 +4171,6 @@ dependencies = [
 [[package]]
 name = "mime_guess"
 version = "2.0.4"
--- a/src/Cargo-toml.patch
+++ b/src/Cargo-toml.patch
@@ -1,8 +1,8 @@
 diff --git a/Cargo.toml b/Cargo.toml
-index 35e725043bce0b39fea550e8fb2b0ae1ff752e43..abac2042d537fcc1ce26e0e3acbf98fc2975b793 100644
+index e2846a08008684f18799d75e5c28fd244c10361a..ba72071baef49ed494f78d1cc6752b53d1841f46 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -237,6 +237,8 @@ moz_asserts = { path = "mozglue/static/rust/moz_asserts" }
+@@ -232,6 +232,8 @@ moz_asserts = { path = "mozglue/static/rust/moz_asserts" }
 # Workaround for https://github.com/rust-lang/cargo/issues/11232
 rure = { path = "third_party/rust/rure" }
 
--- a/src/browser/actors/WebRTCParent-sys-mjs.patch
+++ b/src/browser/actors/WebRTCParent-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/actors/WebRTCParent.sys.mjs b/browser/actors/WebRTCParent.sys.mjs
-index ffa7d61ded4f2cf5866d0cb12dd9b14728a63570..5575943208a734f820758fd50a80503061934d56 100644
+index a9612920f86ef5f37328497bf62255497e96b02d..a5643cd7e9c7a71da391408c14e00185b7db3f24 100644
 --- a/browser/actors/WebRTCParent.sys.mjs
 +++ b/browser/actors/WebRTCParent.sys.mjs
@@ -152,6 +152,7 @@ export class WebRTCParent extends JSWindowActorParent {
--- a/src/browser/base/content/browser-addons-js.patch
+++ b/src/browser/base/content/browser-addons-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-addons.js b/browser/base/content/browser-addons.js
-index cfb6b8dd5443966d0635c3d7b477a68eca8fa9e0..c876890706b1a314c7760bbe1ff5e9eb57857e60 100644
+index fadcbfca95ee28140579430c0371baad0e2f216a..1947b4ab1c0b4ba0099147c9f13ae78d6e425bdf 100644
 --- a/browser/base/content/browser-addons.js
 +++ b/browser/base/content/browser-addons.js
@@ -1069,7 +1069,7 @@ var gXPInstallObserver = {
@@ -20,7 +20,7 @@ index cfb6b8dd5443966d0635c3d7b477a68eca8fa9e0..c876890706b1a314c7760bbe1ff5e9eb
       },
     };
 
-@@ -2212,7 +2212,7 @@ var gUnifiedExtensions = {
+@@ -2211,7 +2211,7 @@ var gUnifiedExtensions = {
   // If the new ID is not added in NOTIFICATION_IDS, consider handling the case
   // in the "PopupNotificationsBeforeAnchor" handler elsewhere in this file.
   getPopupAnchorID(aBrowser, aWindow) {
@@ -29,7 +29,7 @@ index cfb6b8dd5443966d0635c3d7b477a68eca8fa9e0..c876890706b1a314c7760bbe1ff5e9eb
     const attr = anchorID + "popupnotificationanchor";
 
     if (!aBrowser[attr]) {
-@@ -2223,7 +2223,7 @@ var gUnifiedExtensions = {
+@@ -2222,7 +2222,7 @@ var gUnifiedExtensions = {
         anchorID
         // Anchor on the toolbar icon to position the popup right below the
         // button.
@@ -38,7 +38,7 @@ index cfb6b8dd5443966d0635c3d7b477a68eca8fa9e0..c876890706b1a314c7760bbe1ff5e9eb
     }
 
     return anchorID;
-@@ -2548,7 +2548,7 @@ var gUnifiedExtensions = {
+@@ -2547,7 +2547,7 @@ var gUnifiedExtensions = {
     requestAnimationFrame(() => this.updateAttention());
   },
 
@@ -47,7 +47,7 @@ index cfb6b8dd5443966d0635c3d7b477a68eca8fa9e0..c876890706b1a314c7760bbe1ff5e9eb
     // A list of extension widget IDs (possibly empty).
     let widgetIDs;
 
-@@ -2562,7 +2562,7 @@ var gUnifiedExtensions = {
+@@ -2561,7 +2561,7 @@ var gUnifiedExtensions = {
     }
 
     // The list of overflowed extensions in the extensions panel.
@@ -56,7 +56,7 @@ index cfb6b8dd5443966d0635c3d7b477a68eca8fa9e0..c876890706b1a314c7760bbe1ff5e9eb
       "#overflowed-extensions-list"
     );
 
-@@ -2663,37 +2663,41 @@ var gUnifiedExtensions = {
+@@ -2662,37 +2662,41 @@ var gUnifiedExtensions = {
       );
       template.replaceWith(template.content);
       this._panel = document.getElementById("unified-extensions-panel");
@@ -123,7 +123,7 @@ index cfb6b8dd5443966d0635c3d7b477a68eca8fa9e0..c876890706b1a314c7760bbe1ff5e9eb
     if (!CustomizationHandler.isCustomizing()) {
       if (aEvent) {
         if (
-@@ -2715,6 +2719,7 @@ var gUnifiedExtensions = {
+@@ -2714,6 +2718,7 @@ var gUnifiedExtensions = {
         // and no alternative content is available for display in the panel.
         const policies = this.getActivePolicies();
         if (
@@ -131,7 +131,7 @@ index cfb6b8dd5443966d0635c3d7b477a68eca8fa9e0..c876890706b1a314c7760bbe1ff5e9eb
           policies.length &&
           !this.hasExtensionsInPanel(policies) &&
           !this.isPrivateWindowMissingExtensionsWithoutPBMAccess() &&
-@@ -2730,32 +2735,30 @@ var gUnifiedExtensions = {
+@@ -2729,32 +2734,30 @@ var gUnifiedExtensions = {
       this.blocklistAttentionInfo =
         await AddonManager.getBlocklistAttentionInfo();
 
@@ -170,7 +170,7 @@ index cfb6b8dd5443966d0635c3d7b477a68eca8fa9e0..c876890706b1a314c7760bbe1ff5e9eb
           triggerEvent: aEvent,
         });
       }
-@@ -2942,18 +2945,20 @@ var gUnifiedExtensions = {
+@@ -2941,18 +2944,20 @@ var gUnifiedExtensions = {
       this._maybeMoveWidgetNodeBack(widgetId);
     }
 
--- a/src/browser/base/content/browser-box-inc-xhtml.patch
+++ b/src/browser/base/content/browser-box-inc-xhtml.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-box.inc.xhtml b/browser/base/content/browser-box.inc.xhtml
-index 2faed30e09511c381051bc40910a883d1d7bc10d..6ba2d0d91235ed33e4b4bad281c974b5960beaa2 100644
+index afa7f8e7dd74173bf2c696bd96f7e86e8b0126bc..4847c24923f673e91eb7fb65ea6b037f38062405 100644
 --- a/browser/base/content/browser-box.inc.xhtml
 +++ b/browser/base/content/browser-box.inc.xhtml
-@@ -25,7 +25,13 @@
+@@ -25,7 +25,15 @@
     </stack>
   </vbox>
   <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
@@ -15,10 +15,6 @@ index 2faed30e09511c381051bc40910a883d1d7bc10d..6ba2d0d91235ed33e4b4bad281c974b5
 +#include zen-tabbrowser-elements.inc.xhtml
     <tabpanels id="tabbrowser-tabpanels" flex="1" selectedIndex="0"/>
   </tabbox>
-   <splitter id="ai-window-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="none" resizeafter="sibling" hidden="true"/>
-@@ -34,3 +40,5 @@
-     </stack>
-   </vbox>
 </hbox>
 +</vbox>
 +</hbox>
--- a/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch
+++ b/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch
@@ -1,13 +1,19 @@
 diff --git a/browser/base/content/browser-fullScreenAndPointerLock.js b/browser/base/content/browser-fullScreenAndPointerLock.js
-index 0e1aa344c084abdce40058278b12a042a4510997..50c06aaab823cb8572eee2ad53a7b709b1cfd084 100644
+index f459f3ca4048c29a32832b46ba87de8552a0ab8a..d317676e6d12d756ddf5dfbffe73050de07c2375 100644
 --- a/browser/base/content/browser-fullScreenAndPointerLock.js
 +++ b/browser/base/content/browser-fullScreenAndPointerLock.js
-@@ -425,8 +425,6 @@ var FullScreen = {
+@@ -423,10 +423,10 @@ var FullScreen = {
     gNavToolbox.classList.toggle("fullscreen-with-menubar", shiftSize > 0);
 
     let transform = shiftSize > 0 ? `translateY(${shiftSize}px)` : "";
 -    gNavToolbox.style.transform = transform;
-    gURLBar.style.transform = gURLBar.hasAttribute("breakout") ? transform : "";
+-    gURLBar.textbox.style.transform = gURLBar.textbox.hasAttribute("breakout")
+-      ? transform
+-      : "";
+    //gNavToolbox.style.transform = transform;
+    //gURLBar.textbox.style.transform = gURLBar.textbox.hasAttribute("breakout")
+    //  ? transform
+    //  : "";
     if (shiftSize > 0) {
       // If the mouse tracking missed our fullScreenToggler, then the toolbox
       // might not have been shown before the menubar is animated down. Make
--- a/src/browser/base/content/browser-init-js.patch
+++ b/src/browser/base/content/browser-init-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-init.js b/browser/base/content/browser-init.js
-index 288a79e5fb4da24cffcb30fb4b8adc9604b15d26..bf9bd3e666dfb6298dbeec0546cae223a7bc68f0 100644
+index 02f601d859ea32557af572d2499ad8be75b684b5..b1a6f66a74f75150d7e2fbc50528965bb16cb4d9 100644
 --- a/browser/base/content/browser-init.js
 +++ b/browser/base/content/browser-init.js
-@@ -200,6 +200,7 @@ var gBrowserInit = {
+@@ -198,6 +198,7 @@ var gBrowserInit = {
   },
 
   onLoad() {
@@ -10,7 +10,7 @@ index 288a79e5fb4da24cffcb30fb4b8adc9604b15d26..bf9bd3e666dfb6298dbeec0546cae223
     gBrowser.addEventListener("DOMUpdateBlockedPopups", e =>
       PopupAndRedirectBlockerObserver.handleEvent(e)
     );
-@@ -375,6 +376,7 @@ var gBrowserInit = {
+@@ -372,6 +373,7 @@ var gBrowserInit = {
 
     this._handleURIToLoad();
 
--- a/src/browser/base/content/browser-js.patch
+++ b/src/browser/base/content/browser-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
-index 16cf3e201358d24c9216f9b06b0ba3b89684d32a..2cfa507bbdc96b8a293b18595d0beae031fe6119 100644
+index 15ef352c147eff781d34a3e5fa02fa791bdd6188..b0784e817ad25c7a4983e9f1cb08b293de15a99d 100644
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
-@@ -33,6 +33,7 @@ ChromeUtils.defineESModuleGetters(this, {
+@@ -31,6 +31,7 @@ ChromeUtils.defineESModuleGetters(this, {
     "resource://gre/modules/ContextualIdentityService.sys.mjs",
   CustomizableUI:
     "moz-src:///browser/components/customizableui/CustomizableUI.sys.mjs",
@@ -10,7 +10,7 @@ index 16cf3e201358d24c9216f9b06b0ba3b89684d32a..2cfa507bbdc96b8a293b18595d0beae0
   DevToolsSocketStatus:
     "resource://devtools/shared/security/DevToolsSocketStatus.sys.mjs",
   DownloadUtils: "resource://gre/modules/DownloadUtils.sys.mjs",
-@@ -819,7 +820,12 @@ function UpdateBackForwardCommands(aWebNavigation) {
+@@ -821,7 +822,12 @@ function UpdateBackForwardCommands(aWebNavigation) {
 
   var backDisabled = backCommand.hasAttribute("disabled");
   var forwardDisabled = forwardCommand.hasAttribute("disabled");
@@ -24,7 +24,7 @@ index 16cf3e201358d24c9216f9b06b0ba3b89684d32a..2cfa507bbdc96b8a293b18595d0beae0
     if (backDisabled) {
       backCommand.removeAttribute("disabled");
     } else {
-@@ -2305,6 +2311,8 @@ var XULBrowserWindow = {
+@@ -2297,6 +2303,8 @@ var XULBrowserWindow = {
     AboutReaderParent.updateReaderButton(gBrowser.selectedBrowser);
     TranslationsParent.onLocationChange(gBrowser.selectedBrowser);
 
@@ -33,7 +33,7 @@ index 16cf3e201358d24c9216f9b06b0ba3b89684d32a..2cfa507bbdc96b8a293b18595d0beae0
     PictureInPicture.updateUrlbarToggle(gBrowser.selectedBrowser);
 
     if (!gMultiProcessBrowser) {
-@@ -3818,7 +3826,7 @@ function warnAboutClosingWindow() {
+@@ -3808,7 +3816,7 @@ function warnAboutClosingWindow() {
 
   if (!isPBWindow && !toolbar.visible) {
     return gBrowser.warnAboutClosingTabs(
@@ -42,7 +42,7 @@ index 16cf3e201358d24c9216f9b06b0ba3b89684d32a..2cfa507bbdc96b8a293b18595d0beae0
       gBrowser.closingTabsEnum.ALL
     );
   }
-@@ -3858,7 +3866,7 @@ function warnAboutClosingWindow() {
+@@ -3848,7 +3856,7 @@ function warnAboutClosingWindow() {
     return (
       isPBWindow ||
       gBrowser.warnAboutClosingTabs(
@@ -51,7 +51,7 @@ index 16cf3e201358d24c9216f9b06b0ba3b89684d32a..2cfa507bbdc96b8a293b18595d0beae0
         gBrowser.closingTabsEnum.ALL
       )
     );
-@@ -3883,7 +3891,7 @@ function warnAboutClosingWindow() {
+@@ -3873,7 +3881,7 @@ function warnAboutClosingWindow() {
     AppConstants.platform != "macosx" ||
     isPBWindow ||
     gBrowser.warnAboutClosingTabs(
@@ -60,7 +60,7 @@ index 16cf3e201358d24c9216f9b06b0ba3b89684d32a..2cfa507bbdc96b8a293b18595d0beae0
       gBrowser.closingTabsEnum.ALL
     )
   );
-@@ -4806,6 +4814,9 @@ var ConfirmationHint = {
+@@ -4795,6 +4803,9 @@ var ConfirmationHint = {
     MozXULElement.insertFTLIfNeeded("toolkit/branding/brandings.ftl");
     MozXULElement.insertFTLIfNeeded("browser/confirmationHints.ftl");
     document.l10n.setAttributes(this._message, messageId, options.l10nArgs);
--- a/src/browser/base/content/browser-places-js.patch
+++ b/src/browser/base/content/browser-places-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js
-index 925d74575827340960706718a29426bdf079b47c..921feb0e4229706b4691a43c9fc1005cbfd90999 100644
+index 3bd7b8f6025a7df4ce5cfb66916125bce9ef3991..c408ef829b7540aec72b2307e5d4bfa34109d6cd 100644
 --- a/browser/base/content/browser-places.js
 +++ b/browser/base/content/browser-places.js
@@ -249,6 +249,8 @@ var StarUI = {
@@ -33,7 +33,7 @@ index 925d74575827340960706718a29426bdf079b47c..921feb0e4229706b4691a43c9fc1005c
   removeBookmarkButtonCommand: function SU_removeBookmarkButtonCommand() {
     this._removeBookmarksOnPopupHidden = true;
     this.panel.hidePopup();
-@@ -1806,6 +1823,7 @@ var BookmarkingUI = {
+@@ -1797,6 +1814,7 @@ var BookmarkingUI = {
       document.getElementById("context-bookmarkpage"),
       PanelMultiView.getViewNode(document, "panelMenuBookmarkThisPage"),
       document.getElementById("pageAction-panel-bookmark"),
--- a/src/browser/base/content/browser-sets-inc.patch
+++ b/src/browser/base/content/browser-sets-inc.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
-index 139f7c2617f5e4843e0072435818c859def2f6bb..6ac1467b4117e2d76102d6977f13268827b4588f 100644
+index 8d97b6e669954a09afe6a46d1c79652264494e92..86877b983207c5f9852c9192ee0257a909c5ea7a 100644
 --- a/browser/base/content/browser-sets.inc
 +++ b/browser/base/content/browser-sets.inc
-@@ -413,3 +413,4 @@
+@@ -406,3 +406,4 @@
          internal="true"/>
 #endif
   </keyset>
--- a/src/browser/base/content/browser-sets-js.patch
+++ b/src/browser/base/content/browser-sets-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-sets.js b/browser/base/content/browser-sets.js
-index 94a05a510204c027e482fda33deaf3dc0d7471c9..79d37a7c7f29739d3ad2d9f6a3b3b8d638836b10 100644
+index 0bb581aa34ddeef1e3eb85b0fadd41a539b4b9d6..cbe2df8b1775cb8194007ee995fd91769618b48d 100644
 --- a/browser/base/content/browser-sets.js
 +++ b/browser/base/content/browser-sets.js
-@@ -266,7 +266,7 @@ document.addEventListener(
+@@ -254,7 +254,7 @@ document.addEventListener(
         }
       });
 
--- a/src/browser/base/content/browser-xhtml.patch
+++ b/src/browser/base/content/browser-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
-index ac82dcd286b5502d1ba38ed740813db08941eb7b..c26b3f0468ee6acd7716d4e8a24ad8cc84fce186 100644
+index 246d23a77960d25f78b163429a3ed28c7180ccd7..1c26485d8464413689767c8a38aadbcadcecae4d 100644
 --- a/browser/base/content/browser.xhtml
 +++ b/browser/base/content/browser.xhtml
@@ -19,6 +19,7 @@
@@ -10,7 +10,7 @@ index ac82dcd286b5502d1ba38ed740813db08941eb7b..c26b3f0468ee6acd7716d4e8a24ad8cc
         persist="screenX screenY width height sizemode"
         data-l10n-sync="true">
 <head>
-@@ -99,8 +100,10 @@
+@@ -98,8 +99,10 @@
 
   <title data-l10n-id="browser-main-window-default-title"></title>
 
@@ -21,7 +21,7 @@ index ac82dcd286b5502d1ba38ed740813db08941eb7b..c26b3f0468ee6acd7716d4e8a24ad8cc
 </head>
 <html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 # All sets except for popupsets (commands, keys, and stringbundles)
-@@ -133,9 +136,11 @@
+@@ -132,9 +135,11 @@
     </vbox>
   </html:template>
 
--- a/src/browser/base/content/main-popupset-inc-xhtml.patch
+++ b/src/browser/base/content/main-popupset-inc-xhtml.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/main-popupset.inc.xhtml b/browser/base/content/main-popupset.inc.xhtml
-index 79b604c5965ba03762acbf085c9288c73001ec24..d75d5481e5de93c592850e39d4b0b4fd07e12678 100644
+index e688ba37c40ea602a32a84af6c1497d884ddc27b..ad8515eae1d4e697b9329d9d5babfd59679c9288 100644
 --- a/browser/base/content/main-popupset.inc.xhtml
 +++ b/browser/base/content/main-popupset.inc.xhtml
-@@ -226,6 +226,10 @@
+@@ -216,6 +216,10 @@
            hidden="true"
            tabspecific="true"
            aria-labelledby="editBookmarkPanelTitle">
@@ -13,7 +13,7 @@ index 79b604c5965ba03762acbf085c9288c73001ec24..d75d5481e5de93c592850e39d4b0b4fd
       <box class="panel-header">
         <html:h1>
           <html:span id="editBookmarkPanelTitle"/>
-@@ -251,6 +255,7 @@
+@@ -241,6 +245,7 @@
                   class="footer-button"/>
         </html:moz-button-group>
       </vbox>
@@ -21,7 +21,7 @@ index 79b604c5965ba03762acbf085c9288c73001ec24..d75d5481e5de93c592850e39d4b0b4fd
     </panel>
   </html:template>
 
-@@ -656,6 +661,8 @@
+@@ -636,6 +641,8 @@
 
 #include popup-notifications.inc.xhtml
 
--- a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
+++ b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
-index 68c24f730d56f548cf1e286198a04f8363529378..71418c93ce7216d71412f2fa67295322bb73abad 100644
+index 40dddda5a6191c2ac012767ca55ed5fa35c03a6b..2e96a7ca233529ee2b570f94154008be5b0088e3 100644
 --- a/browser/base/content/navigator-toolbox.inc.xhtml
 +++ b/browser/base/content/navigator-toolbox.inc.xhtml
@@ -2,7 +2,7 @@
--- 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 15469e9d9b91c1eaef2578c9e43b6999edac3392..553402b41bc15f7cd99bf87c54416dc66d7c03e7 100644
+index 7b776b15d52367a008ce6bf53dcfcbbe007b7453..da23f716c753f5a43f17bb5ed7a3d335891168c2 100644
 --- a/browser/base/content/navigator-toolbox.js
 +++ b/browser/base/content/navigator-toolbox.js
@@ -6,7 +6,7 @@
@@ -11,9 +11,9 @@ index 15469e9d9b91c1eaef2578c9e43b6999edac3392..553402b41bc15f7cd99bf87c54416dc6
     const widgetOverflow = document.getElementById("widget-overflow");
 
     function onPopupShowing(event) {
-@@ -184,6 +184,7 @@ document.addEventListener(
-         #forward-button,
+@@ -185,6 +185,7 @@ document.addEventListener(
         #reload-button ,
+         #urlbar-go-button,
         #reader-mode-button,
 +        #zen-tabs-wrapper,
         #picture-in-picture-button,
@@ -27,15 +27,15 @@ index 15469e9d9b91c1eaef2578c9e43b6999edac3392..553402b41bc15f7cd99bf87c54416dc6
           gBrowser.handleNewTabMiddleClick(element, event);
           break;
 
-@@ -318,6 +320,7 @@ document.addEventListener(
+@@ -316,6 +318,7 @@ document.addEventListener(
         #downloads-button,
         #fxa-toolbar-menu-button,
         #unified-extensions-button,
 +        #zen-site-data-icon-button,
-         #library-button,
-         #split-view-button
+         #library-button
       `);
-@@ -401,6 +404,16 @@ document.addEventListener(
+       if (!element) {
+@@ -398,6 +401,16 @@ document.addEventListener(
           gUnifiedExtensions.togglePanel(event);
           break;
 
--- a/src/browser/base/content/nsContextMenu-sys-mjs.patch
+++ b/src/browser/base/content/nsContextMenu-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/nsContextMenu.sys.mjs b/browser/base/content/nsContextMenu.sys.mjs
-index d9fbd3a9a78c993c89efa75be9e2ffc975158aba..e64382b32580c2d113774e76e3587002ce0aebad 100644
+index b77c12da637ba31aca6e8100187d0ac14db33298..4fbec0dda932bcaa77ce714826ac8ab20b9e8e63 100644
 --- a/browser/base/content/nsContextMenu.sys.mjs
 +++ b/browser/base/content/nsContextMenu.sys.mjs
-@@ -371,6 +371,9 @@ export class nsContextMenu {
+@@ -376,6 +376,9 @@ export class nsContextMenu {
     this.initPDFItems();
     this.initTextFragmentItems();
 
--- a/src/browser/base/content/zen-keysets.inc.xhtml
+++ b/src/browser/base/content/zen-keysets.inc.xhtml
@@ -4,10 +4,4 @@

 #include zen-commands.inc.xhtml

-<keyset id="zenKeyset">
-# Prefetch these keys because they are being used by the native menu bar
-# and they need to be available even before the XUL is fully loaded and
-# our KBS sysmtem is initialized.
-  <key id="zen-workspace-forward" />
-  <key id="zen-workspace-backward" />
-</keyset>
+<keyset id="zenKeyset"></keyset>
--- a/src/browser/components/BrowserGlue-sys-mjs.patch
+++ b/src/browser/components/BrowserGlue-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs
-index 8acc1e5a97f769dc76d30ca0534f28b0a4511ab5..bd54169f976d3abe7d122b0efc0fa0d0626179eb 100644
+index 5dcbb1705625746afd7c57b7a6044c4fa2f00afd..c0872057ec65fe8ebdb2f81e47198dec5d6f0faf 100644
 --- a/browser/components/BrowserGlue.sys.mjs
 +++ b/browser/components/BrowserGlue.sys.mjs
@@ -8,6 +8,7 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
--- a/src/browser/components/aboutlogins/content/components/login-list-css.patch
+++ b/src/browser/components/aboutlogins/content/components/login-list-css.patch
@@ -0,0 +1,22 @@
+diff --git a/browser/components/aboutlogins/content/components/login-list.css b/browser/components/aboutlogins/content/components/login-list.css
+index e8d2077ca425d9a2b924aa6ac6ba8ada36b76615..95a8ab3dcff832f16068b6739526e8e29f0b4e26 100644
+--- a/browser/components/aboutlogins/content/components/login-list.css
+++ b/browser/components/aboutlogins/content/components/login-list.css
+@@ -3,7 +3,7 @@
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ 
+ :host {
+-  border-inline-end: 1px solid var(--in-content-border-color);
+  border: 1px solid var(--in-content-border-color);
+   background-color: var(--background-color-box);
+   display: flex;
+   flex-direction: column;
+@@ -162,3 +162,8 @@ ol {
+   font-size: 0.85em;
+   color: var(--text-color-deemphasized);
+ }
+
+:host {
+  border-radius: 5px;
+  margin: 10px;
+}
--- a/src/browser/components/asrouter/modules/FeatureCallout-sys-mjs.patch
+++ b/src/browser/components/asrouter/modules/FeatureCallout-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/asrouter/modules/FeatureCallout.sys.mjs b/browser/components/asrouter/modules/FeatureCallout.sys.mjs
-index 80dd8b5e357acc9decea6cf621c4868d547a0eb3..8a5fea6ed1a62a5930bafffcbbde3ce3292e42a1 100644
+index 4ea9c9e88a1831dad7e42ebd8d0dd507102e8280..316aa626e525f05caac7f315e0ea7ae9d822b6af 100644
 --- a/browser/components/asrouter/modules/FeatureCallout.sys.mjs
 +++ b/browser/components/asrouter/modules/FeatureCallout.sys.mjs
-@@ -778,6 +778,7 @@ export class FeatureCallout {
+@@ -777,6 +777,7 @@ export class FeatureCallout {
     ) {
       return false;
     }
--- a/src/browser/components/customizableui/content/panelUI-js.patch
+++ b/src/browser/components/customizableui/content/panelUI-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
-index d016811caa6c1ecc947fd705f6e1b27e3b5a12a5..89f2a9ec9ebd80e744ed0118e1b3c164151cf2b8 100644
+index d6393080aa8aff6c0f7b2043fd408b6f6249d0c4..bf37b46c4743b7619393c730720204380635666a 100644
 --- a/browser/components/customizableui/content/panelUI.js
 +++ b/browser/components/customizableui/content/panelUI.js
-@@ -619,10 +619,12 @@ const PanelUI = {
+@@ -608,10 +608,12 @@ const PanelUI = {
     if (hasKids && !this.navbar.hasAttribute("nonemptyoverflow")) {
       this.navbar.setAttribute("nonemptyoverflow", "true");
       this.overflowPanel.setAttribute("hasfixeditems", "true");
@@ -15,7 +15,7 @@ index d016811caa6c1ecc947fd705f6e1b27e3b5a12a5..89f2a9ec9ebd80e744ed0118e1b3c164
     }
   },
 
-@@ -970,7 +972,7 @@ const PanelUI = {
+@@ -959,7 +961,7 @@ const PanelUI = {
         el.removeAttribute("data-lazy-l10n-id");
       });
 
--- a/src/browser/components/preferences/jar-mn.patch
+++ b/src/browser/components/preferences/jar-mn.patch
@@ -1,10 +1,11 @@
 diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn
-index 5e53352fdbd25d2aed40d0117c3ad7072b9acf8c..0f400864ba7cc850d212ddeeefb71a06376e845f 100644
+index 7c5f6e9053f119a790f83a68c75ee11a6c172d98..cb0e1386318e8a8df24dfbbf8430d0a09fe07d16 100644
 --- a/browser/components/preferences/jar.mn
 +++ b/browser/components/preferences/jar.mn
-@@ -42,3 +42,5 @@ browser.jar:
+@@ -37,3 +37,5 @@ browser.jar:
+    content/browser/preferences/widgets/security-privacy-card.mjs        (widgets/security-privacy/security-privacy-card/security-privacy-card.mjs)
+    content/browser/preferences/widgets/security-privacy-card.css        (widgets/security-privacy/security-privacy-card/security-privacy-card.css)
    content/browser/preferences/widgets/sync-device-name.mjs          (widgets/sync-device-name/sync-device-name.mjs)
-    content/browser/preferences/widgets/sync-engines-list.mjs          (widgets/sync-engine-list/sync-engines-list.mjs)
-    content/browser/preferences/widgets/sync-engines-list.css          (widgets/sync-engine-list/sync-engines-list.css)
 +
 +   content/browser/preferences/zen-settings.js
+\ No newline at end of file
--- a/src/browser/components/preferences/main-inc-xhtml.patch
+++ b/src/browser/components/preferences/main-inc-xhtml.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/main.inc.xhtml b/browser/components/preferences/main.inc.xhtml
-index d218a04e0ab44e6a55e368566c97df95e939565b..59f038e59fe1a8554a8b112c5ac33e700b71c79c 100644
+index bfddd91e6b524f2ebced985f5d12a4963e5c6075..7e80c0a293aae6356e53d9c9760017290e97ffa0 100644
 --- a/browser/components/preferences/main.inc.xhtml
 +++ b/browser/components/preferences/main.inc.xhtml
-@@ -48,7 +48,8 @@
+@@ -141,7 +141,8 @@
 <!-- Browser layout -->
 <groupbox data-category="paneGeneral"
           data-subcategory="layout"
@@ -12,7 +12,7 @@ index d218a04e0ab44e6a55e368566c97df95e939565b..59f038e59fe1a8554a8b112c5ac33e70
   <label><html:h2 data-l10n-id="browser-layout-header"/></label>
   <radiogroup id="browserLayoutRadioGroup" preference="sidebar.verticalTabs">
     <radio id="browserLayoutHorizontalTabs" data-l10n-id="browser-layout-horizontal-tabs" value="false"/>
-@@ -253,6 +254,7 @@
+@@ -346,6 +347,7 @@
               languages-customize-add.label,
             " />
   </hbox>
--- a/src/browser/components/preferences/main-js.patch
+++ b/src/browser/components/preferences/main-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
-index 6f99cbf973d414ffd4036d17740abe963629db37..520dcce0adb06c5ebfee8c76f72f7d7b40e106da 100644
+index a184086f10d6a919c8125ab5d7728319256b3b73..7c826000ccdc8a55a12a08bdc2c547d886e5610c 100644
 --- a/browser/components/preferences/main.js
 +++ b/browser/components/preferences/main.js
-@@ -1729,6 +1729,11 @@ SettingGroupManager.registerGroups({
+@@ -1117,6 +1117,11 @@ let SETTINGS_CONFIG = {
         id: "browserRestoreSession",
         l10nId: "startup-restore-windows-and-tabs",
       },
@@ -14,7 +14,7 @@ index 6f99cbf973d414ffd4036d17740abe963629db37..520dcce0adb06c5ebfee8c76f72f7d7b
       {
         id: "windowsLaunchOnLogin",
         l10nId: "windows-launch-on-login",
-@@ -3133,7 +3138,7 @@ function getBundleForLocales(newLocales) {
+@@ -1700,7 +1705,7 @@ function getBundleForLocales(newLocales) {
     ])
   );
   return new Localization(
--- 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 7d6835b8636f771943b8081b7d56f579812026c2..97227eec4baeffd39b23ed6194ce7fa108c3b862 100644
+index a0e16b375f0ad7ef58bf68d7574453ef37d4557f..2d5b5a0715b5ed8ebe592eebea0219a6cde17b52 100644
 --- a/browser/components/preferences/preferences.js
 +++ b/browser/components/preferences/preferences.js
-@@ -124,6 +124,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () {
+@@ -118,6 +118,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () {
       styleSheets: [
         "chrome://browser/skin/preferences/dialog.css",
         "chrome://browser/skin/preferences/preferences.css",
@@ -10,7 +10,7 @@ index 7d6835b8636f771943b8081b7d56f579812026c2..97227eec4baeffd39b23ed6194ce7fa1
       ],
       resizeCallback: async ({ title, frame }) => {
         // Search within main document and highlight matched keyword.
-@@ -344,6 +345,10 @@ function init_all() {
+@@ -225,6 +226,10 @@ function init_all() {
   register_module("paneSearch", gSearchPane);
   register_module("panePrivacy", gPrivacyPane);
   register_module("paneContainers", gContainersPane);
@@ -19,5 +19,5 @@ index 7d6835b8636f771943b8081b7d56f579812026c2..97227eec4baeffd39b23ed6194ce7fa1
 +  register_module("paneZenCKS", gZenCKSSettings);
 +  register_module("paneZenMarketplace", gZenMarketplaceManager);
 
-   for (let [id, config] of Object.entries(CONFIG_PANES)) {
-     SettingPaneManager.registerPane(id, config);
+   for (let [subPane, config] of Object.entries(CONFIG_PANES)) {
+     subPane = friendlyPrefCategoryNameToInternalName(subPane);
--- a/src/browser/components/preferences/preferences-xhtml.patch
+++ b/src/browser/components/preferences/preferences-xhtml.patch
@@ -1,9 +1,9 @@
 diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
-index a1aec823d6266d69ff02aa8523d2da999a0871b9..559f2ea12e53dd19f24e7953db4388456b97f02c 100644
+index 993554d64efa6ce39fbcc01d4676a69199e158ff..e69aec388162997ef7cb93481cfedb9d102b4fe0 100644
 --- a/browser/components/preferences/preferences.xhtml
 +++ b/browser/components/preferences/preferences.xhtml
-@@ -46,6 +46,8 @@
-   <link rel="stylesheet" href="chrome://browser/content/preferences/widgets/setting-pane.css" />
+@@ -45,6 +45,8 @@
+   <link rel="stylesheet" href="chrome://browser/content/preferences/widgets/setting-group.css" />
   <link rel="stylesheet" href="chrome://browser/content/preferences/widgets/setting-control.css" />
 
 +#include zen-preferences-links.xhtml
@@ -11,7 +11,7 @@ index a1aec823d6266d69ff02aa8523d2da999a0871b9..559f2ea12e53dd19f24e7953db438845
   <link rel="localization" href="branding/brand.ftl"/>
   <link rel="localization" href="browser/browser.ftl"/>
     <!-- Used by fontbuilder.js -->
-@@ -115,6 +117,11 @@
+@@ -113,6 +115,11 @@
   <hbox flex="1">
 
     <vbox class="navigation">
@@ -23,7 +23,7 @@ index a1aec823d6266d69ff02aa8523d2da999a0871b9..559f2ea12e53dd19f24e7953db438845
       <!-- category list -->
       <richlistbox id="categories" data-l10n-id="category-list" data-l10n-attrs="aria-label">
         <richlistitem id="category-general"
-@@ -127,6 +134,50 @@
+@@ -125,6 +132,50 @@
           <label class="category-name" flex="1" data-l10n-id="pane-general-title"></label>
         </richlistitem>
 
@@ -74,7 +74,7 @@ index a1aec823d6266d69ff02aa8523d2da999a0871b9..559f2ea12e53dd19f24e7953db438845
         <richlistitem id="category-home"
                       class="category"
                       value="paneHome"
-@@ -242,11 +293,6 @@
+@@ -236,11 +287,6 @@
                 <html:a href="about:policies" target="_blank" data-l10n-id="managed-notice"/>
               </hbox>
             </hbox>
@@ -86,7 +86,7 @@ index a1aec823d6266d69ff02aa8523d2da999a0871b9..559f2ea12e53dd19f24e7953db438845
           </hbox>
         </hbox>
         <vbox id="mainPrefPane">
-@@ -260,6 +306,10 @@
+@@ -254,6 +300,10 @@
 #include sync.inc.xhtml
 #include experimental.inc.xhtml
 #include moreFromMozilla.inc.xhtml
--- a/src/browser/components/screenshots/overlay/overlay-css.patch
+++ b/src/browser/components/screenshots/overlay/overlay-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/screenshots/overlay/overlay.css b/browser/components/screenshots/overlay/overlay.css
-index 43a5d2109ad107ce1c79eef7cb8635bc1fa813f7..c1e5648d0e71826119bda1bc18c5d16886bab8fd 100644
+index ee2740fc48e9b70fe17b0f27b60053209516dbbf..cc0270e0eb28c3e60216460b02d62111abb970de 100644
 --- a/browser/components/screenshots/overlay/overlay.css
 +++ b/browser/components/screenshots/overlay/overlay.css
@@ -196,6 +196,9 @@
--- a/src/browser/components/search/SearchUIUtils-sys-mjs.patch
+++ b/src/browser/components/search/SearchUIUtils-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/search/SearchUIUtils.sys.mjs b/browser/components/search/SearchUIUtils.sys.mjs
-index 65daa1402a52e252360386e60471f726c1387bb3..be8f588316a8a4d7f33a324bf11f9e1f19def32d 100644
+index 15fdb0cd7664c2b49977902d7f4c7a117d82cf15..6aedbc18de6604b63b2586e7d9745a4c4e7e38ae 100644
 --- a/browser/components/search/SearchUIUtils.sys.mjs
 +++ b/browser/components/search/SearchUIUtils.sys.mjs
-@@ -444,7 +444,7 @@ export var SearchUIUtils = {
+@@ -434,7 +434,7 @@ export var SearchUIUtils = {
         triggeringSearchEngine: engine.name,
       },
     });
--- a/src/browser/components/sessionstore/SessionFile-sys-mjs.patch
+++ b/src/browser/components/sessionstore/SessionFile-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/sessionstore/SessionFile.sys.mjs b/browser/components/sessionstore/SessionFile.sys.mjs
-index 5580838acd72bf0e1189d367984859529d89f5b4..e5fa6076a9cc6ada016ccc4e129cad455010a522 100644
+index 31140cb8be3b529a0952ca8dc55165690b0e2120..605c9e0aa84da0a2d3171a0573e8cd95e27bd0c4 100644
 --- a/browser/components/sessionstore/SessionFile.sys.mjs
 +++ b/browser/components/sessionstore/SessionFile.sys.mjs
@@ -22,6 +22,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
@@ -10,7 +10,7 @@ index 5580838acd72bf0e1189d367984859529d89f5b4..e5fa6076a9cc6ada016ccc4e129cad45
 });
 
 const PREF_UPGRADE_BACKUP = "browser.sessionstore.upgradeBackup.latestBuildID";
-@@ -381,7 +382,7 @@ var SessionFileInternal = {
+@@ -380,7 +381,7 @@ var SessionFileInternal = {
     this._readOrigin = result.origin;
 
     result.noFilesFound = noFilesFound;
--- a/src/browser/components/sessionstore/SessionStartup-sys-mjs.patch
+++ b/src/browser/components/sessionstore/SessionStartup-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/sessionstore/SessionStartup.sys.mjs b/browser/components/sessionstore/SessionStartup.sys.mjs
-index 86600ffb5178599ab23270a964064ca657a3283f..ffb22990e7d9e1b79f276fe5c1eb38f2b869a57b 100644
+index be23213ae9ec7e59358a17276c6c3764d38d9996..229bb1346f9349892acb1e9e05109b28f5a5b45f 100644
 --- a/browser/components/sessionstore/SessionStartup.sys.mjs
 +++ b/browser/components/sessionstore/SessionStartup.sys.mjs
@@ -40,6 +40,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
@@ -28,7 +28,7 @@ index 86600ffb5178599ab23270a964064ca657a3283f..ffb22990e7d9e1b79f276fe5c1eb38f2
     if (this._initialState == null) {
       // No valid session found.
       this._sessionType = this.NO_SESSION;
-@@ -336,12 +339,7 @@ export var SessionStartup = {
+@@ -335,12 +338,7 @@ export var SessionStartup = {
   isAutomaticRestoreEnabled() {
     if (this._resumeSessionEnabled === null) {
       this._resumeSessionEnabled =
--- a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
+++ b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
-index 2a055f0c5f34f0a2667f659185120c07d38f4e41..959e73ab86bdb78203e3aed0c939c1b9acbe4897 100644
+index 2c2f43bf743ef458b378e85e9ed44a971711e1d9..429a26849cec23836f5bff3bd1a6376050311377 100644
 --- a/browser/components/sessionstore/SessionStore.sys.mjs
 +++ b/browser/components/sessionstore/SessionStore.sys.mjs
@@ -127,6 +127,9 @@ const TAB_EVENTS = [
@@ -20,7 +20,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..959e73ab86bdb78203e3aed0c939c1b9
 });
 
 ChromeUtils.defineLazyGetter(lazy, "blankURI", () => {
-@@ -1261,10 +1265,7 @@ var SessionStoreInternal = {
+@@ -1238,10 +1242,7 @@ var SessionStoreInternal = {
    */
   get willAutoRestore() {
     return (
@@ -32,7 +32,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..959e73ab86bdb78203e3aed0c939c1b9
     );
   },
 
-@@ -1934,6 +1935,9 @@ var SessionStoreInternal = {
+@@ -1911,6 +1912,9 @@ var SessionStoreInternal = {
       case "TabPinned":
       case "TabUnpinned":
       case "SwapDocShells":
@@ -42,7 +42,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..959e73ab86bdb78203e3aed0c939c1b9
         this.saveStateDelayed(win);
         break;
       case "TabGroupCreate":
-@@ -2044,6 +2048,10 @@ var SessionStoreInternal = {
+@@ -2020,6 +2024,10 @@ var SessionStoreInternal = {
       this._windows[aWindow.__SSi].isTaskbarTab = true;
     }
 
@@ -53,7 +53,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..959e73ab86bdb78203e3aed0c939c1b9
     let tabbrowser = aWindow.gBrowser;
 
     // add tab change listeners to all already existing tabs
-@@ -2131,6 +2139,7 @@ var SessionStoreInternal = {
+@@ -2107,6 +2115,7 @@ var SessionStoreInternal = {
           null,
           "sessionstore-one-or-no-tab-restored"
         );
@@ -61,7 +61,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..959e73ab86bdb78203e3aed0c939c1b9
         this._deferredAllWindowsRestored.resolve();
       }
       // this window was opened by _openWindowWithState
-@@ -2175,7 +2184,6 @@ var SessionStoreInternal = {
+@@ -2151,7 +2160,6 @@ var SessionStoreInternal = {
       if (closedWindowState) {
         let newWindowState;
         if (
@@ -69,7 +69,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..959e73ab86bdb78203e3aed0c939c1b9
           !lazy.SessionStartup.willRestore()
         ) {
           // We want to split the window up into pinned tabs and unpinned tabs.
-@@ -2239,6 +2247,15 @@ var SessionStoreInternal = {
+@@ -2215,6 +2223,15 @@ var SessionStoreInternal = {
       });
       this._shouldRestoreLastSession = false;
     }
@@ -85,7 +85,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..959e73ab86bdb78203e3aed0c939c1b9
 
     if (this._restoreLastWindow && aWindow.toolbar.visible) {
       // always reset (if not a popup window)
-@@ -2491,7 +2508,7 @@ var SessionStoreInternal = {
+@@ -2465,7 +2482,7 @@ var SessionStoreInternal = {
       // 2) Flush the window.
       // 3) When the flush is complete, revisit our decision to store the window
       //    in _closedWindows, and add/remove as necessary.
@@ -94,7 +94,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..959e73ab86bdb78203e3aed0c939c1b9
         this.maybeSaveClosedWindow(winData, isLastWindow);
       }
 
-@@ -2512,7 +2529,7 @@ var SessionStoreInternal = {
+@@ -2486,7 +2503,7 @@ var SessionStoreInternal = {
 
         // Save non-private windows if they have at
         // least one saveable tab or are the last window.
@@ -103,7 +103,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..959e73ab86bdb78203e3aed0c939c1b9
           this.maybeSaveClosedWindow(winData, isLastWindow);
 
           if (!isLastWindow && winData.closedId > -1) {
-@@ -2608,6 +2625,7 @@ var SessionStoreInternal = {
+@@ -2582,6 +2599,7 @@ var SessionStoreInternal = {
       let alreadyStored = winIndex != -1;
       // If sidebar command is truthy, i.e. sidebar is open, store sidebar settings
       let shouldStore = hasSaveableTabs || isLastWindow;
@@ -111,7 +111,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..959e73ab86bdb78203e3aed0c939c1b9
 
       if (shouldStore && !alreadyStored) {
         let index = this._closedWindows.findIndex(win => {
-@@ -3408,7 +3426,7 @@ var SessionStoreInternal = {
+@@ -3373,7 +3391,7 @@ var SessionStoreInternal = {
     if (!isPrivateWindow && tabState.isPrivate) {
       return;
     }
@@ -120,7 +120,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..959e73ab86bdb78203e3aed0c939c1b9
       return;
     }
 
-@@ -4129,6 +4147,12 @@ var SessionStoreInternal = {
+@@ -4089,6 +4107,12 @@ var SessionStoreInternal = {
         Math.min(tabState.index, tabState.entries.length)
       );
       tabState.pinned = false;
@@ -133,7 +133,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..959e73ab86bdb78203e3aed0c939c1b9
 
       if (inBackground === false) {
         aWindow.gBrowser.selectedTab = newTab;
-@@ -4565,6 +4589,7 @@ var SessionStoreInternal = {
+@@ -4525,6 +4549,7 @@ var SessionStoreInternal = {
       // Append the tab if we're opening into a different window,
       tabIndex: aSource == aTargetWindow ? pos : Infinity,
       pinned: state.pinned,
@@ -141,7 +141,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..959e73ab86bdb78203e3aed0c939c1b9
       userContextId: state.userContextId,
       skipLoad: true,
       preferredRemoteType,
-@@ -5414,7 +5439,7 @@ var SessionStoreInternal = {
+@@ -5374,7 +5399,7 @@ var SessionStoreInternal = {
 
     for (let i = tabbrowser.pinnedTabCount; i < tabbrowser.tabs.length; i++) {
       let tab = tabbrowser.tabs[i];
@@ -150,7 +150,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..959e73ab86bdb78203e3aed0c939c1b9
         removableTabs.push(tab);
       }
     }
-@@ -5525,7 +5550,7 @@ var SessionStoreInternal = {
+@@ -5483,7 +5508,7 @@ var SessionStoreInternal = {
 
     // collect the data for all windows
     for (ix in this._windows) {
@@ -159,7 +159,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..959e73ab86bdb78203e3aed0c939c1b9
         // window data is still in _statesToRestore
         continue;
       }
-@@ -5668,11 +5693,12 @@ var SessionStoreInternal = {
+@@ -5625,11 +5650,12 @@ var SessionStoreInternal = {
     }
 
     let tabbrowser = aWindow.gBrowser;
@@ -173,7 +173,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..959e73ab86bdb78203e3aed0c939c1b9
     // update the internal state data for this window
     for (let tab of tabs) {
       if (tab == aWindow.FirefoxViewHandler.tab) {
-@@ -5683,6 +5709,9 @@ var SessionStoreInternal = {
+@@ -5640,6 +5666,9 @@ var SessionStoreInternal = {
       tabsData.push(tabData);
     }
 
@@ -183,7 +183,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..959e73ab86bdb78203e3aed0c939c1b9
     // update tab group state for this window
     winData.groups = [];
     for (let tabGroup of aWindow.gBrowser.tabGroups) {
-@@ -5695,7 +5724,7 @@ var SessionStoreInternal = {
+@@ -5652,7 +5681,7 @@ var SessionStoreInternal = {
     // a window is closed, point to the first item in the tab strip instead (it will never be the Firefox View tab,
     // since it's only inserted into the tab strip after it's selected).
     if (aWindow.FirefoxViewHandler.tab?.selected) {
@@ -192,7 +192,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..959e73ab86bdb78203e3aed0c939c1b9
       winData.title = tabbrowser.tabs[0].label;
     }
     winData.selected = selectedIndex;
-@@ -5810,8 +5839,8 @@ var SessionStoreInternal = {
+@@ -5765,8 +5794,8 @@ var SessionStoreInternal = {
     // selectTab represents.
     let selectTab = 0;
     if (overwriteTabs) {
@@ -203,7 +203,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..959e73ab86bdb78203e3aed0c939c1b9
       selectTab = Math.min(selectTab, winData.tabs.length);
     }
 
-@@ -5833,6 +5862,7 @@ var SessionStoreInternal = {
+@@ -5788,6 +5817,7 @@ var SessionStoreInternal = {
     if (overwriteTabs) {
       for (let i = tabbrowser.browsers.length - 1; i >= 0; i--) {
         if (!tabbrowser.tabs[i].selected) {
@@ -211,7 +211,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..959e73ab86bdb78203e3aed0c939c1b9
           tabbrowser.removeTab(tabbrowser.tabs[i]);
         }
       }
-@@ -5866,6 +5896,12 @@ var SessionStoreInternal = {
+@@ -5821,6 +5851,12 @@ var SessionStoreInternal = {
         savedTabGroup => !openTabGroupIdsInWindow.has(savedTabGroup.id)
       );
     }
@@ -224,7 +224,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..959e73ab86bdb78203e3aed0c939c1b9
 
     // Move the originally open tabs to the end.
     if (initialTabs) {
-@@ -6419,6 +6455,25 @@ var SessionStoreInternal = {
+@@ -6372,6 +6408,25 @@ var SessionStoreInternal = {
 
     // Most of tabData has been restored, now continue with restoring
     // attributes that may trigger external events.
@@ -250,7 +250,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..959e73ab86bdb78203e3aed0c939c1b9
 
     if (tabData.pinned) {
       tabbrowser.pinTab(tab);
-@@ -7343,7 +7398,7 @@ var SessionStoreInternal = {
+@@ -7290,7 +7345,7 @@ var SessionStoreInternal = {
 
       let groupsToSave = new Map();
       for (let tIndex = 0; tIndex < window.tabs.length; ) {
@@ -259,7 +259,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..959e73ab86bdb78203e3aed0c939c1b9
           // Adjust window.selected
           if (tIndex + 1 < window.selected) {
             window.selected -= 1;
-@@ -7358,7 +7413,7 @@ var SessionStoreInternal = {
+@@ -7305,7 +7360,7 @@ var SessionStoreInternal = {
           );
           // We don't want to increment tIndex here.
           continue;
--- a/src/browser/components/sessionstore/TabState-sys-mjs.patch
+++ b/src/browser/components/sessionstore/TabState-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/sessionstore/TabState.sys.mjs b/browser/components/sessionstore/TabState.sys.mjs
-index 82721356d191055bec0d4b0ca49e481221988801..238d6ae1a4261e098d1e986e3c3df813d9d625f3 100644
+index 82721356d191055bec0d4b0ca49e481221988801..ffa95005b96ea384433f18dace63faa35d2d21bf 100644
 --- a/browser/components/sessionstore/TabState.sys.mjs
 +++ b/browser/components/sessionstore/TabState.sys.mjs
@@ -85,7 +85,24 @@ class _TabState {
@@ -27,3 +27,12 @@ index 82721356d191055bec0d4b0ca49e481221988801..238d6ae1a4261e098d1e986e3c3df813
 
     tabData.userContextId = tab.userContextId || 0;
 
+@@ -98,7 +115,7 @@ class _TabState {
+ 
+     // Copy data from the tab state cache only if the tab has fully finished
+     // restoring. We don't want to overwrite data contained in __SS_data.
+-    this.copyFromCache(browser.permanentKey, tabData, options);
+    this.copyFromCache(tab.permanentKey, tabData, options);
+ 
+     // After copyFromCache() was called we check for properties that are kept
+     // in the cache only while the tab is pending or restoring. Once that
--- a/src/browser/components/sidebar/browser-sidebar-js.patch
+++ b/src/browser/components/sidebar/browser-sidebar-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/sidebar/browser-sidebar.js b/browser/components/sidebar/browser-sidebar.js
-index bd6db85732e6e99ca51ce9c4c1a7d469199cf8cb..6c7859c1014baf4e343714ef797cf558d065e189 100644
+index 220c3c83fa09daaec433803a4655a20114a137a6..1ef8adc3ecfa61839bb993f7fc090133bffe77db 100644
 --- a/browser/components/sidebar/browser-sidebar.js
 +++ b/browser/components/sidebar/browser-sidebar.js
@@ -793,7 +793,7 @@ var SidebarController = {
@@ -8,6 +8,6 @@ index bd6db85732e6e99ca51ce9c4c1a7d469199cf8cb..6c7859c1014baf4e343714ef797cf558
     let contentArea = document.getElementById("tabbrowser-tabbox");
 -    let browser = document.getElementById("browser");
 +    let browser = document.getElementById("tabbrowser-tabbox");
-     [...browser.children].forEach((node, i, children) => {
-       node.style.order = this._positionStart ? i + 1 : children.length - i;
+     [...browser.children].forEach((node, i) => {
+       node.style.order = i + 1;
     });
--- a/src/browser/components/tabbrowser/AsyncTabSwitcher-sys-mjs.patch
+++ b/src/browser/components/tabbrowser/AsyncTabSwitcher-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs b/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
-index 9c5e92fbd555d328ce09c0cf0ff8078584f68478..2af7a428bc830d8c12b3d3c0af375c97e6942994 100644
+index bcd7689e9d68ef8b171c327188174334c4271e21..0a95e1137fdf4b63e0d841776ad934da1a513c6f 100644
 --- a/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
 +++ b/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
-@@ -939,6 +939,7 @@ export class AsyncTabSwitcher {
+@@ -938,6 +938,7 @@ export class AsyncTabSwitcher {
       this.tabbrowser._printPreviewBrowsers.has(browser) ||
       this.tabbrowser.splitViewBrowsers.includes(browser) ||
       lazy.PictureInPicture.isOriginatingBrowser(browser)
--- a/src/browser/components/tabbrowser/TabUnloader-sys-mjs.patch
+++ b/src/browser/components/tabbrowser/TabUnloader-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/TabUnloader.sys.mjs b/browser/components/tabbrowser/TabUnloader.sys.mjs
-index aefccef39f0b81176a5710a794e8a5e2650d6507..e073c65790df6d55e827a4f4596199f4f1a99a57 100644
+index 2a3fcbe9dfb6328cabba891697990e2467973f6e..22fdaaefa71b3c37cbccbd7ae4db044b1057f1f2 100644
 --- a/browser/components/tabbrowser/TabUnloader.sys.mjs
 +++ b/browser/components/tabbrowser/TabUnloader.sys.mjs
@@ -52,7 +52,7 @@ let CRITERIA_WEIGHT = 1;
--- a/src/browser/components/tabbrowser/TabsList-sys-mjs.patch
+++ b/src/browser/components/tabbrowser/TabsList-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/TabsList.sys.mjs b/browser/components/tabbrowser/TabsList.sys.mjs
-index 400a69449e6477da754b06530eef7c15ea9ad887..7dd22f481dade16286533acffc2c2321d4c34b41 100644
+index b394a980869d5e5df01b6afdd81e0f41c090e6ec..236c99db0dfa5ebcba50d55c1e4eb6ab7b8110b2 100644
 --- a/browser/components/tabbrowser/TabsList.sys.mjs
 +++ b/browser/components/tabbrowser/TabsList.sys.mjs
@@ -87,7 +87,7 @@ class TabsListBase {
--- a/src/browser/components/tabbrowser/content/browser-ctrlTab-js.patch
+++ b/src/browser/components/tabbrowser/content/browser-ctrlTab-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/tabbrowser/content/browser-ctrlTab.js b/browser/components/tabbrowser/content/browser-ctrlTab.js
-index 3330dc133c120e7fbeecd2a36c71f9dfba60b3fb..0243cdfe67e5eb3f68fc7cde66bb3809e79bd6c3 100644
+index 958728cde19dd7cc24692baa89e11fcab816ab82..32e2b6af2536133f170bd5e14c47392ded8440eb 100644
 --- a/browser/components/tabbrowser/content/browser-ctrlTab.js
 +++ b/browser/components/tabbrowser/content/browser-ctrlTab.js
-@@ -252,7 +252,8 @@ var ctrlTab = {
+@@ -249,7 +249,8 @@ var ctrlTab = {
   },
 
   get tabList() {
@@ -12,7 +12,7 @@ index 3330dc133c120e7fbeecd2a36c71f9dfba60b3fb..0243cdfe67e5eb3f68fc7cde66bb3809
   },
 
   init: function ctrlTab_init() {
-@@ -457,7 +458,7 @@ var ctrlTab = {
+@@ -460,7 +461,7 @@ var ctrlTab = {
     // If the tab is hidden, don't add it to the list unless it's selected
     // (Normally hidden tabs would be unhidden when selected, but that doesn't
     // happen for Firefox View).
@@ -21,7 +21,7 @@ index 3330dc133c120e7fbeecd2a36c71f9dfba60b3fb..0243cdfe67e5eb3f68fc7cde66bb3809
       return;
     }
 
-@@ -481,7 +482,7 @@ var ctrlTab = {
+@@ -484,7 +485,7 @@ var ctrlTab = {
   },
 
   open: function ctrlTab_open() {
@@ -30,7 +30,7 @@ index 3330dc133c120e7fbeecd2a36c71f9dfba60b3fb..0243cdfe67e5eb3f68fc7cde66bb3809
       return;
     }
 
-@@ -751,7 +752,7 @@ var ctrlTab = {
+@@ -763,7 +764,7 @@ var ctrlTab = {
   _initRecentlyUsedTabs() {
     this._recentlyUsedTabs = Array.prototype.filter.call(
       gBrowser.tabs,
--- a/src/browser/components/tabbrowser/content/drag-and-drop-js.patch
+++ b/src/browser/components/tabbrowser/content/drag-and-drop-js.patch
@@ -1,18 +1,18 @@
 diff --git a/browser/components/tabbrowser/content/drag-and-drop.js b/browser/components/tabbrowser/content/drag-and-drop.js
-index 57800333445ec7850742145527e04ae8d504b0bb..3a5015c391c594c94aa77a7ff9b08762d36276f6 100644
+index 97b931c3c7385a52d20204369fcf6d6999053687..bd64a97046d2a62e842cc922764ad129da99905f 100644
 --- a/browser/components/tabbrowser/content/drag-and-drop.js
 +++ b/browser/components/tabbrowser/content/drag-and-drop.js
-@@ -35,6 +35,9 @@
+@@ -32,6 +32,9 @@
    * @returns {MozTabbrowserTab|vbox}
    */
   const elementToMove = element => {
 +    if (element.group?.hasAttribute("split-view-group")) {
 +      return element.group;
 +    }
-     if (isTab(element) || isSplitViewWrapper(element)) {
+     if (isTab(element)) {
       return element;
     }
-@@ -115,6 +118,9 @@
+@@ -112,6 +115,9 @@
       }
 
       let draggedTab = event.dataTransfer.mozGetDataAt(TAB_DROP_TYPE, 0);
@@ -22,7 +22,7 @@ index 57800333445ec7850742145527e04ae8d504b0bb..3a5015c391c594c94aa77a7ff9b08762
       if (
         (dropEffect == "move" || dropEffect == "copy") &&
         document == draggedTab.ownerDocument &&
-@@ -133,10 +139,6 @@
+@@ -130,10 +136,6 @@
 
           // Pinned tabs in expanded vertical mode are on a grid format and require
           // different logic to drag and drop.
@@ -33,7 +33,7 @@ index 57800333445ec7850742145527e04ae8d504b0bb..3a5015c391c594c94aa77a7ff9b08762
           this._animateTabMove(event);
           return;
         }
-@@ -269,6 +271,15 @@
+@@ -266,6 +268,15 @@
 
       this._tabDropIndicator.hidden = true;
       event.stopPropagation();
@@ -49,7 +49,7 @@ index 57800333445ec7850742145527e04ae8d504b0bb..3a5015c391c594c94aa77a7ff9b08762
       if (draggedTab && dropEffect == "copy") {
         let duplicatedDraggedTab;
         let duplicatedTabs = [];
-@@ -294,8 +305,9 @@
+@@ -291,8 +302,9 @@
         let translateOffsetY = oldTranslateY % tabHeight;
         let newTranslateX = oldTranslateX - translateOffsetX;
         let newTranslateY = oldTranslateY - translateOffsetY;
@@ -61,10 +61,10 @@ index 57800333445ec7850742145527e04ae8d504b0bb..3a5015c391c594c94aa77a7ff9b08762
 
         if (this._isContainerVerticalPinnedGrid(draggedTab)) {
           // Update both translate axis for pinned vertical expanded tabs
-@@ -311,8 +323,8 @@
+@@ -308,8 +320,8 @@
           }
         } else {
-           let tabs = this._tabbrowserTabs.dragAndDropElements.slice(
+           let tabs = this._tabbrowserTabs.ariaFocusableItems.slice(
 -            isPinned ? 0 : numPinned,
 -            isPinned ? numPinned : undefined
 +            isPinned ? (essential ? 0 : gBrowser._numZenEssentials) : numPinned,
@@ -72,7 +72,7 @@ index 57800333445ec7850742145527e04ae8d504b0bb..3a5015c391c594c94aa77a7ff9b08762
           );
           let size = this._tabbrowserTabs.verticalMode ? "height" : "width";
           let screenAxis = this._tabbrowserTabs.verticalMode
-@@ -365,11 +377,13 @@
+@@ -362,11 +374,13 @@
           this._dragToPinPromoCard,
         ];
         let shouldPin =
@@ -86,7 +86,7 @@ index 57800333445ec7850742145527e04ae8d504b0bb..3a5015c391c594c94aa77a7ff9b08762
           isTab(draggedTab) &&
           draggedTab.pinned &&
           this._tabbrowserTabs.arrowScrollbox.contains(event.target);
-@@ -387,6 +401,7 @@
+@@ -384,6 +398,7 @@
             (oldTranslateY && oldTranslateY != newTranslateY);
         } else if (this._tabbrowserTabs.verticalMode) {
           shouldTranslate &&= oldTranslateY && oldTranslateY != newTranslateY;
@@ -94,7 +94,7 @@ index 57800333445ec7850742145527e04ae8d504b0bb..3a5015c391c594c94aa77a7ff9b08762
         } else {
           shouldTranslate &&= oldTranslateX && oldTranslateX != newTranslateX;
         }
-@@ -443,7 +458,7 @@
+@@ -440,7 +455,7 @@
                 item.removeAttribute("tabdrop-samewindow");
                 resolve();
               };
@@ -103,15 +103,15 @@ index 57800333445ec7850742145527e04ae8d504b0bb..3a5015c391c594c94aa77a7ff9b08762
                 postTransitionCleanup();
               } else {
                 let onTransitionEnd = transitionendEvent => {
-@@ -584,6 +599,7 @@
+@@ -581,6 +596,7 @@
 
-           let nextItem = this._tabbrowserTabs.dragAndDropElements[newIndex];
+           let nextItem = this._tabbrowserTabs.ariaFocusableItems[newIndex];
           let tabGroup = isTab(nextItem) && nextItem.group;
 +          if (gZenViewSplitter.handleTabDrop(event, urls, replace, inBackground)) return;
           gBrowser.loadTabs(urls, {
             inBackground,
             replace,
-@@ -621,7 +637,16 @@
+@@ -618,7 +634,16 @@
         this._expandGroupOnDrop(draggedTab);
       }
       this._resetTabsAfterDrop(draggedTab.ownerDocument);
@@ -129,7 +129,7 @@ index 57800333445ec7850742145527e04ae8d504b0bb..3a5015c391c594c94aa77a7ff9b08762
       if (
         dt.mozUserCancelled ||
         dt.dropEffect != "none" ||
-@@ -825,7 +850,10 @@
+@@ -822,7 +847,10 @@
     _getDragTarget(event, { ignoreSides = false } = {}) {
       let { target } = event;
       while (target) {
@@ -141,7 +141,7 @@ index 57800333445ec7850742145527e04ae8d504b0bb..3a5015c391c594c94aa77a7ff9b08762
           break;
         }
         target = target.parentNode;
-@@ -842,14 +870,17 @@
+@@ -839,14 +867,17 @@
           return null;
         }
       }
@@ -161,7 +161,7 @@ index 57800333445ec7850742145527e04ae8d504b0bb..3a5015c391c594c94aa77a7ff9b08762
         !this._tabbrowserTabs.expandOnHover
       );
     }
-@@ -880,7 +911,8 @@
+@@ -877,7 +908,8 @@
         isTabGroupLabel(draggedTab) &&
         draggedTab._dragData?.expandGroupOnDrop
       ) {
@@ -171,7 +171,7 @@ index 57800333445ec7850742145527e04ae8d504b0bb..3a5015c391c594c94aa77a7ff9b08762
       }
     }
 
-@@ -1058,7 +1090,6 @@
+@@ -1055,7 +1087,6 @@
         // using updateDragImage. On Linux, we can use a panel.
         if (platform == "win" || platform == "macosx") {
           captureListener = function () {
@@ -179,7 +179,7 @@ index 57800333445ec7850742145527e04ae8d504b0bb..3a5015c391c594c94aa77a7ff9b08762
           };
         } else {
           // Create a panel to use it in setDragImage
-@@ -1096,7 +1127,6 @@
+@@ -1093,7 +1124,6 @@
         );
         dragImageOffset = dragImageOffset * scale;
       }
@@ -187,7 +187,7 @@ index 57800333445ec7850742145527e04ae8d504b0bb..3a5015c391c594c94aa77a7ff9b08762
 
       // _dragData.offsetX/Y give the coordinates that the mouse should be
       // positioned relative to the corner of the new window created upon
-@@ -1115,7 +1145,7 @@
+@@ -1112,7 +1142,7 @@
       let dropEffect = this.getDropEffectForTabDrag(event);
       let isMovingInTabStrip = !fromTabList && dropEffect == "move";
       let collapseTabGroupDuringDrag =
@@ -196,7 +196,7 @@ index 57800333445ec7850742145527e04ae8d504b0bb..3a5015c391c594c94aa77a7ff9b08762
 
       tab._dragData = {
         offsetX: this._tabbrowserTabs.verticalMode
-@@ -1125,7 +1155,7 @@
+@@ -1122,7 +1152,7 @@
           ? event.screenY - window.screenY - tabOffset
           : event.screenY - window.screenY,
         scrollPos:
@@ -205,7 +205,7 @@ index 57800333445ec7850742145527e04ae8d504b0bb..3a5015c391c594c94aa77a7ff9b08762
             ? this._tabbrowserTabs.pinnedTabsContainer.scrollPosition
             : this._tabbrowserTabs.arrowScrollbox.scrollPosition,
         screenX: event.screenX,
-@@ -1152,6 +1182,7 @@
+@@ -1149,6 +1179,7 @@
 
           if (collapseTabGroupDuringDrag) {
             tab.group.collapsed = true;
@@ -213,31 +213,31 @@ index 57800333445ec7850742145527e04ae8d504b0bb..3a5015c391c594c94aa77a7ff9b08762
           }
         }
       }
-@@ -1176,6 +1207,7 @@
+@@ -1173,6 +1204,7 @@
       if (tabStripItemElement.hasAttribute("dragtarget")) {
         return;
       }
 +      return;
       let isPinned = tab.pinned;
       let numPinned = gBrowser.pinnedTabCount;
-       let dragAndDropElements = this._tabbrowserTabs.dragAndDropElements;
-@@ -1601,7 +1633,6 @@
+       let allTabs = this._tabbrowserTabs.ariaFocusableItems;
+@@ -1598,7 +1630,6 @@
 
-       for (let item of this._tabbrowserTabs.dragAndDropElements) {
+       for (let item of this._tabbrowserTabs.ariaFocusableItems) {
         item = elementToMove(item);
 -        item.style.transform = "";
         item.removeAttribute("multiselected-move-together");
         delete item._moveTogetherSelectedTabsData;
       }
-@@ -2429,7 +2460,6 @@
-       for (let item of this._tabbrowserTabs.dragAndDropElements) {
+@@ -2426,7 +2457,6 @@
+       for (let item of this._tabbrowserTabs.ariaFocusableItems) {
         this._resetGroupTarget(item);
         item = elementToMove(item);
 -        item.style.transform = "";
       }
       this._tabbrowserTabs.removeAttribute("movingtab-group");
       this._tabbrowserTabs.removeAttribute("movingtab-ungroup");
-@@ -2460,17 +2490,14 @@
+@@ -2457,17 +2487,14 @@
         tab.style.left = "";
         tab.style.top = "";
         tab.style.maxWidth = "";
--- a/src/browser/components/tabbrowser/content/tab-js.patch
+++ b/src/browser/components/tabbrowser/content/tab-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tab.js b/browser/components/tabbrowser/content/tab.js
-index 6528da245d922e2ccdb59cbf8106055bc34d1e74..1cd3395961a80e3b48582794b5b5365c9b8386b3 100644
+index 2dacb325190b6ae42ebeb3e9f0e862dc690ecdca..1cc31b04e0165f7ae6ffc377da08f8d83bee7390 100644
 --- a/browser/components/tabbrowser/content/tab.js
 +++ b/browser/components/tabbrowser/content/tab.js
@@ -21,6 +21,7 @@
@@ -10,19 +10,18 @@ index 6528da245d922e2ccdb59cbf8106055bc34d1e74..1cd3395961a80e3b48582794b5b5365c
           <stack class="tab-icon-stack">
             <hbox class="tab-throbber"/>
             <hbox class="tab-icon-pending"/>
-@@ -38,9 +39,11 @@
+@@ -37,8 +38,10 @@
             <hbox class="tab-secondary-label">
               <label class="tab-icon-sound-label tab-icon-sound-pip-label" data-l10n-id="browser-tab-audio-pip" role="presentation"/>
             </hbox>
 +            <label class="tab-reset-pin-label" data-l10n-id="tab-reset-pin-label" role="presentation"/>
           </vbox>
-           <image class="tab-note-icon" role="presentation"/>
           <image class="tab-close-button close-icon" role="button" data-l10n-id="tabbrowser-close-tabs-button" data-l10n-args='{"tabCount": 1}' keyNav="false"/>
 +          <image class="tab-reset-button reset-icon" role="button" data-l10n-id="tabbrowser-unload-tab-button" data-l10n-args='{"tabCount": 1}' keyNav="false"/>
         </hbox>
       </stack>
       `;
-@@ -86,7 +89,7 @@
+@@ -84,7 +87,7 @@
         ".tab-content":
           "pinned,selected=visuallyselected,multiselected,titlechanged,attention",
         ".tab-icon-stack":
@@ -31,7 +30,7 @@ index 6528da245d922e2ccdb59cbf8106055bc34d1e74..1cd3395961a80e3b48582794b5b5365c
         ".tab-throbber":
           "fadein,pinned,busy,progress,selected=visuallyselected",
         ".tab-icon-pending":
-@@ -95,9 +98,9 @@
+@@ -93,9 +96,9 @@
           "src=image,requestcontextid,fadein,pinned,selected=visuallyselected,busy,crashed,sharing,pictureinpicture,pending,discarded",
         ".tab-sharing-icon-overlay": "sharing,selected=visuallyselected,pinned",
         ".tab-icon-overlay":
@@ -43,7 +42,7 @@ index 6528da245d922e2ccdb59cbf8106055bc34d1e74..1cd3395961a80e3b48582794b5b5365c
         ".tab-label-container":
           "pinned,selected=visuallyselected,labeldirection",
         ".tab-label":
-@@ -188,7 +191,7 @@
+@@ -186,7 +189,7 @@
     }
 
     set _visuallySelected(val) {
@@ -52,7 +51,7 @@ index 6528da245d922e2ccdb59cbf8106055bc34d1e74..1cd3395961a80e3b48582794b5b5365c
         return;
       }
 
-@@ -224,11 +227,21 @@
+@@ -222,11 +225,21 @@
     }
 
     get visible() {
@@ -79,7 +78,7 @@ index 6528da245d922e2ccdb59cbf8106055bc34d1e74..1cd3395961a80e3b48582794b5b5365c
     }
 
     get hidden() {
-@@ -307,7 +320,7 @@
+@@ -305,7 +318,7 @@
         return false;
       }
 
@@ -88,7 +87,7 @@ index 6528da245d922e2ccdb59cbf8106055bc34d1e74..1cd3395961a80e3b48582794b5b5365c
     }
 
     get lastAccessed() {
-@@ -384,7 +397,18 @@
+@@ -382,7 +395,18 @@
     }
 
     get group() {
@@ -108,7 +107,7 @@ index 6528da245d922e2ccdb59cbf8106055bc34d1e74..1cd3395961a80e3b48582794b5b5365c
     }
 
     get splitview() {
-@@ -489,6 +513,8 @@
+@@ -473,6 +497,8 @@
         this.style.MozUserFocus = "ignore";
       } else if (
         event.target.classList.contains("tab-close-button") ||
@@ -117,7 +116,7 @@ index 6528da245d922e2ccdb59cbf8106055bc34d1e74..1cd3395961a80e3b48582794b5b5365c
         event.target.classList.contains("tab-icon-overlay") ||
         event.target.classList.contains("tab-audio-button")
       ) {
-@@ -543,6 +569,10 @@
+@@ -527,6 +553,10 @@
       this.style.MozUserFocus = "";
     }
 
@@ -128,7 +127,7 @@ index 6528da245d922e2ccdb59cbf8106055bc34d1e74..1cd3395961a80e3b48582794b5b5365c
     on_click(event) {
       if (event.button != 0) {
         return;
-@@ -603,6 +633,14 @@
+@@ -587,6 +617,14 @@
         // (see tabbrowser-tabs 'click' handler).
         gBrowser.tabContainer._blockDblClick = true;
       }
@@ -143,7 +142,7 @@ index 6528da245d922e2ccdb59cbf8106055bc34d1e74..1cd3395961a80e3b48582794b5b5365c
     }
 
     on_dblclick(event) {
-@@ -626,6 +664,8 @@
+@@ -610,6 +648,8 @@
           animate: true,
           triggeringEvent: event,
         });
--- 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 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690eaf7bbec 100644
+index 42027bfa55eab8ea9298a7d425f2ded45188f7f3..d69787a3a57dcccce8616457d7eca078ef3b1fca 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -398,6 +398,7 @@
+@@ -386,6 +386,7 @@
      * @type {MozBrowser[]}
      */
     get splitViewBrowsers() {
@@ -10,7 +10,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       const browsers = [];
       if (this.#activeSplitView) {
         for (const tab of this.#activeSplitView.tabs) {
-@@ -462,15 +463,66 @@
+@@ -450,15 +451,66 @@
       return this.tabContainer.visibleTabs;
     }
 
@@ -79,7 +79,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
     set selectedTab(val) {
       if (
         gSharedTabWarning.willShowSharedTabWarning(val) ||
-@@ -546,6 +598,10 @@
+@@ -534,6 +586,10 @@
         userContextId = parseInt(tabArgument.getAttribute("usercontextid"), 10);
       }
 
@@ -90,7 +90,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       if (tabArgument && tabArgument.linkedBrowser) {
         remoteType = tabArgument.linkedBrowser.remoteType;
         initialBrowsingContextGroupId =
-@@ -625,6 +681,7 @@
+@@ -613,6 +669,7 @@
       this.tabpanels.appendChild(panel);
 
       let tab = this.tabs[0];
@@ -98,7 +98,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       tab.linkedPanel = uniqueId;
       this._selectedTab = tab;
       this._selectedBrowser = browser;
-@@ -912,13 +969,18 @@
+@@ -898,13 +955,18 @@
       }
 
       this.showTab(aTab);
@@ -118,7 +118,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
 
       aTab.setAttribute("pinned", "true");
       this._updateTabBarForPinnedTabs();
-@@ -931,11 +993,18 @@
+@@ -917,11 +979,18 @@
       }
 
       this.#handleTabMove(aTab, () => {
@@ -138,7 +138,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       });
 
       aTab.style.marginInlineStart = "";
-@@ -1112,6 +1181,9 @@
+@@ -1098,6 +1167,9 @@
 
       let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
 
@@ -148,7 +148,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       if (
         aIconURL &&
         !LOCAL_PROTOCOLS.some(protocol => aIconURL.startsWith(protocol))
-@@ -1121,6 +1193,9 @@
+@@ -1107,6 +1179,9 @@
         );
         return;
       }
@@ -158,7 +158,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
 
       let browser = this.getBrowserForTab(aTab);
       browser.mIconURL = aIconURL;
-@@ -1393,7 +1468,6 @@
+@@ -1379,7 +1454,6 @@
 
       // Preview mode should not reset the owner
       if (!this._previewMode && !oldTab.selected) {
@@ -166,7 +166,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       }
 
       let lastRelatedTab = this._lastRelatedTabMap.get(oldTab);
-@@ -1484,6 +1558,7 @@
+@@ -1470,6 +1544,7 @@
       if (!this._previewMode) {
         newTab.recordTimeFromUnloadToReload();
         newTab.updateLastAccessed();
@@ -174,7 +174,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
         oldTab.updateLastAccessed();
         // if this is the foreground window, update the last-seen timestamps.
         if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -1636,6 +1711,9 @@
+@@ -1622,6 +1697,9 @@
       }
 
       let activeEl = document.activeElement;
@@ -184,7 +184,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       // If focus is on the old tab, move it to the new tab.
       if (activeEl == oldTab) {
         newTab.focus();
-@@ -1959,6 +2037,11 @@
+@@ -1945,6 +2023,11 @@
     }
 
     _setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
@@ -196,7 +196,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       if (!aLabel || aLabel.includes("about:reader?")) {
         return false;
       }
-@@ -2067,7 +2150,7 @@
+@@ -2053,7 +2136,7 @@
         newIndex = this.selectedTab._tPos + 1;
       }
 
@@ -205,7 +205,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
         if (this.isTabGroupLabel(targetTab)) {
           throw new Error(
             "Replacing a tab group label with a tab is not supported"
-@@ -2342,6 +2425,7 @@
+@@ -2328,6 +2411,7 @@
       uriIsAboutBlank,
       userContextId,
       skipLoad,
@@ -213,7 +213,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
     } = {}) {
       let b = document.createXULElement("browser");
       // Use the JSM global to create the permanentKey, so that if the
-@@ -2415,8 +2499,7 @@
+@@ -2401,8 +2485,7 @@
         // we use a different attribute name for this?
         b.setAttribute("name", name);
       }
@@ -223,7 +223,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
         b.setAttribute("transparent", "true");
       }
 
-@@ -2581,7 +2664,7 @@
+@@ -2567,7 +2650,7 @@
 
       let panel = this.getPanel(browser);
       let uniqueId = this._generateUniquePanelID();
@@ -232,7 +232,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       aTab.linkedPanel = uniqueId;
 
       // Inject the <browser> into the DOM if necessary.
-@@ -2640,8 +2723,8 @@
+@@ -2626,8 +2709,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) {
@@ -243,7 +243,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       } else {
         aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
       }
-@@ -2828,7 +2911,6 @@
+@@ -2814,7 +2897,6 @@
             this.selectedTab = this.addTrustedTab(BROWSER_NEW_TAB_URL, {
               tabIndex: tab._tPos + 1,
               userContextId: tab.userContextId,
@@ -251,7 +251,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
               focusUrlBar: true,
             });
             resolve(this.selectedBrowser);
-@@ -2938,6 +3020,9 @@
+@@ -2923,6 +3005,9 @@
         schemelessInput,
         hasValidUserGestureActivation = false,
         textDirectiveUserActivation = false,
@@ -261,7 +261,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       } = {}
     ) {
       // all callers of addTab that pass a params object need to pass
-@@ -2948,10 +3033,17 @@
+@@ -2933,10 +3018,17 @@
         );
       }
 
@@ -279,7 +279,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       // If we're opening a foreground tab, set the owner by default.
       ownerTab ??= inBackground ? null : this.selectedTab;
 
-@@ -2959,6 +3051,7 @@
+@@ -2944,6 +3036,7 @@
       if (this.selectedTab.owner) {
         this.selectedTab.owner = null;
       }
@@ -287,7 +287,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
 
       // Find the tab that opened this one, if any. This is used for
       // determining positioning, and inherited attributes such as the
-@@ -3011,6 +3104,21 @@
+@@ -2996,6 +3089,21 @@
           noInitialLabel,
           skipBackgroundNotify,
         });
@@ -309,7 +309,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
         if (insertTab) {
           // Insert the tab into the tab container in the correct position.
           this.#insertTabAtIndex(t, {
-@@ -3019,6 +3127,7 @@
+@@ -3004,6 +3112,7 @@
             ownerTab,
             openerTab,
             pinned,
@@ -317,7 +317,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
             bulkOrderedOpen,
             tabGroup: tabGroup ?? openerTab?.group,
           });
-@@ -3037,6 +3146,7 @@
+@@ -3022,6 +3131,7 @@
           openWindowInfo,
           skipLoad,
           triggeringRemoteType,
@@ -325,7 +325,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
         }));
 
         if (focusUrlBar) {
-@@ -3161,6 +3271,12 @@
+@@ -3146,6 +3256,12 @@
         }
       }
 
@@ -338,25 +338,19 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       // Additionally send pinned tab events
       if (pinned) {
         this.#notifyPinnedStatus(t);
-@@ -3375,6 +3491,7 @@
+@@ -3349,10 +3465,10 @@
         isAdoptingGroup = false,
         isUserTriggered = false,
         telemetryUserCreateSource = "unknown",
 +        forSplitView = false,
       } = {}
     ) {
-       if (
-@@ -3385,9 +3502,6 @@
-             !this.isSplitViewWrapper(tabOrSplitView)
-         )
-       ) {
-        throw new Error(
-          "Cannot create tab group with zero tabs or split views"
-        );
+       if (!tabs?.length) {
+-        throw new Error("Cannot create tab group with zero tabs");
       }
 
       if (!color) {
-@@ -3408,9 +3522,14 @@
+@@ -3373,9 +3489,14 @@
         label,
         isAdoptingGroup
       );
@@ -364,16 +358,16 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
 +      if (forSplitView) {
 +        group.setAttribute('split-view-group', true);
 +      }
-+      group.essential = tabsAndSplitViews.some(tab => tab.hasAttribute("essential"));
-+      group.pinned = group.essential || tabsAndSplitViews.some(tab => tab.pinned);
+      group.essential = tabs.some(tab => tab.hasAttribute("essential"));
+      group.pinned = group.essential || tabs.some(tab => tab.pinned);
 +      if (forSplitView && !insertBefore?.group?.isZenFolder) insertBefore = insertBefore?.group ?? insertBefore;
 +      insertBefore.before(
         group,
 -        insertBefore?.group ?? insertBefore
       );
-       group.addTabs(tabsAndSplitViews);
+       group.addTabs(tabs);
 
-@@ -3531,7 +3650,7 @@
+@@ -3496,7 +3617,7 @@
       }
 
       this.#handleTabMove(tab, () =>
@@ -382,7 +376,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       );
     }
 
-@@ -3746,6 +3865,7 @@
+@@ -3698,6 +3819,7 @@
         openWindowInfo,
         skipLoad,
         triggeringRemoteType,
@@ -390,7 +384,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       }
     ) {
       // If we don't have a preferred remote type (or it is `NOT_REMOTE`), and
-@@ -3815,6 +3935,7 @@
+@@ -3767,6 +3889,7 @@
           openWindowInfo,
           name,
           skipLoad,
@@ -398,7 +392,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
         });
       }
 
-@@ -4003,7 +4124,7 @@
+@@ -3955,7 +4078,7 @@
         // Add a new tab if needed.
         if (!tab) {
           let createLazyBrowser =
@@ -407,7 +401,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
 
           let url = "about:blank";
           if (tabData.entries?.length) {
-@@ -4040,8 +4161,10 @@
+@@ -3992,8 +4115,10 @@
             insertTab: false,
             skipLoad: true,
             preferredRemoteType,
@@ -419,7 +413,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
           if (select) {
             tabToSelect = tab;
           }
-@@ -4053,7 +4176,8 @@
+@@ -4005,7 +4130,8 @@
           this.pinTab(tab);
           // Then ensure all the tab open/pinning information is sent.
           this._fireTabOpen(tab, {});
@@ -429,7 +423,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
           let { groupId } = tabData;
           const tabGroup = tabGroupWorkingData.get(groupId);
           // if a tab refers to a tab group we don't know, skip any group
-@@ -4067,7 +4191,10 @@
+@@ -4019,7 +4145,10 @@
                 tabGroup.stateData.id,
                 tabGroup.stateData.color,
                 tabGroup.stateData.collapsed,
@@ -441,7 +435,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
               );
               tabsFragment.appendChild(tabGroup.node);
             }
-@@ -4112,9 +4239,23 @@
+@@ -4064,9 +4193,23 @@
       // to remove the old selected tab.
       if (tabToSelect) {
         let leftoverTab = this.selectedTab;
@@ -457,15 +451,15 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
 +            gZenWorkspaces._initialTab._shouldRemove = true;
 +          }
 +        }
-+      }
+       }
 +      else {
 +        gZenWorkspaces._tabToRemoveForEmpty = this.selectedTab;
-       }
+      }
 +      this._hasAlreadyInitializedZenSessionStore = true;
 
       if (tabs.length > 1 || !tabs[0].selected) {
         this._updateTabsAfterInsert();
-@@ -4305,11 +4446,14 @@
+@@ -4257,11 +4400,14 @@
       if (ownerTab) {
         tab.owner = ownerTab;
       }
@@ -481,7 +475,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
         if (
           !bulkOrderedOpen &&
           ((openerTab &&
-@@ -4321,7 +4465,7 @@
+@@ -4273,7 +4419,7 @@
           let lastRelatedTab =
             openerTab && this._lastRelatedTabMap.get(openerTab);
           let previousTab = lastRelatedTab || openerTab || this.selectedTab;
@@ -490,16 +484,16 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
             tabGroup = previousTab.group;
           }
           if (
-@@ -4337,7 +4481,7 @@
-                 previousTab.splitview
-               ) + 1;
+@@ -4284,7 +4430,7 @@
+           ) {
+             elementIndex = Infinity;
           } else if (previousTab.visible) {
 -            elementIndex = previousTab.elementIndex + 1;
 +            elementIndex = (typeof previousTab.elementIndex === 'undefined') ? elementIndex : (previousTab.elementIndex + 1);
           } else if (previousTab == FirefoxViewHandler.tab) {
             elementIndex = 0;
           }
-@@ -4365,14 +4509,14 @@
+@@ -4312,14 +4458,14 @@
       }
       // Ensure index is within bounds.
       if (tab.pinned) {
@@ -518,16 +512,16 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
 
       if (pinned && !itemAfter?.pinned) {
         itemAfter = null;
-@@ -4385,7 +4529,7 @@
+@@ -4330,7 +4476,7 @@
 
       this.tabContainer._invalidateCachedTabs();
 
 -      if (tabGroup) {
 +      if (tabGroup && !tabGroup.hasAttribute("split-view-group")) {
-         if (
-           (this.isTab(itemAfter) && itemAfter.group == tabGroup) ||
-           this.isSplitViewWrapper(itemAfter)
-@@ -4416,7 +4560,11 @@
+         if (this.isTab(itemAfter) && itemAfter.group == tabGroup) {
+           // Place at the front of, or between tabs in, the same tab group
+           this.tabContainer.insertBefore(tab, itemAfter);
+@@ -4358,7 +4504,11 @@
         const tabContainer = pinned
           ? this.tabContainer.pinnedTabsContainer
           : this.tabContainer;
@@ -538,8 +532,8 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
 +        }
       }
 
-       if (tab.group?.collapsed) {
-@@ -4431,6 +4579,7 @@
+       this._updateTabsAfterInsert();
+@@ -4366,6 +4516,7 @@
       if (pinned) {
         this._updateTabBarForPinnedTabs();
       }
@@ -547,7 +541,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
 
       TabBarVisibility.update();
     }
-@@ -4983,6 +5132,7 @@
+@@ -4916,6 +5067,7 @@
         telemetrySource,
       } = {}
     ) {
@@ -555,7 +549,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       // When 'closeWindowWithLastTab' pref is enabled, closing all tabs
       // can be considered equivalent to closing the window.
       if (
-@@ -5072,6 +5222,7 @@
+@@ -5005,6 +5157,7 @@
         if (lastToClose) {
           this.removeTab(lastToClose, aParams);
         }
@@ -563,7 +557,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       } catch (e) {
         console.error(e);
       }
-@@ -5110,6 +5261,12 @@
+@@ -5043,6 +5196,12 @@
         aTab._closeTimeNoAnimTimerId = Glean.browserTabclose.timeNoAnim.start();
       }
 
@@ -576,7 +570,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       // Handle requests for synchronously removing an already
       // asynchronously closing tab.
       if (!animate && aTab.closing) {
-@@ -5124,6 +5281,9 @@
+@@ -5057,6 +5216,9 @@
       // state).
       let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
       let isLastTab = this.#isLastTabInWindow(aTab);
@@ -586,7 +580,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       if (
         !this._beginRemoveTab(aTab, {
           closeWindowFastpath: true,
-@@ -5172,7 +5332,13 @@
+@@ -5105,7 +5267,13 @@
         // We're not animating, so we can cancel the animation stopwatch.
         Glean.browserTabclose.timeAnim.cancel(aTab._closeTimeAnimTimerId);
         aTab._closeTimeAnimTimerId = null;
@@ -601,7 +595,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
         return;
       }
 
-@@ -5306,7 +5472,7 @@
+@@ -5239,7 +5407,7 @@
           closeWindowWithLastTab != null
             ? closeWindowWithLastTab
             : !window.toolbar.visible ||
@@ -610,7 +604,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
 
         if (closeWindow) {
           // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5330,6 +5496,7 @@
+@@ -5263,6 +5431,7 @@
 
         newTab = true;
       }
@@ -618,7 +612,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       aTab._endRemoveArgs = [closeWindow, newTab];
 
       // swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -5370,13 +5537,7 @@
+@@ -5303,13 +5472,7 @@
       aTab._mouseleave();
 
       if (newTab) {
@@ -633,7 +627,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       } else {
         TabBarVisibility.update();
       }
-@@ -5509,6 +5670,7 @@
+@@ -5442,6 +5605,7 @@
         this.tabs[i]._tPos = i;
       }
 
@@ -641,7 +635,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       if (!this._windowIsClosing) {
         // update tab close buttons state
         this.tabContainer._updateCloseButtons();
-@@ -5732,6 +5894,7 @@
+@@ -5663,6 +5827,7 @@
       }
 
       let excludeTabs = new Set(aExcludeTabs);
@@ -649,7 +643,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
 
       // If this tab has a successor, it should be selectable, since
       // hiding or closing a tab removes that tab as a successor.
-@@ -5744,13 +5907,13 @@
+@@ -5675,13 +5840,13 @@
         !excludeTabs.has(aTab.owner) &&
         Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
       ) {
@@ -665,7 +659,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       );
 
       let tab = this.tabContainer.findNextTab(aTab, {
-@@ -5766,7 +5929,7 @@
+@@ -5697,7 +5862,7 @@
       }
 
       if (tab) {
@@ -674,7 +668,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       }
 
       // If no qualifying visible tab was found, see if there is a tab in
-@@ -5787,7 +5950,7 @@
+@@ -5718,7 +5883,7 @@
         });
       }
 
@@ -683,7 +677,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
     }
 
     _blurTab(aTab) {
-@@ -5798,7 +5961,7 @@
+@@ -5729,7 +5894,7 @@
      * @returns {boolean}
      *   False if swapping isn't permitted, true otherwise.
      */
@@ -692,7 +686,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       // Do not allow transfering a private tab to a non-private window
       // and vice versa.
       if (
-@@ -5852,6 +6015,7 @@
+@@ -5783,6 +5948,7 @@
       // fire the beforeunload event in the process.  Close the other
       // window if this was its last tab.
       if (
@@ -700,7 +694,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
         !remoteBrowser._beginRemoveTab(aOtherTab, {
           adoptedByTab: aOurTab,
           closeWindowWithLastTab: true,
-@@ -5863,7 +6027,7 @@
+@@ -5794,7 +5960,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.
@@ -709,7 +703,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       if (closeWindow) {
         let win = aOtherTab.ownerGlobal;
         win.windowUtils.suppressAnimation(true);
-@@ -5987,11 +6151,13 @@
+@@ -5918,11 +6084,13 @@
       }
 
       // Finish tearing down the tab that's going away.
@@ -723,7 +717,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
 
       this.setTabTitle(aOurTab);
 
-@@ -6193,10 +6359,10 @@
+@@ -6124,10 +6292,10 @@
       SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
     }
 
@@ -736,7 +730,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
         aTab.selected ||
         aTab.closing ||
         // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -6254,7 +6420,8 @@
+@@ -6185,7 +6353,8 @@
      *
      * @param {MozTabbrowserTab|MozTabbrowserTabGroup|MozTabbrowserTabGroup.labelElement} aTab
      */
@@ -746,7 +740,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       if (this.tabs.length == 1) {
         return null;
       }
-@@ -6278,12 +6445,14 @@
+@@ -6209,12 +6378,14 @@
       }
 
       // tell a new window to take the "dropped" tab
@@ -762,7 +756,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
     }
 
     /**
-@@ -6388,7 +6557,7 @@
+@@ -6319,7 +6490,7 @@
      *   `true` if element is a `<tab-group>`
      */
     isTabGroup(element) {
@@ -771,7 +765,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
     }
 
     /**
-@@ -6473,8 +6642,8 @@
+@@ -6404,8 +6575,8 @@
       }
 
       // Don't allow mixing pinned and unpinned tabs.
@@ -782,7 +776,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       } else {
         tabIndex = Math.max(tabIndex, this.pinnedTabCount);
       }
-@@ -6500,10 +6669,16 @@
+@@ -6431,10 +6602,16 @@
       this.#handleTabMove(
         element,
         () => {
@@ -801,7 +795,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
           if (neighbor && this.isTab(element) && tabIndex > element._tPos) {
             neighbor.after(element);
           } else {
-@@ -6561,23 +6736,31 @@
+@@ -6492,23 +6669,31 @@
     #moveTabNextTo(element, targetElement, moveBefore = false, metricsContext) {
       if (this.isTabGroupLabel(targetElement)) {
         targetElement = targetElement.group;
@@ -839,7 +833,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       } 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
-@@ -6590,14 +6773,34 @@
+@@ -6521,14 +6706,34 @@
         //    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.
@@ -875,7 +869,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
         element.pinned
           ? this.tabContainer.pinnedTabsContainer
           : this.tabContainer;
-@@ -6606,7 +6809,7 @@
+@@ -6537,7 +6742,7 @@
         element,
         () => {
           if (moveBefore) {
@@ -884,10 +878,10 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
           } else if (targetElement) {
             targetElement.after(element);
           } else {
-@@ -6676,10 +6879,10 @@
+@@ -6607,10 +6812,10 @@
      * @param {TabMetricsContext} [metricsContext]
      */
-     moveTabToExistingGroup(aTab, aGroup, metricsContext) {
+     moveTabToGroup(aTab, aGroup, metricsContext) {
 -      if (!this.isTab(aTab)) {
 +      if (!this.isTab(aTab) && !aTab.hasAttribute('split-view-group')) {
         throw new Error("Can only move a tab into a tab group");
@@ -897,7 +891,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
         return;
       }
       if (aTab.group && aTab.group.id === aGroup.id) {
-@@ -6751,6 +6954,7 @@
+@@ -6656,6 +6861,7 @@
 
       let state = {
         tabIndex: tab._tPos,
@@ -905,7 +899,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       };
       if (tab.visible) {
         state.elementIndex = tab.elementIndex;
-@@ -6777,7 +6981,7 @@
+@@ -6682,7 +6888,7 @@
       let changedTabGroup =
         previousTabState.tabGroupId != currentTabState.tabGroupId;
 
@@ -914,7 +908,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
         tab.dispatchEvent(
           new CustomEvent("TabMove", {
             bubbles: true,
-@@ -6818,6 +7022,10 @@
+@@ -6723,6 +6929,10 @@
 
       moveActionCallback();
 
@@ -925,7 +919,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       // Clear tabs cache after moving nodes because the order of tabs may have
       // changed.
       this.tabContainer._invalidateCachedTabs();
-@@ -6910,6 +7118,8 @@
+@@ -6815,6 +7025,8 @@
         params.userContextId = aTab.getAttribute("usercontextid");
       }
       let newTab = this.addWebTab("about:blank", params);
@@ -934,7 +928,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
       let newBrowser = this.getBrowserForTab(newTab);
 
       aTab.container.tabDragAndDrop.finishAnimateTabMove();
-@@ -7718,7 +7928,7 @@
+@@ -7623,7 +7835,7 @@
             // preventDefault(). It will still raise the window if appropriate.
             break;
           }
@@ -943,7 +937,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
           window.focus();
           aEvent.preventDefault();
           break;
-@@ -7735,7 +7945,6 @@
+@@ -7640,7 +7852,6 @@
         }
         case "TabGroupCollapse":
           aEvent.target.tabs.forEach(tab => {
@@ -951,7 +945,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
           });
           break;
         case "TabGroupCreateByUser":
-@@ -7895,7 +8104,9 @@
+@@ -7800,7 +8011,9 @@
 
         let filter = this._tabFilters.get(tab);
         if (filter) {
@@ -961,7 +955,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
 
           let listener = this._tabListeners.get(tab);
           if (listener) {
-@@ -8698,6 +8909,7 @@
+@@ -8589,6 +8802,7 @@
             aWebProgress.isTopLevel
           ) {
             this.mTab.setAttribute("busy", "true");
@@ -969,7 +963,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
             gBrowser._tabAttrModified(this.mTab, ["busy"]);
             this.mTab._notselectedsinceload = !this.mTab.selected;
           }
-@@ -8778,6 +8990,7 @@
+@@ -8670,6 +8884,7 @@
         // known defaults. Note we use the original URL since about:newtab
         // redirects to a prerendered page.
         const shouldRemoveFavicon =
@@ -977,7 +971,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..f3966d85049735538b24424f42d4a690
           !this.mBrowser.mIconURL &&
           !ignoreBlank &&
           !(originalLocation.spec in FAVICON_DEFAULTS);
-@@ -9803,7 +10016,7 @@ var TabContextMenu = {
+@@ -9623,7 +9838,7 @@ var TabContextMenu = {
     );
     contextUnpinSelectedTabs.hidden =
       !this.contextTab.pinned || !this.multiselected;
--- a/src/browser/components/tabbrowser/content/tabgroup-js.patch
+++ b/src/browser/components/tabbrowser/content/tabgroup-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabgroup.js b/browser/components/tabbrowser/content/tabgroup.js
-index 9abf115062e7c86196d7cb6b8ac82a9bb63b5a65..9a38d7dc10403c1ee721b6abf33d525a4aa1f821 100644
+index 394b2af2e187b82bb3e98ebcdc6e66b63036e20d..e92927612abf12631c384a8f54b6a607fb699424 100644
 --- a/browser/components/tabbrowser/content/tabgroup.js
 +++ b/browser/components/tabbrowser/content/tabgroup.js
@@ -14,11 +14,11 @@
@@ -78,20 +78,7 @@ index 9abf115062e7c86196d7cb6b8ac82a9bb63b5a65..9a38d7dc10403c1ee721b6abf33d525a
 
       this.#updateLabelAriaAttributes();
 
-@@ -132,17 +151,21 @@
-       let tabGroupCreateDetail = this.#wasCreatedByAdoption
-         ? { isAdoptingGroup: true }
-         : {};
-+      if (!this.hasAttribute('drag-image')) {
-       this.dispatchEvent(
-         new CustomEvent("TabGroupCreate", {
-           bubbles: true,
-           detail: tabGroupCreateDetail,
-         })
-       );
-+      }
-       // Reset `wasCreatedByAdoption` to default of false so that we only
-       // claim that a tab group was created by adoption the first time it
+@@ -143,6 +162,8 @@
       // mounts after getting created by `Tabbrowser.adoptTabGroup`.
       this.#wasCreatedByAdoption = false;
     }
@@ -100,7 +87,7 @@ index 9abf115062e7c86196d7cb6b8ac82a9bb63b5a65..9a38d7dc10403c1ee721b6abf33d525a
 
     resetDefaultGroupName = () => {
       this.#defaultGroupName = "";
-@@ -211,7 +234,10 @@
+@@ -211,7 +232,10 @@
           }
         });
       }
@@ -112,7 +99,7 @@ index 9abf115062e7c86196d7cb6b8ac82a9bb63b5a65..9a38d7dc10403c1ee721b6abf33d525a
     }
 
     get color() {
-@@ -305,6 +331,9 @@
+@@ -305,6 +329,9 @@
     }
 
     set collapsed(val) {
@@ -122,7 +109,7 @@ index 9abf115062e7c86196d7cb6b8ac82a9bb63b5a65..9a38d7dc10403c1ee721b6abf33d525a
       if (!!val == this.collapsed) {
         return;
       }
-@@ -391,7 +420,6 @@
+@@ -391,7 +418,6 @@
           tabGroupName,
         })
         .then(result => {
@@ -130,7 +117,7 @@ index 9abf115062e7c86196d7cb6b8ac82a9bb63b5a65..9a38d7dc10403c1ee721b6abf33d525a
         });
     }
 
-@@ -466,13 +494,65 @@
+@@ -466,13 +492,65 @@
      * @returns {MozTabbrowserTab[]}
      */
     get tabs() {
@@ -201,15 +188,15 @@ index 9abf115062e7c86196d7cb6b8ac82a9bb63b5a65..9a38d7dc10403c1ee721b6abf33d525a
     }
 
     /**
-@@ -560,7 +640,6 @@
-           );
-         } else {
-           if (tabOrSplitView.pinned) {
-            tabOrSplitView.ownerGlobal.gBrowser.unpinTab(tabOrSplitView);
-           }
-           let tabToMove =
-             this.ownerGlobal === tabOrSplitView.ownerGlobal
-@@ -625,7 +704,7 @@
+@@ -553,7 +631,6 @@
+     addTabs(tabs, metricsContext) {
+       for (let tab of tabs) {
+         if (tab.pinned) {
+-          tab.ownerGlobal.gBrowser.unpinTab(tab);
+         }
+         let tabToMove =
+           this.ownerGlobal === tab.ownerGlobal
+@@ -616,7 +693,7 @@
      */
     on_click(event) {
       let isToggleElement =
@@ -218,7 +205,7 @@ index 9abf115062e7c86196d7cb6b8ac82a9bb63b5a65..9a38d7dc10403c1ee721b6abf33d525a
         event.target === this.#overflowCountLabel;
       if (isToggleElement && event.button === 0) {
         event.preventDefault();
-@@ -696,5 +775,6 @@
+@@ -687,5 +764,6 @@
     }
   }
 
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index a61b4e7af40f1404bf3555a7011c6211de917635..bb3c822ad14c4ebf0b8792665ff8242f97e501d9 100644
+index 6b6c04599fe80983d13d2069ca62b99d8ad70271..ebe4818a71b37e8b7cd2937f72cc60f202dadef8 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
-@@ -240,7 +240,7 @@
+@@ -235,7 +235,7 @@
         true
       )
         ? new window.TabStacking(this)
@@ -11,7 +11,7 @@ index a61b4e7af40f1404bf3555a7011c6211de917635..bb3c822ad14c4ebf0b8792665ff8242f
       this.tabDragAndDrop.init();
     }
 
-@@ -453,7 +453,7 @@
+@@ -436,7 +436,7 @@
       // and we're not hitting the scroll buttons.
       if (
         event.button != 0 ||
@@ -20,7 +20,7 @@ index a61b4e7af40f1404bf3555a7011c6211de917635..bb3c822ad14c4ebf0b8792665ff8242f
         event.composedTarget.localName == "toolbarbutton"
       ) {
         return;
-@@ -534,7 +534,6 @@
+@@ -517,7 +517,6 @@
             });
           }
         } else if (isTabGroupLabel(event.target)) {
@@ -28,7 +28,7 @@ index a61b4e7af40f1404bf3555a7011c6211de917635..bb3c822ad14c4ebf0b8792665ff8242f
         } else if (
           event.originalTarget.closest("scrollbox") &&
           !Services.prefs.getBoolPref(
-@@ -570,6 +569,9 @@
+@@ -553,6 +552,9 @@
     }
 
     on_keydown(event) {
@@ -38,7 +38,7 @@ index a61b4e7af40f1404bf3555a7011c6211de917635..bb3c822ad14c4ebf0b8792665ff8242f
       let { altKey, shiftKey } = event;
       let [accel, nonAccel] =
         AppConstants.platform == "macosx"
-@@ -764,7 +766,6 @@
+@@ -747,7 +749,6 @@
       this._updateCloseButtons();
 
       if (!this.#animatingGroups.size) {
@@ -46,7 +46,7 @@ index a61b4e7af40f1404bf3555a7011c6211de917635..bb3c822ad14c4ebf0b8792665ff8242f
       }
 
       document
-@@ -825,7 +826,7 @@
+@@ -808,7 +809,7 @@
     }
 
     get newTabButton() {
@@ -55,7 +55,7 @@ index a61b4e7af40f1404bf3555a7011c6211de917635..bb3c822ad14c4ebf0b8792665ff8242f
     }
 
     get verticalMode() {
-@@ -841,6 +842,7 @@
+@@ -824,6 +825,7 @@
     }
 
     get overflowing() {
@@ -63,7 +63,7 @@ index a61b4e7af40f1404bf3555a7011c6211de917635..bb3c822ad14c4ebf0b8792665ff8242f
       return this.hasAttribute("overflow");
     }
 
-@@ -854,29 +856,56 @@
+@@ -837,29 +839,56 @@
       if (pinnedChildren?.at(-1)?.id == "pinned-tabs-container-periphery") {
         pinnedChildren.pop();
       }
@@ -93,7 +93,7 @@ index a61b4e7af40f1404bf3555a7011c6211de917635..bb3c822ad14c4ebf0b8792665ff8242f
 +          } else if (tab.classList.contains("zen-tab-group-start")) {
 +            tabs.splice(i, 1);
 +          }
-         }
+        }
 +      };
 +      expandTabs(pinnedTabs);
 +      expandTabs(unpinnedChildren);
@@ -114,7 +114,7 @@ index a61b4e7af40f1404bf3555a7011c6211de917635..bb3c822ad14c4ebf0b8792665ff8242f
 +          // remove the separator from the list
 +          allTabs.splice(i, 1);
 +          i--;
-+        }
+         }
 +        i++;
       }
 -
@@ -130,55 +130,42 @@ index a61b4e7af40f1404bf3555a7011c6211de917635..bb3c822ad14c4ebf0b8792665ff8242f
     }
 
     /**
-@@ -944,29 +973,28 @@
-         return this.#focusableItems;
-       }
+@@ -926,17 +955,10 @@
+ 
+       let elementIndex = 0;
 
 -      let unpinnedChildren = Array.from(this.arrowScrollbox.children);
 -      let pinnedChildren = Array.from(this.pinnedTabsContainer.children);
-+      let elementIndex = 0;
 +      let children = gZenWorkspaces.tabboxChildrenWithoutEmpty;
 
       let focusableItems = [];
 -      for (let child of pinnedChildren) {
 -        if (isTab(child)) {
+-          child.elementIndex = elementIndex++;
 -          focusableItems.push(child);
 -        }
 -      }
 -      for (let child of unpinnedChildren) {
 +      for (let child of [...gZenWorkspaces.getCurrentEssentialsContainer().children, ...(gZenWorkspaces.activeWorkspaceElement?.hasCollapsedPinnedTabs ? [] : this.pinnedTabsContainer.children), ...children]) {
         if (isTab(child) && child.visible) {
+           child.elementIndex = elementIndex++;
           focusableItems.push(child);
-         } else if (isTabGroup(child)) {
+@@ -944,11 +966,13 @@
+           child.labelElement.elementIndex = elementIndex++;
           focusableItems.push(child.labelElement);
-
+ 
 -          let visibleTabsInGroup = child.tabs.filter(tab => tab.visible);
 +        if (!child.hasAttribute("split-view-group")) {
 +          let visibleTabsInGroup = child.childGroupsAndTabs.filter(tab => tab.visible);
-+          
+           visibleTabsInGroup.forEach(tab => {
+             tab.elementIndex = elementIndex++;
+           });
           focusableItems.push(...visibleTabsInGroup);
 +        }
         } else if (child.tagName == "tab-split-view-wrapper") {
           let visibleTabsInSplitView = child.tabs.filter(tab => tab.visible);
-           focusableItems.push(...visibleTabsInSplitView);
-         }
-       }
-
-+      focusableItems.forEach(item => {
-+        item.elementIndex = elementIndex++;
-+      });
-       this.#focusableItems = focusableItems;
- 
-       return this.#focusableItems;
-@@ -979,6 +1007,7 @@
-      * focusable (ex, we don't want the splitview container to be focusable, only its children).
-      */
-     get dragAndDropElements() {
-+      return this.ariaFocusableItems;
-       if (this.#dragAndDropElements) {
-         return this.#dragAndDropElements;
-       }
-@@ -1050,6 +1079,7 @@
+           visibleTabsInSplitView.forEach(tab => {
+@@ -992,6 +1016,7 @@
     _invalidateCachedTabs() {
       this.#allTabs = null;
       this._invalidateCachedVisibleTabs();
@@ -186,7 +173,7 @@ index a61b4e7af40f1404bf3555a7011c6211de917635..bb3c822ad14c4ebf0b8792665ff8242f
     }
 
     _invalidateCachedVisibleTabs() {
-@@ -1154,7 +1184,7 @@
+@@ -1095,7 +1120,7 @@
 
       if (node == null) {
         // We have a container for non-tab elements at the end of the scrollbox.
@@ -195,7 +182,7 @@ index a61b4e7af40f1404bf3555a7011c6211de917635..bb3c822ad14c4ebf0b8792665ff8242f
       }
 
       node.before(tab);
-@@ -1252,7 +1282,7 @@
+@@ -1193,7 +1218,7 @@
           // There are separate "new tab" buttons for horizontal tabs toolbar, vertical tabs and
           // for when the tab strip is overflowed (which is shared by vertical and horizontal tabs);
           // Attach the long click popup to all of them.
@@ -204,7 +191,7 @@ index a61b4e7af40f1404bf3555a7011c6211de917635..bb3c822ad14c4ebf0b8792665ff8242f
           const newTab2 = this.newTabButton;
           const newTabVertical = document.getElementById(
             "vertical-tabs-newtab-button"
-@@ -1353,8 +1383,10 @@
+@@ -1294,8 +1319,10 @@
      */
     _handleTabSelect(aInstant) {
       let selectedTab = this.selectedItem;
@@ -215,7 +202,7 @@ index a61b4e7af40f1404bf3555a7011c6211de917635..bb3c822ad14c4ebf0b8792665ff8242f
       selectedTab._notselectedsinceload = false;
     }
 
-@@ -1363,7 +1395,7 @@
+@@ -1304,7 +1331,7 @@
      * @param {boolean} [shouldScrollInstantly=false]
      */
     #ensureTabIsVisible(tab, shouldScrollInstantly = false) {
@@ -224,7 +211,7 @@ index a61b4e7af40f1404bf3555a7011c6211de917635..bb3c822ad14c4ebf0b8792665ff8242f
       if (arrowScrollbox?.overflowing) {
         arrowScrollbox.ensureElementIsVisible(tab, shouldScrollInstantly);
       }
-@@ -1496,7 +1528,7 @@
+@@ -1437,7 +1464,7 @@
     }
 
     _notifyBackgroundTab(aTab) {
--- a/src/browser/components/urlbar/UrlbarController-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarController-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarController.sys.mjs b/browser/components/urlbar/UrlbarController.sys.mjs
-index dc8ca021feff9e5c623dd2e9b3e3a8d6f55aa461..b6382bdcfef0cf6c2975fdb6f1a3c9b5c53f81af 100644
+index 09c1a7d4e156fe5e606f097277420333efe88976..f31e183e7b92c616d81dae509ef0448c4d507cc7 100644
 --- a/browser/components/urlbar/UrlbarController.sys.mjs
 +++ b/browser/components/urlbar/UrlbarController.sys.mjs
-@@ -302,7 +302,6 @@ export class UrlbarController {
+@@ -296,7 +296,6 @@ export class UrlbarController {
     const isMac = AppConstants.platform == "macosx";
     // Handle readline/emacs-style navigation bindings on Mac.
     if (
@@ -10,7 +10,7 @@ index dc8ca021feff9e5c623dd2e9b3e3a8d6f55aa461..b6382bdcfef0cf6c2975fdb6f1a3c9b5
       this.view.isOpen &&
       event.ctrlKey &&
       (event.key == "n" || event.key == "p")
-@@ -451,6 +450,8 @@ export class UrlbarController {
+@@ -445,6 +444,8 @@ export class UrlbarController {
             });
           }
           event.preventDefault();
--- a/src/browser/components/urlbar/content/UrlbarInput-mjs.patch
+++ b/src/browser/components/urlbar/content/UrlbarInput-mjs.patch
@@ -1,7 +1,7 @@
-diff --git a/browser/components/urlbar/content/UrlbarInput.mjs b/browser/components/urlbar/content/UrlbarInput.mjs
-index edb0482f0bfb22c70a585b0770e5b0437983779e..545f65db4fe8b807b388d5552842cd9e56a72eb3 100644
--- a/browser/components/urlbar/content/UrlbarInput.mjs
-+++ b/browser/components/urlbar/content/UrlbarInput.mjs
+diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
+index 6ad064710da20f7a13fda3517780c2f38b3d2865..58a01eef024d8b9992068a6a5b7be68f5f45accf 100644
+--- a/browser/components/urlbar/UrlbarInput.sys.mjs
+++ b/browser/components/urlbar/UrlbarInput.sys.mjs
@@ -68,6 +68,13 @@ const lazy = XPCOMUtils.declareLazy({
   logger: () => lazy.UrlbarUtils.getLogger({ prefix: "Input" }),
 });
@@ -13,10 +13,10 @@ index edb0482f0bfb22c70a585b0770e5b0437983779e..545f65db4fe8b807b388d5552842cd9e
 +  'default'
 +);
 +
- const UNLIMITED_MAX_RESULTS = 99;
+ const DEFAULT_FORM_HISTORY_NAME = "searchbar-history";
 
- let getBoundsWithoutFlushing = element =>
-@@ -630,7 +637,16 @@ export class UrlbarInput extends HTMLElement {
+ const UNLIMITED_MAX_RESULTS = 99;
+@@ -445,7 +452,16 @@ export class UrlbarInput {
     // See _on_select().  HTMLInputElement.select() dispatches a "select"
     // event but does not set the primary selection.
     this._suppressPrimaryAdjustment = true;
@@ -33,10 +33,10 @@ index edb0482f0bfb22c70a585b0770e5b0437983779e..545f65db4fe8b807b388d5552842cd9e
     this._suppressPrimaryAdjustment = false;
   }
 
-@@ -704,6 +720,10 @@ export class UrlbarInput extends HTMLElement {
+@@ -521,6 +537,10 @@ export class UrlbarInput {
     hideSearchTerms = false,
-     isSameDocument = false,
-   } = {}) {
+     isSameDocument = false
+   ) {
 +    if (this.hasAttribute("zen-newtab")) {
 +      return;
 +    }
@@ -44,7 +44,7 @@ index edb0482f0bfb22c70a585b0770e5b0437983779e..545f65db4fe8b807b388d5552842cd9e
     if (!this.#isAddressbar) {
       throw new Error(
         "Cannot set URI for UrlbarInput that is not an address bar"
-@@ -985,8 +1005,16 @@ export class UrlbarInput extends HTMLElement {
+@@ -798,8 +818,16 @@ export class UrlbarInput {
         return;
       }
     }
@@ -62,7 +62,7 @@ index edb0482f0bfb22c70a585b0770e5b0437983779e..545f65db4fe8b807b388d5552842cd9e
   }
 
   /**
-@@ -1405,7 +1433,11 @@ export class UrlbarInput extends HTMLElement {
+@@ -1215,7 +1243,11 @@ export class UrlbarInput {
     }
 
     if (!this.#providesSearchMode(result)) {
@@ -75,7 +75,7 @@ index edb0482f0bfb22c70a585b0770e5b0437983779e..545f65db4fe8b807b388d5552842cd9e
     }
 
     if (isCanonized) {
-@@ -2529,6 +2561,32 @@ export class UrlbarInput extends HTMLElement {
+@@ -2335,6 +2367,32 @@ export class UrlbarInput {
     await this.#updateLayoutBreakoutDimensions();
   }
 
@@ -108,7 +108,7 @@ index edb0482f0bfb22c70a585b0770e5b0437983779e..545f65db4fe8b807b388d5552842cd9e
   startLayoutExtend() {
     if (!this.#allowBreakout || this.hasAttribute("breakout-extend")) {
       // Do not expand if the Urlbar does not support being expanded or it is
-@@ -2543,6 +2601,13 @@ export class UrlbarInput extends HTMLElement {
+@@ -2349,6 +2407,13 @@ export class UrlbarInput {
 
     this.setAttribute("breakout-extend", "true");
 
@@ -122,7 +122,7 @@ index edb0482f0bfb22c70a585b0770e5b0437983779e..545f65db4fe8b807b388d5552842cd9e
     // 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")) {
-@@ -2562,6 +2627,24 @@ export class UrlbarInput extends HTMLElement {
+@@ -2368,6 +2433,24 @@ export class UrlbarInput {
       return;
     }
 
@@ -147,7 +147,7 @@ index edb0482f0bfb22c70a585b0770e5b0437983779e..545f65db4fe8b807b388d5552842cd9e
     this.removeAttribute("breakout-extend");
     this.#updateTextboxPosition();
   }
-@@ -2592,7 +2675,7 @@ export class UrlbarInput extends HTMLElement {
+@@ -2398,7 +2481,7 @@ export class UrlbarInput {
     forceUnifiedSearchButtonAvailable = false
   ) {
     let prevState = this.getAttribute("pageproxystate");
@@ -156,12 +156,12 @@ index edb0482f0bfb22c70a585b0770e5b0437983779e..545f65db4fe8b807b388d5552842cd9e
     this.setAttribute("pageproxystate", state);
     this._inputContainer.setAttribute("pageproxystate", state);
     this._identityBox?.setAttribute("pageproxystate", state);
-@@ -2846,10 +2929,12 @@ export class UrlbarInput extends HTMLElement {
+@@ -2635,10 +2718,12 @@ export class UrlbarInput {
       return;
     }
-     this.style.top = px(
+     this.textbox.style.top = px(
 +      this.window.gZenVerticalTabsManager._hasSetSingleToolbar ?
-       this.parentNode.getBoxQuads({
+       this.textbox.parentNode.getBoxQuads({
         ignoreTransforms: true,
         flush: false,
       })[0].p1.y
@@ -169,19 +169,19 @@ index edb0482f0bfb22c70a585b0770e5b0437983779e..545f65db4fe8b807b388d5552842cd9e
     );
   }
 
-@@ -2908,9 +2993,10 @@ export class UrlbarInput extends HTMLElement {
+@@ -2698,9 +2783,10 @@ export class UrlbarInput {
           return;
         }
 
 +        this.window.gZenVerticalTabsManager.recalculateURLBarHeight();
-         this.parentNode.style.setProperty(
+         this.textbox.parentNode.style.setProperty(
           "--urlbar-container-height",
-          px(getBoundsWithoutFlushing(this.parentNode).height)
-+          px(getBoundsWithoutFlushing(this.parentNode).height + 8)
+-          px(getBoundsWithoutFlushing(this.textbox.parentNode).height)
+          px(getBoundsWithoutFlushing(this.textbox.parentNode).height + 8)
         );
-         this.style.setProperty(
+         this.textbox.style.setProperty(
           "--urlbar-height",
-@@ -3344,6 +3430,7 @@ export class UrlbarInput extends HTMLElement {
+@@ -3134,6 +3220,7 @@ export class UrlbarInput {
   }
 
   _toggleActionOverride(event) {
@@ -189,7 +189,7 @@ index edb0482f0bfb22c70a585b0770e5b0437983779e..545f65db4fe8b807b388d5552842cd9e
     if (
       event.keyCode == KeyEvent.DOM_VK_SHIFT ||
       event.keyCode == KeyEvent.DOM_VK_ALT ||
-@@ -3447,8 +3534,8 @@ export class UrlbarInput extends HTMLElement {
+@@ -3237,8 +3324,8 @@ export class UrlbarInput {
     if (!this.#isAddressbar) {
       return val;
     }
@@ -200,7 +200,7 @@ index edb0482f0bfb22c70a585b0770e5b0437983779e..545f65db4fe8b807b388d5552842cd9e
       : val;
     // Only trim value if the directionality doesn't change to RTL and we're not
     // showing a strikeout https protocol.
-@@ -3754,6 +3841,7 @@ export class UrlbarInput extends HTMLElement {
+@@ -3544,6 +3631,7 @@ export class UrlbarInput {
     resultDetails = null,
     browser = this.window.gBrowser.selectedBrowser
   ) {
@@ -208,7 +208,7 @@ index edb0482f0bfb22c70a585b0770e5b0437983779e..545f65db4fe8b807b388d5552842cd9e
     if (this.#isAddressbar) {
       this.#prepareAddressbarLoad(
         url,
-@@ -3861,6 +3949,10 @@ export class UrlbarInput extends HTMLElement {
+@@ -3651,6 +3739,10 @@ export class UrlbarInput {
       }
       reuseEmpty = true;
     }
@@ -219,7 +219,7 @@ index edb0482f0bfb22c70a585b0770e5b0437983779e..545f65db4fe8b807b388d5552842cd9e
     if (
       where == "tab" &&
       reuseEmpty &&
-@@ -3868,6 +3960,9 @@ export class UrlbarInput extends HTMLElement {
+@@ -3658,6 +3750,9 @@ export class UrlbarInput {
     ) {
       where = "current";
     }
@@ -229,7 +229,7 @@ index edb0482f0bfb22c70a585b0770e5b0437983779e..545f65db4fe8b807b388d5552842cd9e
     return where;
   }
 
-@@ -4122,6 +4217,7 @@ export class UrlbarInput extends HTMLElement {
+@@ -3909,6 +4004,7 @@ export class UrlbarInput {
       this.setResultForCurrentValue(null);
       this.handleCommand();
       this.controller.clearLastQueryContextCache();
@@ -237,7 +237,7 @@ index edb0482f0bfb22c70a585b0770e5b0437983779e..545f65db4fe8b807b388d5552842cd9e
 
       this._suppressStartQuery = false;
     });
-@@ -4129,7 +4225,6 @@ export class UrlbarInput extends HTMLElement {
+@@ -3916,7 +4012,6 @@ export class UrlbarInput {
     contextMenu.addEventListener("popupshowing", () => {
       // Close the results pane when the input field contextual menu is open,
       // because paste and go doesn't want a result selection.
@@ -245,7 +245,7 @@ index edb0482f0bfb22c70a585b0770e5b0437983779e..545f65db4fe8b807b388d5552842cd9e
 
       let controller =
         this.document.commandDispatcher.getControllerForCommand("cmd_paste");
-@@ -4239,7 +4334,11 @@ export class UrlbarInput extends HTMLElement {
+@@ -4026,7 +4121,11 @@ export class UrlbarInput {
     if (!engineName && !source && !this.hasAttribute("searchmode")) {
       return;
     }
@@ -258,27 +258,27 @@ index edb0482f0bfb22c70a585b0770e5b0437983779e..545f65db4fe8b807b388d5552842cd9e
     if (this._searchModeIndicatorTitle) {
       this._searchModeIndicatorTitle.textContent = "";
       this._searchModeIndicatorTitle.removeAttribute("data-l10n-id");
-@@ -4549,6 +4648,7 @@ export class UrlbarInput extends HTMLElement {
+@@ -4338,6 +4437,7 @@ export class UrlbarInput {
 
     this.document.l10n.setAttributes(
       this.inputField,
 +      this.window.gZenVerticalTabsManager._hasSetSingleToolbar ? 'zen-singletoolbar-urlbar-placeholder-with-name' :
       l10nId,
-       l10nId == "urlbar-placeholder-with-name"
-         ? { name: engineName }
-@@ -4662,6 +4762,11 @@ export class UrlbarInput extends HTMLElement {
+       l10nId == "urlbar-placeholder-with-name" ? { name } : undefined
+     );
+@@ -4449,6 +4549,11 @@ export class UrlbarInput {
   }
 
   _on_click(event) {
 +    if (event.target == this.inputField) {
-+      event.zenOriginalTarget = this;
+      event.zenOriginalTarget = this.textbox;
 +      this._on_mousedown(event);
 +    }
 +
-     switch (event.target) {
-       case this.inputField:
-       case this._inputContainer:
-@@ -4740,7 +4845,7 @@ export class UrlbarInput extends HTMLElement {
+     if (
+       event.target == this.inputField ||
+       event.target == this._inputContainer
+@@ -4521,7 +4626,7 @@ export class UrlbarInput {
       }
     }
 
@@ -287,13 +287,13 @@ index edb0482f0bfb22c70a585b0770e5b0437983779e..545f65db4fe8b807b388d5552842cd9e
       this.view.autoOpen({ event });
     } else {
       if (this._untrimOnFocusAfterKeydown) {
-@@ -4780,9 +4885,16 @@ export class UrlbarInput extends HTMLElement {
+@@ -4561,9 +4666,16 @@ export class UrlbarInput {
   }
 
   _on_mousedown(event) {
 -    switch (event.currentTarget) {
 +    switch (event.zenOriginalTarget || event.currentTarget) {
-       case this: {
+       case this.textbox: {
         this._mousedownOnUrlbarDescendant = true;
 +        const isProbablyFloating =
 +          (this.zenUrlbarBehavior == "floating-on-type" &&
@@ -302,10 +302,10 @@ index edb0482f0bfb22c70a585b0770e5b0437983779e..545f65db4fe8b807b388d5552842cd9e
 +        if (event.type != "click" && isProbablyFloating || event.type == "click" && !isProbablyFloating) {
 +          return true;
 +        }
+ 
         if (
-           event.composedTarget != this.inputField &&
-           event.composedTarget != this._inputContainer
-@@ -4792,6 +4904,10 @@ export class UrlbarInput extends HTMLElement {
+           event.target != this.inputField &&
+@@ -4574,6 +4686,10 @@ export class UrlbarInput {
 
         this.focusedViaMousedown = !this.focused;
         this._preventClickSelectsAll = this.focused;
@@ -316,7 +316,7 @@ index edb0482f0bfb22c70a585b0770e5b0437983779e..545f65db4fe8b807b388d5552842cd9e
 
         // Keep the focus status, since the attribute may be changed
         // upon calling this.focus().
-@@ -4827,7 +4943,7 @@ export class UrlbarInput extends HTMLElement {
+@@ -4609,7 +4725,7 @@ export class UrlbarInput {
         }
         // Don't close the view when clicking on a tab; we may want to keep the
         // view open on tab switch, and the TabSelect event arrived earlier.
@@ -325,7 +325,7 @@ index edb0482f0bfb22c70a585b0770e5b0437983779e..545f65db4fe8b807b388d5552842cd9e
           break;
         }
 
-@@ -5155,7 +5271,7 @@ export class UrlbarInput extends HTMLElement {
+@@ -4930,7 +5046,7 @@ export class UrlbarInput {
     // When we are in actions search mode we can show more results so
     // increase the limit.
     let maxResults =
--- a/src/browser/components/urlbar/UrlbarPrefs-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarPrefs-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarPrefs.sys.mjs b/browser/components/urlbar/UrlbarPrefs.sys.mjs
-index 41e8aa0ee37fef0d24d41f2c4e776c39ed3895f6..293e993175bbbd67fa1541db6b9419b687de7fcd 100644
+index 0cc0db4889d66872bce2aa775a79a4c68e8cec51..604106e328843b3a6eb0922cc8663474ddb008f4 100644
 --- a/browser/components/urlbar/UrlbarPrefs.sys.mjs
 +++ b/browser/components/urlbar/UrlbarPrefs.sys.mjs
-@@ -759,6 +759,7 @@ function makeResultGroups({ showSearchSuggestionsFirst }) {
+@@ -763,6 +763,7 @@ function makeResultGroups({ showSearchSuggestionsFirst }) {
    */
   let rootGroup = {
     children: [
--- 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 3a9cb4735185691df021157e42f8b9cc93f14aa1..00d7eaf3177d27df1e0db5303405ce28f3031d34 100644
+index 15dd29152cf349b5ed23f1bae0a74a8d7dbe4c3d..f44f5dd87f778f432b0028969ca5732305c98915 100644
 --- a/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
 +++ b/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
-@@ -893,6 +893,7 @@ export class Query {
+@@ -883,6 +883,7 @@ export class Query {
     if (
       result.heuristic &&
       this.context.searchMode &&
--- a/src/browser/components/urlbar/UrlbarUtils-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarUtils-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarUtils.sys.mjs b/browser/components/urlbar/UrlbarUtils.sys.mjs
-index b97fa81cef276e4bb22414b7c182e00b4bb835dc..1f489eceead0aa331ace59281cb777db5e635366 100644
+index 7e9ede3dae5c2099c45e0221ad1cb8ebd622fc39..f82db27dbd07961ad6af7dbe2cb5d79e5f7a9828 100644
 --- a/browser/components/urlbar/UrlbarUtils.sys.mjs
 +++ b/browser/components/urlbar/UrlbarUtils.sys.mjs
-@@ -81,6 +81,7 @@ export var UrlbarUtils = {
+@@ -79,6 +79,7 @@ export var UrlbarUtils = {
     RESTRICT_SEARCH_KEYWORD: "restrictSearchKeyword",
     SUGGESTED_INDEX: "suggestedIndex",
     TAIL_SUGGESTION: "tailSuggestion",
@@ -10,7 +10,7 @@ index b97fa81cef276e4bb22414b7c182e00b4bb835dc..1f489eceead0aa331ace59281cb777db
   }),
 
   // Defines provider types.
-@@ -140,6 +141,7 @@ export var UrlbarUtils = {
+@@ -138,6 +139,7 @@ export var UrlbarUtils = {
     OTHER_NETWORK: 6,
     ADDON: 7,
     ACTIONS: 8,
@@ -18,7 +18,7 @@ index b97fa81cef276e4bb22414b7c182e00b4bb835dc..1f489eceead0aa331ace59281cb777db
   }),
 
   // Per-result exposure telemetry.
-@@ -552,6 +554,8 @@ export var UrlbarUtils = {
+@@ -549,6 +551,8 @@ export var UrlbarUtils = {
           return this.RESULT_GROUP.HEURISTIC_FALLBACK;
         case "UrlbarProviderHistoryUrlHeuristic":
           return this.RESULT_GROUP.HEURISTIC_HISTORY_URL;
--- 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 3a8c233dd1e05c070e497ec9877e65b9d8a3e87b..dd2a7aac6945331a3a50a0d7f6d62aeda396b560 100644
+index 307b3cac259c05e616cf7d5eb1ce50a146550cd9..72252a6363154b6c5f926bf2acf3282e8396d2ad 100644
 --- a/browser/components/urlbar/UrlbarValueFormatter.sys.mjs
 +++ b/browser/components/urlbar/UrlbarValueFormatter.sys.mjs
@@ -76,7 +76,7 @@ export class UrlbarValueFormatter {
--- a/src/browser/components/urlbar/UrlbarView-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarView-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarView.sys.mjs b/browser/components/urlbar/UrlbarView.sys.mjs
-index 6d6cc27e203a5799683a4e6eae1007ff30a69cd0..953c5cd09bcfd832d8ad11016977509f55935eb7 100644
+index c58bc4871fbfb5ca924df822a09d783f21db616a..68fd73055d30ec4f4128fb8639369f07b167955a 100644
 --- a/browser/components/urlbar/UrlbarView.sys.mjs
 +++ b/browser/components/urlbar/UrlbarView.sys.mjs
-@@ -618,7 +618,7 @@ export class UrlbarView {
+@@ -620,7 +620,7 @@ export class UrlbarView {
       !this.input.value ||
       this.input.getAttribute("pageproxystate") == "valid"
     ) {
@@ -11,7 +11,7 @@ index 6d6cc27e203a5799683a4e6eae1007ff30a69cd0..953c5cd09bcfd832d8ad11016977509f
         // 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.
-@@ -2852,6 +2852,8 @@ export class UrlbarView {
+@@ -2855,6 +2855,8 @@ export class UrlbarView {
       if (row?.hasAttribute("row-selectable")) {
         row?.toggleAttribute("selected", true);
       }
@@ -24,7 +24,7 @@ index 6d6cc27e203a5799683a4e6eae1007ff30a69cd0..953c5cd09bcfd832d8ad11016977509f
   }
 
   #enableOrDisableRowWrap() {
-    let wrap = getBoundsWithoutFlushing(this.input).width < 650;
+-    let wrap = getBoundsWithoutFlushing(this.input.textbox).width < 650;
 +    let wrap = false;
     this.#rows.toggleAttribute("wrap", wrap);
     this.oneOffSearchButtons?.container.toggleAttribute("wrap", wrap);
--- a/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch
+++ b/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/extensions/newtab/lib/ActivityStream.sys.mjs b/browser/extensions/newtab/lib/ActivityStream.sys.mjs
-index ae3c01650b3023a692cd4c50e33e3c3c39770c47..27a5fb0a630b9b79566be08cd5f7c9466ca30381 100644
+index bd453da1b0eca276f319aadf451258e7db021365..da64e88eb58ba1b15c31034684f9d259339f4438 100644
 --- a/browser/extensions/newtab/lib/ActivityStream.sys.mjs
 +++ b/browser/extensions/newtab/lib/ActivityStream.sys.mjs
-@@ -295,7 +295,7 @@ export const PREFS_CONFIG = new Map([
+@@ -251,7 +251,7 @@ export const PREFS_CONFIG = new Map([
     "showSponsoredTopSites",
     {
       title: "Show sponsored top sites",
--- a/src/browser/installer/package-manifest-in.patch
+++ b/src/browser/installer/package-manifest-in.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
-index dbfb287747ed9059cfb46838800421ac9ffe78c1..47279559a7dbea8b08bafb75e968f7b219e1d818 100644
+index 6bb2e64906d6fe173c9129dd9c9c80b5323416b1..9f1fb4764c8c13a02cf0d384cfa71cc16e3c8701 100644
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -374,17 +374,17 @@ bin/libfreebl_64int_3.so
+@@ -373,17 +373,17 @@ bin/libfreebl_64int_3.so
 ; [MaintenanceService]
 ;
 #ifdef MOZ_MAINTENANCE_SERVICE
--- a/src/browser/modules/BrowserWindowTracker-sys-mjs.patch
+++ b/src/browser/modules/BrowserWindowTracker-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/modules/BrowserWindowTracker.sys.mjs b/browser/modules/BrowserWindowTracker.sys.mjs
-index 0cd9e9630fff20d71dc1dd7367ae6af4f7a53f71..7212c5f4745f3c93c1ede932af1b0e85580aa679 100644
+index f2b64cfbdf579c67496b785c8efafc69bf20372a..f3d8755aa7d122d9ee5c449a02cceb629aa6aa00 100644
 --- a/browser/modules/BrowserWindowTracker.sys.mjs
 +++ b/browser/modules/BrowserWindowTracker.sys.mjs
-@@ -326,6 +326,7 @@ export const BrowserWindowTracker = {
+@@ -325,6 +325,7 @@ export const BrowserWindowTracker = {
     args = null,
     remote = undefined,
     fission = undefined,
@@ -10,7 +10,7 @@ index 0cd9e9630fff20d71dc1dd7367ae6af4f7a53f71..7212c5f4745f3c93c1ede932af1b0e85
   } = {}) {
     let windowFeatures = "chrome,dialog=no";
     if (all) {
-@@ -382,6 +383,12 @@ export const BrowserWindowTracker = {
+@@ -378,6 +379,12 @@ export const BrowserWindowTracker = {
       windowFeatures,
       args
     );
--- a/src/browser/modules/URILoadingHelper-sys-mjs.patch
+++ b/src/browser/modules/URILoadingHelper-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/modules/URILoadingHelper.sys.mjs b/browser/modules/URILoadingHelper.sys.mjs
-index 9175fa820ad6bb75cd125fbfda2bf07d6dba4c90..f673cfd15289401ae425256016bf51303063e0b2 100644
+index a3a84f96e54e5b74ad15f3825b380c30c117695f..ca702841c1df404a6f270ac08f962c8a225549d8 100644
 --- a/browser/modules/URILoadingHelper.sys.mjs
 +++ b/browser/modules/URILoadingHelper.sys.mjs
@@ -542,7 +542,7 @@ export const URILoadingHelper = {
--- a/src/browser/themes/shared/browser-shared-css.patch
+++ b/src/browser/themes/shared/browser-shared-css.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css
-index 63d9641c7107c1444cb74f1536193246106f5cae..4298760fab4862e64ec74df23e00b373c5745605 100644
+index 3cecc295f3ac764ed07094021372d35107df78ed..760f8bdcff87a6b803b115b249269438a27f8d80 100644
 --- a/browser/themes/shared/browser-shared.css
 +++ b/browser/themes/shared/browser-shared.css
-@@ -103,7 +103,7 @@ body {
+@@ -102,7 +102,7 @@ body {
   --toolbarbutton-border-radius: var(--button-border-radius);
   --identity-box-margin-inline: 4px;
   --urlbar-min-height: max(32px, 1.4em);
@@ -11,7 +11,7 @@ index 63d9641c7107c1444cb74f1536193246106f5cae..4298760fab4862e64ec74df23e00b373
 
   /* 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
-@@ -172,8 +172,6 @@ body {
+@@ -171,8 +171,6 @@ body {
    */
   &.fullscreen-with-menubar {
     z-index: var(--browser-area-z-index-toolbox-while-animating);
@@ -20,7 +20,7 @@ index 63d9641c7107c1444cb74f1536193246106f5cae..4298760fab4862e64ec74df23e00b373
   }
 
   /* Themes define a set of toolbox foreground and background colors which we
-@@ -282,13 +280,13 @@ body {
+@@ -281,13 +279,13 @@ body {
 
   @media (-moz-platform: macos) and (not (-moz-mac-rtl)) {
     &:-moz-locale-dir(ltr) {
--- a/src/browser/themes/shared/identity-block/identity-block-css.patch
+++ b/src/browser/themes/shared/identity-block/identity-block-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/identity-block/identity-block.css b/browser/themes/shared/identity-block/identity-block.css
-index e9f0ea328cde3631ef856f44d47abb9c5cec5ee1..66ec2bc8bb716ad9e87f88f3d93f9516c9eb8052 100644
+index 34e9206ff45592db2b1b24568f1f6f1bf16b4c3a..6fa3f13dd18f90bcc0c715c4896617fdfce4887e 100644
 --- a/browser/themes/shared/identity-block/identity-block.css
 +++ b/browser/themes/shared/identity-block/identity-block.css
@@ -7,7 +7,7 @@
@@ -11,7 +11,7 @@ index e9f0ea328cde3631ef856f44d47abb9c5cec5ee1..66ec2bc8bb716ad9e87f88f3d93f9516
     pointer-events: none;
     -moz-user-focus: ignore;
   }
-@@ -85,13 +85,6 @@
+@@ -81,13 +81,6 @@
   }
 }
 
@@ -25,7 +25,7 @@ index e9f0ea328cde3631ef856f44d47abb9c5cec5ee1..66ec2bc8bb716ad9e87f88f3d93f9516
 
 #urlbar[focused] {
   #identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button:not(:hover, [open]),
-@@ -182,16 +175,17 @@
+@@ -178,16 +171,17 @@
   }
 
   #identity-icon {
--- a/src/browser/themes/shared/jar-inc-mn.patch
+++ b/src/browser/themes/shared/jar-inc-mn.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn
-index ab8601e76409ad1a026763379a395dd52f503f27..3b32198dfa770d29f4e2f2b0faed5f3ff735c664 100644
+index ff198352720d7935b497e43f3e6b8ca04905e885..63e09db981a7ae35b1bb2c610133f624e8f61b74 100644
 --- a/browser/themes/shared/jar.inc.mn
 +++ b/browser/themes/shared/jar.inc.mn
-@@ -326,3 +326,5 @@
+@@ -323,3 +323,5 @@
 
   skin/classic/browser/illustrations/market-opt-in.svg         (../shared/illustrations/market-opt-in.svg)
   skin/classic/browser/illustrations/yelpRealtime-opt-in.svg   (../shared/illustrations/yelpRealtime-opt-in.svg)
--- a/src/browser/themes/shared/tabbrowser/content-area-css.patch
+++ b/src/browser/themes/shared/tabbrowser/content-area-css.patch
@@ -1,16 +1,8 @@
 diff --git a/browser/themes/shared/tabbrowser/content-area.css b/browser/themes/shared/tabbrowser/content-area.css
-index b00139d7af878326ff303c08d5ddd47501b8c7db..dbd8a9124fb159fa59012a6c06899a8ec74a1f27 100644
+index 55f33b3f630ca0eea7e4bde19f9875802c8aec78..f11fdaab05baf85fe2b56fa07442ded3c9641abc 100644
 --- a/browser/themes/shared/tabbrowser/content-area.css
 +++ b/browser/themes/shared/tabbrowser/content-area.css
-@@ -90,7 +90,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") {
-@@ -145,7 +144,6 @@
+@@ -140,7 +140,6 @@
   }
 
   browser:is([blank], [pendingpaint]) {
@@ -18,7 +10,7 @@ index b00139d7af878326ff303c08d5ddd47501b8c7db..dbd8a9124fb159fa59012a6c06899a8e
   }
 
   browser[type="content"] {
-@@ -392,7 +390,7 @@ split-view-footer {
+@@ -377,7 +376,7 @@ split-view-footer {
 
 .dialogStack {
   z-index: var(--browser-stack-z-index-dialog-stack);
--- a/src/browser/themes/shared/tabbrowser/tabs-css.patch
+++ b/src/browser/themes/shared/tabbrowser/tabs-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/tabbrowser/tabs.css b/browser/themes/shared/tabbrowser/tabs.css
-index 310e7866b942df5c3c34815f4612a2a2ad8c42a6..c474e1cddcecd3def3b255c5c530c0b36a38e6b0 100644
+index 8a4d3860b344e2dc2128cfc2b1673de582e19c7c..086171783cd9a8629ccf4b2e90813e58c4793878 100644
 --- a/browser/themes/shared/tabbrowser/tabs.css
 +++ b/browser/themes/shared/tabbrowser/tabs.css
@@ -21,7 +21,7 @@
@@ -23,7 +23,7 @@ index 310e7866b942df5c3c34815f4612a2a2ad8c42a6..c474e1cddcecd3def3b255c5c530c0b3
   --tab-selected-bgcolor: var(--toolbar-bgcolor);
   --tab-selected-color-scheme: var(--toolbar-color-scheme);
   &[lwt-tab-selected="light"] {
-@@ -293,7 +293,6 @@
+@@ -285,7 +285,6 @@
   }
 
   :root:not([uidensity="compact"], [sidebar-expand-on-hover]) &[pinned] {
@@ -31,7 +31,7 @@ index 310e7866b942df5c3c34815f4612a2a2ad8c42a6..c474e1cddcecd3def3b255c5c530c0b3
   }
 
   &:is([selected], [multiselected]) {
-@@ -307,6 +306,7 @@
+@@ -299,6 +298,7 @@
     border-radius: inherit;
     position: relative;
     overflow: hidden;
@@ -39,7 +39,7 @@ index 310e7866b942df5c3c34815f4612a2a2ad8c42a6..c474e1cddcecd3def3b255c5c530c0b3
 
     &::before {
       position: absolute;
-@@ -506,10 +506,6 @@
+@@ -502,10 +502,6 @@
   /* stylelint-disable-next-line media-query-no-invalid */
   @media -moz-pref("browser.tabs.fadeOutUnloadedTabs") {
     &[pending] {
@@ -50,7 +50,7 @@ index 310e7866b942df5c3c34815f4612a2a2ad8c42a6..c474e1cddcecd3def3b255c5c530c0b3
       opacity: 0.5;
       /* Fade the favicon out */
       transition-property: filter, opacity;
-@@ -526,10 +522,6 @@
+@@ -522,10 +518,6 @@
   /* stylelint-disable-next-line media-query-no-invalid */
   @media -moz-pref("browser.tabs.fadeOutExplicitlyUnloadedTabs") {
     &[pending][discarded] {
@@ -61,7 +61,7 @@ index 310e7866b942df5c3c34815f4612a2a2ad8c42a6..c474e1cddcecd3def3b255c5c530c0b3
       opacity: 0.5;
       /* Fade the favicon out */
       transition-property: filter, opacity;
-@@ -598,7 +590,7 @@
+@@ -593,7 +585,7 @@
   z-index: 1; /* Overlay tab title */
 
   #tabbrowser-tabs[orient="vertical"] & {
@@ -70,7 +70,7 @@ index 310e7866b942df5c3c34815f4612a2a2ad8c42a6..c474e1cddcecd3def3b255c5c530c0b3
   }
 
   &[crashed] {
-@@ -606,7 +598,7 @@
+@@ -601,7 +593,7 @@
   }
 
   #tabbrowser-tabs[orient="vertical"]:not([expanded]) &:not([crashed]),
@@ -79,7 +79,7 @@ index 310e7866b942df5c3c34815f4612a2a2ad8c42a6..c474e1cddcecd3def3b255c5c530c0b3
     &[soundplaying] {
       list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-playing-small.svg");
     }
-@@ -663,7 +655,7 @@
+@@ -658,7 +650,7 @@
     }
   }
 
@@ -88,7 +88,7 @@ index 310e7866b942df5c3c34815f4612a2a2ad8c42a6..c474e1cddcecd3def3b255c5c530c0b3
   &[crashed] {
     display: revert;
   }
-@@ -830,7 +822,7 @@
+@@ -759,7 +751,7 @@
       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]),
@@ -97,7 +97,7 @@ index 310e7866b942df5c3c34815f4612a2a2ad8c42a6..c474e1cddcecd3def3b255c5c530c0b3
       &:is([soundplaying], [muted], [activemedia-blocked]) {
         display: flex;
       }
-@@ -1521,7 +1513,7 @@ tab-group {
+@@ -1446,7 +1438,7 @@ tab-group {
 }
 
 #tabbrowser-tabs[orient="vertical"][expanded] {
@@ -106,7 +106,7 @@ index 310e7866b942df5c3c34815f4612a2a2ad8c42a6..c474e1cddcecd3def3b255c5c530c0b3
   &[movingtab][movingtab-addToGroup]:not([movingtab-group], [movingtab-ungroup]) .tabbrowser-tab:is(:active, [multiselected]) {
     margin-inline-start: var(--space-medium);
   }
-@@ -1999,7 +1991,7 @@ tab-group {
+@@ -1893,7 +1885,7 @@ tab-group {
   }
 }
 
@@ -115,7 +115,7 @@ index 310e7866b942df5c3c34815f4612a2a2ad8c42a6..c474e1cddcecd3def3b255c5c530c0b3
 #vertical-tabs-newtab-button {
   appearance: none;
   min-height: var(--tab-min-height);
-@@ -2010,7 +2002,7 @@ tab-group {
+@@ -1904,7 +1896,7 @@ tab-group {
   margin-inline: var(--tab-inner-inline-margin);
 
   #tabbrowser-tabs[orient="vertical"]:not([expanded]) & > .toolbarbutton-text {
@@ -124,7 +124,7 @@ index 310e7866b942df5c3c34815f4612a2a2ad8c42a6..c474e1cddcecd3def3b255c5c530c0b3
   }
 
   &:hover {
-@@ -2034,7 +2026,7 @@ tab-group {
+@@ -1928,7 +1920,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.
  */
@@ -133,7 +133,7 @@ index 310e7866b942df5c3c34815f4612a2a2ad8c42a6..c474e1cddcecd3def3b255c5c530c0b3
   margin-block: var(--tab-block-margin);
 }
 
-@@ -2222,7 +2214,6 @@ tab-group {
+@@ -2116,7 +2108,6 @@ tab-group {
 
   &:not([expanded]) {
     .tabbrowser-tab[pinned] {
@@ -141,7 +141,7 @@ index 310e7866b942df5c3c34815f4612a2a2ad8c42a6..c474e1cddcecd3def3b255c5c530c0b3
     }
 
     .tab-background {
-@@ -2262,8 +2253,8 @@ tab-group {
+@@ -2156,8 +2147,8 @@ tab-group {
       display: block;
       position: absolute;
       inset: auto;
@@ -152,7 +152,7 @@ index 310e7866b942df5c3c34815f4612a2a2ad8c42a6..c474e1cddcecd3def3b255c5c530c0b3
 
       &:-moz-window-inactive {
         background-image:
-@@ -2382,7 +2373,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
+@@ -2276,7 +2267,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
   list-style-image: url(chrome://global/skin/icons/plus.svg);
 }
 
--- a/src/browser/themes/shared/urlbar-searchbar-css.patch
+++ b/src/browser/themes/shared/urlbar-searchbar-css.patch
@@ -1,17 +1,17 @@
 diff --git a/browser/themes/shared/urlbar-searchbar.css b/browser/themes/shared/urlbar-searchbar.css
-index edfe3e05a1b4517a4de6e09221ebdcfb5d8f1fe5..5986f88babf2b8d48ec8a5c0724787b13275aeff 100644
+index 45a87b96db14f64e0d8a3a3aae07f76c8f7e765f..d75f61cb2d27205aa2c47cf902d38e26098fbf2c 100644
 --- a/browser/themes/shared/urlbar-searchbar.css
 +++ b/browser/themes/shared/urlbar-searchbar.css
-@@ -9,7 +9,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));
+@@ -6,7 +6,7 @@
+ 
+ :root {
+   --urlbar-container-min-width: 310px;
+-  --urlbar-container-padding: 1px;
 +  --urlbar-container-padding: 2px;
-   --urlbar-container-border-padding: calc(var(--urlbar-container-border-width) + var(--urlbar-container-padding));
   --urlbar-margin-inline: 5px;
   --urlbar-padding-block: 4px;
-@@ -52,7 +52,7 @@
+ 
+@@ -48,7 +48,7 @@
 #urlbar[usertyping] > .urlbar-input-container > #page-action-buttons > #urlbar-zoom-button,
 .urlbar:is(:not([usertyping]), :not([focused])) > .urlbar-input-container > .urlbar-go-button,
 .urlbar-revert-button-container {
@@ -20,7 +20,7 @@ index edfe3e05a1b4517a4de6e09221ebdcfb5d8f1fe5..5986f88babf2b8d48ec8a5c0724787b1
 }
 
 /* When rich suggestions are enabled the urlbar identity icon is given extra padding to
-@@ -323,10 +323,14 @@
+@@ -320,10 +320,14 @@
 
 .urlbar[breakout][breakout-extend] {
   height: auto;
--- a/src/browser/themes/shared/urlbarView-css.patch
+++ b/src/browser/themes/shared/urlbarView-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/urlbarView.css b/browser/themes/shared/urlbarView.css
-index 1ba5a570cb1fe690cf88396643baba02f9265095..312891b41e1c62b4ed53f5cbd63bd3280dde7512 100644
+index d59a4e8514c3e8f16c2512abacf8e95d7e7255c5..5c226bed71203dc39723f07107b3de89e0d1776f 100644
 --- a/browser/themes/shared/urlbarView.css
 +++ b/browser/themes/shared/urlbarView.css
@@ -20,7 +20,7 @@
--- a/src/browser/themes/shared/zen-icons/common/urlbar-arrow.svg
+++ b/src/browser/themes/shared/zen-icons/common/urlbar-arrow.svg
@@ -2,4 +2,4 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor"><defs><mask id="arrow-cutout"><rect x="0" y="0" width="16" height="16" fill="white"/><path fill="black" d="m8.354 10.854l2.5-2.5a.5.5 0 0 0 0-.708l-2.5-2.5a.5.5 0 0 0-.708.708L9.793 7.5H5.5a.5.5 0 0 0 0 1h4.293l-1.647 1.646a.5.5 0 1 0 .708.708z"/></mask></defs><path d="M2 3.5 A1.5 1.5 0 0 1 3.5 2 h9 A1.5 1.5 0 0 1 14 3.5 v9 A1.5 1.5 0 0 1 12.5 14 h-9 A1.5 1.5 0 0 1 2 12.5 Z" mask="url(#arrow-cutout)"/></svg>
+<svg fill="currentColor" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"><path mask="url(#arrow-cutout)" d="M 2,3.5 A 1.5,1.5 0 0 1 3.5,2 h 9 A 1.5,1.5 0 0 1 14,3.5 v 9 A 1.5,1.5 0 0 1 12.5,14 h -9 A 1.5,1.5 0 0 1 2,12.5 Z"/></svg>
--- a/src/browser/themes/shared/zen-icons/update-resources.sh
+++ b/src/browser/themes/shared/zen-icons/update-resources.sh
@@ -72,12 +72,14 @@ do_icons() {
 do_common_icons() {
  for filename in common/*.svg; do
    # remove the os/ prefix
+    merge_svg_paths $filename
    add_header_to_file $filename
    filename=$(basename $filename)
    echo "*  skin/classic/browser/zen-icons/$filename                      (../shared/zen-icons/common/$filename) " >> jar.inc.mn
  done
  for filename in common/selectable/*.svg; do
    # remove the os/ prefix
+    merge_svg_paths $filename
    add_header_to_file $filename
    filename=$(basename $filename)
    echo "*  skin/classic/browser/zen-icons/selectable/$filename          (../shared/zen-icons/common/selectable/$filename) " >> jar.inc.mn
--- a/src/build/moz-configure/toolchain-configure.patch
+++ b/src/build/moz-configure/toolchain-configure.patch
@@ -0,0 +1,13 @@
+diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
+index 3d8d2ea651fa1320306b32b0f7b1b73e0da1df61..257f75a92a26d7a724353c614365924d230aef83 100644
+--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
+@@ -1991,7 +1991,7 @@ def select_linker_tmpl(host_or_target):
+             # ensure consistent output.
+             env["LC_ALL"] = "C"
+             retcode, stdout, stderr = get_cmd_output(*cmd, env=env)
+-            if retcode == 1 and "Logging ld64 options" in stderr:
+            if retcode == 1 and "ld: unknown options: --version" in stderr:
+                 kind = "ld64"
+ 
+             elif retcode != 0:
--- a/src/devtools/server/actors/animation-type-longhand-js.patch
+++ b/src/devtools/server/actors/animation-type-longhand-js.patch
@@ -1,5 +1,5 @@
 diff --git a/devtools/server/actors/animation-type-longhand.js b/devtools/server/actors/animation-type-longhand.js
-index f6cd7b4599ab74fbdc301f316fd7ecc2e2eb841c..8279a943803ca75fe0a231606ae26a678fcc0b60 100644
+index 76c58a23422b923e191870f27090c7fc6d63884e..b19f47d31195774cec2c7e67903c892aa1329f3d 100644
 --- a/devtools/server/actors/animation-type-longhand.js
 +++ b/devtools/server/actors/animation-type-longhand.js
@@ -342,6 +342,7 @@ exports.ANIMATION_TYPE_FOR_LONGHANDS = [
--- a/src/devtools/startup/DevToolsStartup-sys-mjs.patch
+++ b/src/devtools/startup/DevToolsStartup-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/devtools/startup/DevToolsStartup.sys.mjs b/devtools/startup/DevToolsStartup.sys.mjs
-index 40926f9620bfe8ecc1d295026b219f5b7f83860c..6811d0681c9c9b8555f0c7f72d6cd3cd42a0b1bd 100644
+index 50fd07c1365ad25dc31c806f11751368f0d27a46..e26e90ece2d5dc42312f95661b5a38eec3556986 100644
 --- a/devtools/startup/DevToolsStartup.sys.mjs
 +++ b/devtools/startup/DevToolsStartup.sys.mjs
-@@ -835,6 +835,7 @@ DevToolsStartup.prototype = {
+@@ -829,6 +829,7 @@ DevToolsStartup.prototype = {
     // account (see bug 832984).
     const mainKeyset = doc.getElementById("mainKeyset");
     mainKeyset.parentNode.insertBefore(keyset, mainKeyset);
--- a/src/dom/base/Document-cpp.patch
+++ b/src/dom/base/Document-cpp.patch
@@ -1,5 +1,5 @@
 diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp
-index 7bbbaf6fb936eda9cf87f164f93f4a96a50cf733..b1a50d8b4932f60f882b7f60c7d65ce3a9fde99d 100644
+index 5a890d76ef8398c1a8dc6d84a6c43ec7e2b7c39e..aa25c68e36010004b95c14b8a8a88ca7e85de84d 100644
 --- a/dom/base/Document.cpp
 +++ b/dom/base/Document.cpp
@@ -461,6 +461,7 @@
--- a/src/dom/base/use_counter_metrics-yaml.patch
+++ b/src/dom/base/use_counter_metrics-yaml.patch
@@ -1,8 +1,8 @@
 diff --git a/dom/base/use_counter_metrics.yaml b/dom/base/use_counter_metrics.yaml
-index 84aa1ac40d01bc73f5039bd5c589c3fdf3a6c8ce..090f9e1eef46ed45c0a98a73013ad59faeb3414f 100644
+index 0635fe4dc5bf231300c1b53b093e2200c4fde134..c1d868cb7ebcf322885d562217ff9c03b16f7119 100644
 --- a/dom/base/use_counter_metrics.yaml
 +++ b/dom/base/use_counter_metrics.yaml
-@@ -22106,6 +22106,22 @@ use.counter.css.page:
+@@ -21154,6 +21154,22 @@ use.counter.css.page:
     send_in_pings:
       - use-counters
 
@@ -25,7 +25,7 @@ index 84aa1ac40d01bc73f5039bd5c589c3fdf3a6c8ce..090f9e1eef46ed45c0a98a73013ad59f
   css_transform_origin:
     type: counter
     description: >
-@@ -34076,6 +34092,22 @@ use.counter.css.doc:
+@@ -33124,6 +33140,22 @@ use.counter.css.doc:
     send_in_pings:
       - use-counters
 
--- a/src/dom/media/mediaelement/HTMLMediaElement-cpp.patch
+++ b/src/dom/media/mediaelement/HTMLMediaElement-cpp.patch
@@ -1,5 +1,5 @@
 diff --git a/dom/media/mediaelement/HTMLMediaElement.cpp b/dom/media/mediaelement/HTMLMediaElement.cpp
-index 935c9783ceb66ad8c6c8748ca3113664f5b114d3..a9f256a83b68940c829b24a19c67c56f11a01765 100644
+index f26c8c26354fd65ebf2c5f4797cb2bd200f764e6..90e0b81b471d8bfa0140fa3c7996f7b796564d50 100644
 --- a/dom/media/mediaelement/HTMLMediaElement.cpp
 +++ b/dom/media/mediaelement/HTMLMediaElement.cpp
@@ -451,6 +451,7 @@ class HTMLMediaElement::MediaControlKeyListener final
@@ -10,7 +10,7 @@ index 935c9783ceb66ad8c6c8748ca3113664f5b114d3..a9f256a83b68940c829b24a19c67c56f
       NotifyAudibleStateChanged(mIsOwnerAudible
                                     ? MediaAudibleState::eAudible
                                     : MediaAudibleState::eInaudible);
-@@ -7247,6 +7248,9 @@ void HTMLMediaElement::FireTimeUpdate(TimeupdateType aType) {
+@@ -7232,6 +7233,9 @@ void HTMLMediaElement::FireTimeUpdate(TimeupdateType aType) {
     QueueTask(std::move(runner));
     mQueueTimeUpdateRunnerTime = TimeStamp::Now();
     mLastCurrentTime = CurrentTime();
--- a/src/firefox-patches/147_windows_border_fix_1.patch
+++ b/src/firefox-patches/147_windows_border_fix_1.patch
@@ -0,0 +1,91 @@
+From 433cc8224790300fdabe76bd225b644c1812da34 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
+Date: Thu, 27 Nov 2025 15:28:12 +0000
+Subject: [PATCH] Bug 1993474 - Ensure our WNDPROC has precedence over
+ WinAppSDK's. r=gstoll,win-reviewers
+
+See the comment for reasoning. WM_NCCALCSIZE wasn't getting called, and
+we rely on that to get the right client area on things like maximized
+windows.
+
+Differential Revision: https://phabricator.services.mozilla.com/D274281
+---
+ widget/windows/nsWindow.cpp | 32 ++++++++++++++++++++++----------
+ widget/windows/nsWindow.h   |  2 ++
+ 2 files changed, 24 insertions(+), 10 deletions(-)
+
+diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
+index 0b98d157097da..b357df236cfcd 100644
+--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
+@@ -1520,12 +1520,31 @@ DWORD nsWindow::WindowExStyle() {
+  *
+  **************************************************************/
+ 
+bool nsWindow::ShouldAssociateWithWinAppSDK() const {
+  // We currently don't need any SDK functionality for for PiP windows,
+  // and using the SDK on these windows causes them to go under the
+  // taskbar (bug 1995838).
+  //
+  // TODO(emilio): That might not be true anymore after bug 1993474,
+  // consider re-testing and removing that special-case.
+  return IsTopLevelWidget() && !mIsPIPWindow;
+}
+
+ bool nsWindow::AssociateWithNativeWindow() {
+   if (!mWnd || !IsWindow(mWnd)) {
+     NS_ERROR("Invalid window handle");
+     return false;
+   }
+ 
+  if (ShouldAssociateWithWinAppSDK()) {
+    // Make sure to call this here to associate our window with the
+    // Windows App SDK _before_ setting our WNDPROC, if needed.
+    // This is important because the SDKs WNDPROC might handle messages like
+    // WM_NCCALCSIZE without calling into us, and that can cause sizing issues,
+    // see bug 1993474.
+    WindowsUIUtils::SetIsTitlebarCollapsed(mWnd, mCustomNonClient);
+  }
+
+   // Connect the this pointer to the native window handle.
+   // This should be done before SetWindowLongPtrW, because nsWindow::WindowProc
+   // uses WinUtils::GetNSWindowPtr internally.
+@@ -1552,12 +1571,7 @@ void nsWindow::DissociateFromNativeWindow() {
+   DebugOnly<WNDPROC> wndProcBeforeDissociate =
+       reinterpret_cast<WNDPROC>(::SetWindowLongPtrW(
+           mWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(*mPrevWndProc)));
+-  // If we've used the Windows App SDK to remove the minimize/maximize/close
+-  // entries from the titlebar, then the Windows App SDK sets its own WNDPROC
+-  // own the window, so this assertion would fail. But we only do this if
+-  // Mica is available.
+-  NS_ASSERTION(WinUtils::MicaAvailable() ||
+-                   wndProcBeforeDissociate == nsWindow::WindowProc,
+  NS_ASSERTION(wndProcBeforeDissociate == nsWindow::WindowProc,
+                "Unstacked an unexpected native window procedure");
+ 
+   WinUtils::SetNSWindowPtr(mWnd, nullptr);
+@@ -2835,9 +2849,7 @@ void nsWindow::SetCustomTitlebar(bool aCustomTitlebar) {
+     mCustomNonClientMetrics = {};
+     ResetLayout();
+   }
+-  // Not needed for PiP windows, and using the Windows App SDK on
+-  // these windows causes them to go under the taskbar (bug 1995838)
+-  if (!mPIPWindow) {
+  if (ShouldAssociateWithWinAppSDK()) {
+     WindowsUIUtils::SetIsTitlebarCollapsed(mWnd, mCustomNonClient);
+   }
+ }
+diff --git a/widget/windows/nsWindow.h b/widget/windows/nsWindow.h
+index 20f016757dfee..2756b248368a3 100644
+--- a/widget/windows/nsWindow.h
+++ b/widget/windows/nsWindow.h
+@@ -335,6 +335,8 @@ class nsWindow final : public nsIWidget {
+ 
+   bool IsRTL() const { return mIsRTL; }
+ 
+  bool ShouldAssociateWithWinAppSDK() const;
+
+   /**
+    * AssociateDefaultIMC() associates or disassociates the default IMC for
+    * the window.
+ 
--- a/src/firefox-patches/147_windows_border_fix_2.patch
+++ b/src/firefox-patches/147_windows_border_fix_2.patch
@@ -0,0 +1,58 @@
+diff --git a/widget/windows/nsWindow.h b/widget/windows/nsWindow.h
+--- a/widget/windows/nsWindow.h
+++ b/widget/windows/nsWindow.h
+@@ -850,13 +850,10 @@
+   bool mHasTaskbarIconBeenCreated = false;
+ 
+   // Whether we're in the process of sending a WM_SETTEXT ourselves
+   bool mSendingSetText = false;
+ 
+-  // Whether we're a PIP window.
+-  bool mPIPWindow : 1;
+-
+   // Whether we are asked to render a mica backdrop.
+   bool mMicaBackdrop : 1;
+ 
+   int32_t mCachedHitTestResult = 0;
+ 
+diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
+--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
+@@ -815,11 +815,10 @@
+  **************************************************************/
+ 
+ nsWindow::nsWindow()
+     : nsIWidget(BorderStyle::Default),
+       mFrameState(std::in_place, this),
+-      mPIPWindow(false),
+       mMicaBackdrop(false),
+       mLastPaintEndTime(TimeStamp::Now()),
+       mCachedHitTestTime(TimeStamp::Now()),
+       mSizeConstraintsScale(GetDefaultScale().scale) {
+   if (!gInitializedVirtualDesktopManager) {
+@@ -1026,11 +1025,10 @@
+ 
+   HWND parent =
+       aParent ? (HWND)aParent->GetNativeData(NS_NATIVE_WINDOW) : nullptr;
+ 
+   mIsRTL = aInitData.mRTL;
+-  mPIPWindow = aInitData.mPIPWindow;
+   mOpeningAnimationSuppressed = aInitData.mIsAnimationSuppressed;
+   mAlwaysOnTop = aInitData.mAlwaysOnTop;
+   mIsAlert = aInitData.mIsAlert;
+   mResizable = aInitData.mResizable;
+ 
+@@ -2805,11 +2803,11 @@
+   } else if (sizeMode == nsSizeMode_Maximized) {
+     // We make the entire frame part of the client area. We leave the default
+     // frame sizes for left, right and bottom since Windows will automagically
+     // position the edges "offscreen" for maximized windows.
+     metrics.mOffset.top = metrics.mCaptionHeight;
+-  } else if (mPIPWindow &&
+  } else if (mIsPIPWindow &&
+              !StaticPrefs::widget_windows_pip_decorations_enabled()) {
+     metrics.mOffset = metrics.DefaultMargins();
+   } else {
+     metrics.mOffset = NormalWindowNonClientOffset();
+   }
+
--- a/src/firefox-patches/147_windows_border_fix_3.patch
+++ b/src/firefox-patches/147_windows_border_fix_3.patch
@@ -0,0 +1,34 @@
+From dd4460727998a53e9fa7372afba2a93a9546cec3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
+Date: Fri, 28 Nov 2025 15:06:26 +0000
+Subject: [PATCH] Bug 2002986 - Use IAppWindowTitlebar::ResetToDefault() for
+ non-collapsed titlebar. r=win-reviewers,gstoll
+
+This seems to actually go to the default DWM stuff and is the documented
+way of doing so:
+
+https://learn.microsoft.com/en-us/windows/apps/develop/title-bar#reset-the-title-bar
+
+Differential Revision: https://phabricator.services.mozilla.com/D274413
+---
+ widget/windows/WindowsUIUtils.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/widget/windows/WindowsUIUtils.cpp b/widget/windows/WindowsUIUtils.cpp
+index a5a6c893e7056..abaabfba69dfa 100644
+--- a/widget/windows/WindowsUIUtils.cpp
+++ b/widget/windows/WindowsUIUtils.cpp
+@@ -1394,7 +1394,11 @@ void WindowsUIUtils::SetIsTitlebarCollapsed(HWND aWnd, bool aIsCollapsed) {
+     MOZ_ASSERT_UNREACHABLE("IAppWindowTitleBar could not be acquired");
+     return;
+   }
+-  hr = titleBar->put_ExtendsContentIntoTitleBar(aIsCollapsed);
+  if (aIsCollapsed) {
+    hr = titleBar->put_ExtendsContentIntoTitleBar(aIsCollapsed);
+  } else {
+    hr = titleBar->ResetToDefault();
+  }
+   if (FAILED(hr)) {
+     MOZ_LOG(gWindowsLog, LogLevel::Error,
+             ("Skipping SetIsTitlebarCollapsed() because "
+ 
--- a/src/firefox-patches/147_windows_border_fix_4.patch
+++ b/src/firefox-patches/147_windows_border_fix_4.patch
@@ -0,0 +1,34 @@
+From dd4460727998a53e9fa7372afba2a93a9546cec3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
+Date: Fri, 28 Nov 2025 15:06:26 +0000
+Subject: [PATCH] Bug 2002986 - Use IAppWindowTitlebar::ResetToDefault() for
+ non-collapsed titlebar. r=win-reviewers,gstoll
+
+This seems to actually go to the default DWM stuff and is the documented
+way of doing so:
+
+https://learn.microsoft.com/en-us/windows/apps/develop/title-bar#reset-the-title-bar
+
+Differential Revision: https://phabricator.services.mozilla.com/D274413
+---
+ widget/windows/WindowsUIUtils.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/widget/windows/WindowsUIUtils.cpp b/widget/windows/WindowsUIUtils.cpp
+index a5a6c893e7056..abaabfba69dfa 100644
+--- a/widget/windows/WindowsUIUtils.cpp
+++ b/widget/windows/WindowsUIUtils.cpp
+@@ -1394,7 +1394,11 @@ void WindowsUIUtils::SetIsTitlebarCollapsed(HWND aWnd, bool aIsCollapsed) {
+     MOZ_ASSERT_UNREACHABLE("IAppWindowTitleBar could not be acquired");
+     return;
+   }
+-  hr = titleBar->put_ExtendsContentIntoTitleBar(aIsCollapsed);
+  if (aIsCollapsed) {
+    hr = titleBar->put_ExtendsContentIntoTitleBar(aIsCollapsed);
+  } else {
+    hr = titleBar->ResetToDefault();
+  }
+   if (FAILED(hr)) {
+     MOZ_LOG(gWindowsLog, LogLevel::Error,
+             ("Skipping SetIsTitlebarCollapsed() because "
+ 
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
mr. m	f67fa2339b	feat: Fix data path, b=no-bug, c=workflows	2026-01-08 14:31:07 +01:00
mr. m	7f29800982	feat: Start implementing PGO profiling on different steps, b=no-bug, c=workflows, configs	2026-01-07 13:42:42 +01:00