feat: Add simple routing class, b=no-bug, c=no-component

.github/workflows/build.yml

@@ -248,8 +248,8 @@ jobs:
 
       - name: Setup Git
         run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git config --global user.email "mauro-balades@users.noreply.github.com"
+          git config --global user.name "mauro-balades"
 
       - name: Install dependencies
         run: |
@@ -368,7 +368,7 @@ jobs:
     strategy:
       matrix:
         arch: [x86_64, aarch64]
-    needs: [linux, build-data]
+    needs: [linux]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -406,8 +406,6 @@ jobs:
             sed -i -e 's/StartupWMClass=zen/StartupWMClass=zen-twilight/g' build/AppDir/zen.desktop
           fi
 
-          sed -i -e 's/\$VERSION/${{ needs.build-data.outputs.version }}/g' build/AppDir/zen.desktop
-
           APPDIR=build/AppDir
           tar -xvf *.tar.* && rm -rf *.tar.*
           mv zen/* $APPDIR/
@@ -567,7 +565,7 @@ jobs:
             ./zen.installer.exe/*
             ./zen.installer-arm64.exe/*
             ./zen.macos-universal.dmg/*
-          tag_name: "twilight-1"
+          tag_name: "twilight"
           name: "Twilight build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }} at ${{ needs.build-data.outputs.build_time }})"
           draft: false
           generate_release_notes: false

.github/workflows/code-linter.yml

@@ -9,10 +9,6 @@ on:
 permissions:
   contents: read
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -28,32 +24,20 @@ jobs:
         with:
           node-version-file: ".nvmrc"
 
+      - name: Setup and run autopep8
+        if: ${{ contains(join(github.event.commits.*.modified, ' '), '.py') || contains(join(github.event.commits.*.added, ' '), '.py') || contains(join(github.event.commits.*.removed, ' '), '.py') }}
+        run: |
+          sudo apt install python3-autopep8
+          autopep8 --diff scripts/ src/
+
       - name: Install dependencies
         run: npm ci
 
-      - name: Restore Surfer engine cache
-        id: surfer-engine-cache
-        uses: actions/cache@v5
-        with:
-          path: .surfer/engine/
-          key: surfer-engine-${{ hashFiles('surfer.json') }}
-
-      - name: Setup Git
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-
       - name: Download Firefox
-        run: npm run download
-
-      - name: Import patches
-        run: npm run import
-
-      - name: Add .hgignore file to the engine dir
-        run: touch engine/.hgignore
-
-      - name: Run Bootstrap
-        run: npm run bootstrap
+        env:
+          ZEN_DOWNLOAD_DONT_INIT_GIT: "1"
+        run: |
+          npm run download
 
       - name: Lint
         run: npm run lint

.github/workflows/linux-release-build.yml

@@ -70,8 +70,8 @@ jobs:
 
       - name: Setup Git
         run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git config --global user.email "mauro-balades@users.noreply.github.com"
+          git config --global user.name "mauro-balades"
 
       - name: Install system dependencies
         run: |
@@ -92,6 +92,7 @@ jobs:
 
       - name: Fix Rust version
         run: |
+          # Install a rust version compatible with LLVM 18
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $(cat .rust-toolchain)
           source $HOME/.cargo/env
 

.github/workflows/macos-release-build.yml

@@ -68,8 +68,8 @@ jobs:
 
       - name: Setup Git
         run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git config --global user.email "mauro-balades@users.noreply.github.com"
+          git config --global user.name "mauro-balades"
 
       - name: Install system dependencies
         run: |

.github/workflows/macos-universal-release-build.yml

@@ -38,8 +38,8 @@ jobs:
 
       - name: Setup Git
         run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git config --global user.email "mauro-balades@users.noreply.github.com"
+          git config --global user.name "mauro-balades"
 
       - name: Install system dependencies
         run: |

.github/workflows/pr-test.yml

@@ -7,10 +7,6 @@ on:
     branches:
       - dev
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 jobs:
   pr-test:
     runs-on: ubuntu-latest
@@ -28,27 +24,11 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
-      - name: Restore Surfer engine cache
-        id: surfer-engine-cache
-        uses: actions/cache@v5
-        with:
-          path: .surfer/engine/
-          key: surfer-engine-${{ hashFiles('surfer.json') }}
-
-      - name: Setup Git
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-
       - name: Download Firefox and dependencies
+        env:
+          ZEN_DOWNLOAD_DONT_INIT_GIT: "1"
         run: npm run download
 
-      - name: Run Bootstrap
-        run: npm run bootstrap
-
-      - name: Add .hgignore file to the engine dir
-        run: touch engine/.hgignore
-
       - name: Import patches
         run: npm run import
 

.github/workflows/src/release-build.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 set -xe
 

.github/workflows/sync-external-patches.yml

@@ -1,82 +0,0 @@
-name: Sync External Patches
-
-on:
-  workflow_dispatch:
-
-permissions:
-  contents: write
-
-jobs:
-  check_candidates:
-    name: Sync External Patches
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v3
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        # note: This will use the version defined in '.python-version' by defaultç
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ".nvmrc"
-
-      - name: Setup git
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-
-      - name: Install requirements
-        run: pip3 install -r requirements.txt
-
-      - name: Import external patches
-        run: python3 scripts/update_external_patches.py
-
-      - name: Check if any files changed
-        id: git-check
-        run: |
-          if [ -n "$(git status --porcelain)" ]; then
-            echo "files_changed=true" >> $GITHUB_OUTPUT
-          else
-            echo "files_changed=false" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Install dependencies
-        if: steps.git-check.outputs.files_changed == 'true'
-        run: npm ci
-
-      - name: Download Firefox and dependencies
-        if: steps.git-check.outputs.files_changed == 'true'
-        run: npm run download
-
-      - name: Check if patches got applied
-        if: steps.git-check.outputs.files_changed == 'true'
-        id: check-patches
-        continue-on-error: true
-        run: |
-          echo "Checking if patches apply cleanly..."
-          npm run import
-
-      - name: Create pull request
-        uses: peter-evans/create-pull-request@v7
-        if: steps.git-check.outputs.files_changed == 'true'
-        env:
-          GIT_TRACE: 1
-          GIT_CURL_VERBOSE: 1
-        with:
-          token: ${{ secrets.DEPLOY_KEY }}
-          commit-message: "chore: Sync external patches"
-          branch: "chore/sync-external-patches-${{ github.run_id }}"
-          title: "Sync external patches"
-          body: |
-            This PR syncs the external patches automatically.
-
-            * ${{ steps.check-patches.outcome == 'failure' && '⚠️ Some patches did not apply cleanly. Please review them carefully.' || '✅ All patches applied cleanly.' }}
-
-            @${{ github.actor }} please review and merge this PR. Generated from workflow run [${{ github.run_id }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}), branch ${{ github.head_ref }}.
-          base: dev
-          git-token: ${{ secrets.DEPLOY_KEY }}
-          delete-branch: true

.github/workflows/sync-upstream.yml

@@ -50,8 +50,8 @@ jobs:
       - name: Install dependencies
         if: steps.check-upstream-branch.outputs.branch_exists == 'false'
         run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git config --global user.email "mr-cheffy@users.noreply.github.com"
+          git config --global user.name "mr-cheffy"
 
       - name: Setup surfer CI
         if: steps.check-upstream-branch.outputs.branch_exists == 'false'
@@ -60,13 +60,6 @@ jobs:
             npm run surfer -- ci --brand release 
           fi
 
-      - name: Restore Surfer engine cache
-        id: surfer-engine-cache
-        uses: actions/cache@v5
-        with:
-          path: .surfer/engine/
-          key: surfer-engine-${{ hashFiles('surfer.json') }}
-
       - name: Download Firefox and dependencies
         if: steps.check-upstream-branch.outputs.branch_exists == 'false'
         run: npm run download
@@ -80,21 +73,13 @@ jobs:
             npm run sync
           fi
 
-      - name: Run Import
-        if: steps.check-upstream-branch.outputs.branch_exists == 'false'
-        run: npm run import
-
-      - name: Run Bootstrap
-        if: steps.check-upstream-branch.outputs.branch_exists == 'false'
-        run: npm run bootstrap
-
-      - name: Install requirements
-        run: pip3 install -r requirements.txt
+      - name: Install autopep8
+        run: sudo apt install python3-autopep8
 
       - name: Check if any files changed
         id: git-check
         run: |
-          npm run lint:fix
+          npm run pretty
           if [ -n "$(git status --porcelain)" ]; then
             echo "files_changed=true" >> $GITHUB_OUTPUT
           else
@@ -126,12 +111,12 @@ jobs:
 
       - name: Import external patches
         if: steps.git-check.outputs.files_changed == 'true'
-        run: python3 scripts/update_external_patches.py || true
+        run: python3 scripts/import_external_patches.py || true
 
       - name: Run formatter
         if: steps.check-upstream-branch.outputs.branch_exists == 'false'
         run: |
-          npm run lint:fix
+          npm run pretty
 
       - name: Create pull request
         uses: peter-evans/create-pull-request@v7

.github/workflows/twilight-release-schedule.yml

@@ -2,7 +2,7 @@ name: Zen Twilight Scheduled Releases
 
 on:
   schedule:
-    - cron: "0 23 */2 * *"
+    - cron: "0 23 * * *"
   workflow_dispatch:
     inputs:
       create_release:

.github/workflows/windows-profile-build.yml

@@ -41,8 +41,8 @@ jobs:
 
       - name: Setup Git
         run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git config --global user.email "mauro-balades@users.noreply.github.com"
+          git config --global user.name "mauro-balades"
 
       - name: Install Surfer
         run: npm i -g @zen-browser/surfer

.github/workflows/windows-release-build.yml

@@ -79,8 +79,8 @@ jobs:
 
       - name: Setup Git
         run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git config --global user.email "mauro-balades@users.noreply.github.com"
+          git config --global user.name "mauro-balades"
 
       - name: Install dependencies
         run: |

.gitignore

@@ -24,4 +24,3 @@ target/
 locales/firefox-l10n/
 
 !src/toolkit/themes/shared/design-system/dist/
-.DS_Store

.nvmrc

@@ -1 +1 @@
-22
+20

.prettierignore

@@ -0,0 +1,42 @@
+# 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/.
+
+engine/
+
+**/*.html
+**/*.xhtml
+**/*.inc.xhtml
+**/*.bundle.min.js
+**/*.min.js
+**/*.min.mjs
+
+**/*.svg
+
+**/*.inc.css
+
+surfer.json
+
+src/zen/tests/mochitests/*
+
+src/browser/app/profile/*.js
+pnpm-lock.yaml
+
+**/engine/
+
+docs/issue-metrics/*.md
+
+.husky/
+
+# Some CSS files are preprocessed and prettier doesn't handle them well
+# We also dont want to format the CSS files that are generated by the build
+src/zen/tabs/zen-tabs.css
+src/zen/common/styles/zen-theme.css
+src/zen/compact-mode/zen-compact-mode.css
+src/zen/common/ZenEmojis.mjs
+
+src/zen/split-view/zen-decks.css
+src/zen/workspaces/zen-workspaces.css
+src/zen/common/styles/zen-toolbar.css
+
+*.inc

.prettierrc.json

@@ -0,0 +1,20 @@
+{
+  "bracketSameLine": true,
+  "endOfLine": "lf",
+  "trailingComma": "es5",
+  "tabWidth": 2,
+  "useTabs": false,
+  "jsxSingleQuote": false,
+  "semi": true,
+  "printWidth": 100,
+  "plugins": ["prettier-plugin-sh"],
+  "overrides": [
+    {
+      "files": "*.css",
+      "options": {
+        "parser": "css",
+        "printWidth": 160
+      }
+    }
+  ]
+}

.rust-toolchain

@@ -1 +1 @@
-1.89
+1.83

README.md

@@ -34,8 +34,8 @@ 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 `148.0.2`! 🚀
-- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 148.0.2`!
+- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `147.0.3`! 🚀
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 147.0.3`!
 
 ### Contributing
 

build/AppDir/zen.desktop

@@ -11,17 +11,12 @@ StartupNotify=true
 Terminal=false
 X-MultipleArgs=false
 Keywords=Internet;WWW;Browser;Web;Explorer;
-Actions=new-window;new-blank-window;new-private-window;profilemanager;
-X-AppImage-Version=$VERSION
+Actions=new-window;new-private-window;profilemanager;
 
 [Desktop Action new-window]
 Name=Open a New Window
 Exec=zen %u
 
-[Desktop Action new-blank-window]
-Name=Open a New Blank Window
-Exec=zen --blank-window %u
-
 [Desktop Action new-private-window]
 Name=Open a New Private Window
 Exec=zen --private-window %u

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

@@ -1 +1 @@
-7b8f3620beb1de157d972de32f9f34320f0ae189
+b1e00b74d3791a5a7bbd6ba3d32b69b60471e73b

build/flatpak/app.zen_browser.zen.yml.template

@@ -62,6 +62,12 @@ modules:
         strip-components: 0
         only-arches:
           - x86_64
+        x-checker-data:
+          type: json
+          url: https://api.github.com/repos/zen-browser/desktop/releases/latest
+          version-query: .tag_name
+          url-query: .assets[] | select(.name=="zen.linux-x86_64.tar.xz") | .browser_download_url
+          is-main-source: true
 
       - type: archive
         url: https://github.com/zen-browser/desktop/releases/download/{version}/zen.linux-aarch64.tar.xz
@@ -69,6 +75,12 @@ modules:
         strip-components: 0
         only-arches:
           - aarch64
+        x-checker-data:
+          type: json
+          url: https://api.github.com/repos/zen-browser/desktop/releases/latest
+          version-query: .tag_name
+          url-query: .assets[] | select(.name=="zen.linux-aarch64.tar.xz") | .browser_download_url
+          is-main-source: true
 
       - type: archive
         url: https://github.com/zen-browser/flatpak/releases/download/{version}/archive.tar

build/windows/sign.ps1

@@ -23,9 +23,6 @@ mkdir windsign-temp -ErrorAction SilentlyContinue
 #    echo "Downloaded git objects repo to"
 #} -Verbose -ArgumentList $PWD -Debug
 
-$env:SURFER_MOZCONFIG_ONLY="1"
-$env:SURFER_SIGNING_MODE=""
-
 Start-Job -Name "DownloadGitl10n" -ScriptBlock {
     param($PWD)
     cd $PWD
@@ -34,11 +31,14 @@ Start-Job -Name "DownloadGitl10n" -ScriptBlock {
     echo "Fetched l10n and Firefox's one"
 } -Verbose -ArgumentList $PWD -Debug
 
-$surferJson = Get-Content surfer.json | ConvertFrom-Json
-$version = $surferJson.brands.release.release.displayVersion
-npm run ci -- $version
-npm run import -- --verbose
-npm run build
+Start-Job -Name "SurferInit" -ScriptBlock {
+    param($PWD)
+    cd $PWD
+    npm run import -- --verbose
+    $surferJson = Get-Content surfer.json | ConvertFrom-Json
+    $version = $surferJson.brands.release.release.displayVersion
+    npm run ci -- $version
+} -Verbose -ArgumentList $PWD -Debug
 
 echo "Downloading artifacts info"
 $artifactsInfo=gh api repos/zen-browser/desktop/actions/runs/$GithubRunId/artifacts
@@ -120,6 +120,7 @@ signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha256 /v $fi
 $env:ZEN_RELEASE="true"
 $env:SURFER_SIGNING_MODE="true"
 $env:SCCACHE_GHA_ENABLED="false"
+Wait-Job -Name "SurferInit"
 Wait-Job -Name "DownloadGitl10n"
 
 function SignAndPackage($name) {

configs/linux/mozconfig

@@ -30,11 +30,17 @@ if test "$ZEN_RELEASE"; then
     fi
 
     # Disable DMD and ELF hacks, enable linker lld
+    ac_add_options --disable-dmd
     ac_add_options --enable-linker=lld
     ac_add_options --disable-elf-hack
+    ac_add_options --disable-necko-wifi
 
     # Stripping options for release builds
     ac_add_options --enable-install-strip
     ac_add_options --enable-strip
     export STRIP_FLAGS="--strip-debug --strip-unneeded"
 fi
+
+# Common options
+ac_add_options --enable-alsa
+ac_add_options --enable-pulseaudio

docs/issue-metrics/2026_2026-02-01..2026-02-28.md

@@ -1,217 +0,0 @@
-# Issue Metrics
-
-| Metric | Average | Median | 90th percentile |
-| --- | --- | --- | ---: |
-| Time to first response | 1 day, 1:26:40 | 2:07:50 | 2 days, 5:33:54 |
-| Time to close | 1 day, 12:18:56 | 3:30:42 | 4 days, 7:35:38 |
-
-| Metric | Count |
-| --- | ---: |
-| Number of items that remain open | 97 |
-| Number of items closed | 102 |
-| Total number of items created | 199 |
-
-| Title | URL | Time to first response | Time to close |
-| --- | --- | --- | --- |
-| Zen browser highlight elements by itself | https://github.com/zen-browser/desktop/issues/12551 | 5:54:36 | None |
-| pasted url revert to old one automaticaly ? | https://github.com/zen-browser/desktop/issues/12548 | 6:47:54 | None |
-| chat.mistral.ai - site is not usable | https://github.com/zen-browser/desktop/issues/12547 | 10:45:42 | None |
-| Horizontal Scrolling with mouse wheel is not working | https://github.com/zen-browser/desktop/issues/12545 | None | 1:30:19 |
-| The Text color of search bar when press the "Ctrl + f" | https://github.com/zen-browser/desktop/issues/12537 | None | None |
-| Buggy Native Popover for Tab Previews on Twilight | https://github.com/zen-browser/desktop/issues/12529 | 0:06:41 | 0:06:41 |
-| Can't drag files directly from Downloads panel | https://github.com/zen-browser/desktop/issues/12520 | 11:56:10 | 11:56:24 |
-| Repeated SIGSEGV in libxul.so on Linux (1.18.10b, Fedora 43, AMD) | https://github.com/zen-browser/desktop/issues/12516 | None | None |
-| Previously closed windows recovery option missing | https://github.com/zen-browser/desktop/issues/12515 | 1:40:19 | 1:40:20 |
-| Empty Spaces after waking laptop | https://github.com/zen-browser/desktop/issues/12512 | 4:14:32 | 1 day, 1:42:28 |
-| New tab shortcut shows search input instead of tab input | https://github.com/zen-browser/desktop/issues/12510 | 8:46:21 | 8:46:21 |
-| Folder tree breaks with live folders fetch | https://github.com/zen-browser/desktop/issues/12509 | 0:08:50 | 8:11:04 |
-| Tabs bar shakes in compact mode | https://github.com/zen-browser/desktop/issues/12505 | 0:02:08 | None |
-| Youtube Playlist issue | https://github.com/zen-browser/desktop/issues/12502 | None | 18:54:24 |
-| Maps with very much data are very laggy | https://github.com/zen-browser/desktop/issues/12501 | 3:09:58 | 16:56:17 |
-| Allow changing interface font for generic Linux tarball | https://github.com/zen-browser/desktop/issues/12500 | 1:05:58 | None |
-| The transparent gradient background suddenly covers the current tab | https://github.com/zen-browser/desktop/issues/12497 | 8:59:58 | 8:59:58 |
-| Obscene memory leak on Mac | https://github.com/zen-browser/desktop/issues/12496 | 0:35:11 | None |
-| top tool bar and close/minimize buttons on title bar overlap on windows | https://github.com/zen-browser/desktop/issues/12495 | 1 day, 16:34:34 | None |
-| Tabs in essentials disappear after closing Zen | https://github.com/zen-browser/desktop/issues/12493 | 14:53:54 | None |
-| When you open a new window using the taskbar icon, it mirrors the tabs of another window. | https://github.com/zen-browser/desktop/issues/12492 | 0:11:21 | 0:11:21 |
-| using my GoBack mouse button switches workspaces | https://github.com/zen-browser/desktop/issues/12491 | 0:03:40 | None |
-| closing Folder tabs doesn't close them | https://github.com/zen-browser/desktop/issues/12490 | 0:08:26 | 0:08:26 |
-| Zen compact hover mode time increase not respected | https://github.com/zen-browser/desktop/issues/12489 | 0:06:19 | 0:06:19 |
-| White dots spreading everywhere on any website visited in Zen Browser, reset when interacting with UI layer; duplicate contour lines appearing at the same time as the dots on the Zen Browser UI - Windows 11 | https://github.com/zen-browser/desktop/issues/12488 | None | 2 days, 13:52:50 |
-| What just happened to my tab??? (Also when I close Zen browser while I watching YouTube, the audio still exist, wth?) | https://github.com/zen-browser/desktop/issues/12486 | 0:27:29 | None |
-| Reddit multi word enter search won't work | https://github.com/zen-browser/desktop/issues/12485 | None | None |
-| Use a different default search engine in private windows defaults to true | https://github.com/zen-browser/desktop/issues/12484 | None | 1:52:44 |
-| ALSA support disabled, no sound on ALSA only systems | https://github.com/zen-browser/desktop/issues/12483 | 10:13:00 | None |
-| Addressbar closing when inputing german Umlauts with us_intl keymap | https://github.com/zen-browser/desktop/issues/12482 | 2:18:36 | 2:18:36 |
-| Zen Browser Tabs: Backgroung Image is not working | https://github.com/zen-browser/desktop/issues/12479 | 7:28:03 | 17:51:35 |
-| bookmarks keep vanishing | https://github.com/zen-browser/desktop/issues/12478 | 8:34:20 | None |
-| The menu for my browser history button is moving down in KDE Plasma. | https://github.com/zen-browser/desktop/issues/12475 | None | 1:43:31 |
-| Zen Browser is being blocked by BattlEye anti-cheat during game launch on Windows 11. | https://github.com/zen-browser/desktop/issues/12473 | 0:06:23 | None |
-| CRUNCHYROLL NOT WORKING | https://github.com/zen-browser/desktop/issues/12467 | 0:05:42 | 0:05:42 |
-| Holding rightclick will caues wrong mouse position | https://github.com/zen-browser/desktop/issues/12466 | None | None |
-| Battery Drain MacOS - High CPU usage | https://github.com/zen-browser/desktop/issues/12464 | 3 days, 19:23:37 | None |
-| Logged out of all Google accounts and can't log back in. | https://github.com/zen-browser/desktop/issues/12462 | 20:50:59 | None |
-| Blank Window and Session Loss After Update | https://github.com/zen-browser/desktop/issues/12460 | 0:05:20 | None |
-| Sometimes web lagging for a few second | https://github.com/zen-browser/desktop/issues/12458 | 0:00:47 | None |
-| Mods don't work anymore | https://github.com/zen-browser/desktop/issues/12455 | 0:36:29 | 2:08:08 |
-| Auto Update Failing To Update (Message Update Failed) | https://github.com/zen-browser/desktop/issues/12454 | 2:55:11 | 2:55:11 |
-| Setting up keyboard shortcuts does not recognize azerty keyboard | https://github.com/zen-browser/desktop/issues/12451 | 0:12:44 | None |
-| External links open new window with duplicated tabs when browser is minimized on Windows | https://github.com/zen-browser/desktop/issues/12450 | 6:32:08 | None |
-| Browser doesn't know where mouse is until clicking out of the browser | https://github.com/zen-browser/desktop/issues/12447 | None | None |
-| Beginning w/ v1.18.8b (?) my navigation started floating/popping/hiding; never asked for that. Then v1.18.9b (?) removed all my tabs incl auto/pinned | https://github.com/zen-browser/desktop/issues/12443 | 1:13:56 | 1:18:00 |
-| Bookmarks not shown on site pages | https://github.com/zen-browser/desktop/issues/12442 | 0:01:11 | 0:01:11 |
-| Side bar flickering | https://github.com/zen-browser/desktop/issues/12441 | None | None |
-| Sidebar should not hide when mouse pointer is still at the edge of the screen | https://github.com/zen-browser/desktop/issues/12439 | 0:08:24 | None |
-| Zen not respecting output audio device switching in Windows | https://github.com/zen-browser/desktop/issues/12438 | None | None |
-| New tab does not make a new tab - it only activates the URL bar | https://github.com/zen-browser/desktop/issues/12432 | 0:26:23 | 0:26:23 |
-| ZEN Ignoring DNS over HTTPS OFF | https://github.com/zen-browser/desktop/issues/12429 | 0:29:20 | None |
-| The search window does not appear until you start typing | https://github.com/zen-browser/desktop/issues/12428 | 1:42:23 | 5 days, 22:42:30 |
-| Toolbar icons overflow after uninstalling extension (requires restart to fix) | https://github.com/zen-browser/desktop/issues/12427 | 6:05:59 | 6:05:58 |
-| Side Tab Flickering when minimized from full view - faced in mac desktop browser | https://github.com/zen-browser/desktop/issues/12425 | 4:54:13 | None |
-| buggy Tabs drag and drop | https://github.com/zen-browser/desktop/issues/12423 | 0:28:12 | None |
-| Spaces dissapear suddently | https://github.com/zen-browser/desktop/issues/12422 | 0:07:36 | 4 days, 0:53:47 |
-| Tabs become New Tab when using Window Sync | https://github.com/zen-browser/desktop/issues/12421 | 2 days, 13:53:49 | 3 days, 15:49:00 |
-| Closed the browser after a glitch, now the app remains full white | https://github.com/zen-browser/desktop/issues/12420 | 0:04:32 | 1 day, 2:01:15 |
-| Search bar overflow over main screen from pining to overflow menu but also breaks ui in recreating | https://github.com/zen-browser/desktop/issues/12419 | None | None |
-| Closing Sidebar Causes Unexpected Border Increase on the Other Side. | https://github.com/zen-browser/desktop/issues/12418 | 0:25:14 | None |
-| Persistent Favicon Inconsistency/Tint on GitHub Bookmarks | https://github.com/zen-browser/desktop/issues/12415 | 1 day, 22:54:53 | None |
-| Sometimes, the right-click menu for links will keep shifting to the right | https://github.com/zen-browser/desktop/issues/12413 | 6:45:26 | 10:55:38 |
-| AppImage lacks version metadata, preventing AppImage update detection | https://github.com/zen-browser/desktop/issues/12412 | 13:17:50 | 8:27:29 |
-| [Windows] Launching a new window (Ctrl + N) replicates the same tabs on the new window | https://github.com/zen-browser/desktop/issues/12411 | 11:10:43 | 11:10:43 |
-| Tab preview text illegible in front of light background | https://github.com/zen-browser/desktop/issues/12410 | 11:14:21 | None |
-| Temporary Containers broke with update | https://github.com/zen-browser/desktop/issues/12409 | 1:57:05 | 14:06:01 |
-| Zen doesn't work with Simple Tab Groups | https://github.com/zen-browser/desktop/issues/12408 | 4:58:31 | None |
-| Unable to set "Copy Current URL" to ctrl+shift+INSERT | https://github.com/zen-browser/desktop/issues/12406 | None | None |
-| Browser Toolbox Error Loading | https://github.com/zen-browser/desktop/issues/12405 | 5:30:27 | 5:30:27 |
-| Restoring Split Tabs Ignored | https://github.com/zen-browser/desktop/issues/12403 | 0:14:37 | None |
-| Windows: Scroll bar in tab list causes layout shift when always show scroll bars is enabled | https://github.com/zen-browser/desktop/issues/12402 | 2 days, 3:59:15 | None |
-| Trash icon appears in ‘Change Icon’ menu for folders with no icon | https://github.com/zen-browser/desktop/issues/12401 | None | 8 days, 11:45:52 |
-| Window sync has been forced back on | https://github.com/zen-browser/desktop/issues/12400 | 0:47:07 | 0:47:07 |
-| Toolbar not opening when approaching with mouse to fast | https://github.com/zen-browser/desktop/issues/12398 | None | None |
-| Can't use Proton Pass because of second password | https://github.com/zen-browser/desktop/issues/12393 | None | None |
-| Can't Customize toolbar on "only sidebar" configuration | https://github.com/zen-browser/desktop/issues/12391 | None | None |
-| Sync deletes tab (kind of) | https://github.com/zen-browser/desktop/issues/12390 | 9 days, 7:25:30 | None |
-| Please allow us to increase the font size on the left tabs. | https://github.com/zen-browser/desktop/issues/12388 | 0:52:26 | 0:52:26 |
-| Vertical Sidebar starts 'oscillating' when it is reduced in size. | https://github.com/zen-browser/desktop/issues/12387 | 0:05:02 | 0:05:41 |
-| [Regression] Severe stuttering and long loading on Bilibili (4K) in v1.18.7b | https://github.com/zen-browser/desktop/issues/12386 | 8 days, 5:05:17 | None |
-| [macOS] Now Playing widget completely non-functional (works in Firefox) | https://github.com/zen-browser/desktop/issues/12385 | 1:16:07 | 1 day, 23:03:30 |
-| responsive design mode can't be enlarged by zooming | https://github.com/zen-browser/desktop/issues/12381 | 11 days, 16:50:20 | None |
-| Pinned tab under a folder, opens and redirect to a new regular tab | https://github.com/zen-browser/desktop/issues/12379 | 2:37:39 | None |
-| xdg-open fails to open files in existing Zen instance (Arch Linux and Hyprland) | https://github.com/zen-browser/desktop/issues/12378 | 23:23:25 | None |
-| Sidebar coloring issues in private windows | https://github.com/zen-browser/desktop/issues/12377 | None | None |
-| [Bug] Youtube shorts notplaying properly, and when using the shortcut "I' it gives an error. | https://github.com/zen-browser/desktop/issues/12376 | 13:44:07 | None |
-| Sometimes, when opening a new tab, M4 and M5 buttons change spaces | https://github.com/zen-browser/desktop/issues/12375 | 0:41:41 | 0:41:41 |
-| Private Windows don't function with Window Sync | https://github.com/zen-browser/desktop/issues/12374 | 0:33:47 | 0:33:47 |
-| Passkey from qr code not showing on widows 10 os | https://github.com/zen-browser/desktop/issues/12372 | None | None |
-| Relatively Low Audio Volume | https://github.com/zen-browser/desktop/issues/12370 | None | None |
-| Workspace icon highlight missing after latest update | https://github.com/zen-browser/desktop/issues/12368 | 1:49:10 | 1:49:15 |
-| Prime Video | https://github.com/zen-browser/desktop/issues/12365 | 0:18:36 | 0:18:36 |
-| Taskbar Tabs create semi-transparent, empty, non-closeable windows | https://github.com/zen-browser/desktop/issues/12364 | 1:17:21 | None |
-| [Bug] Enterprise Policies via macOS Managed Preferences (.plist) are not recognized | https://github.com/zen-browser/desktop/issues/12363 | None | None |
-| Misaligned video fullscreen mode for 2 monitors | https://github.com/zen-browser/desktop/issues/12362 | 2 days, 5:21:33 | None |
-| Choppy audio on YouTube when using a external DAC | https://github.com/zen-browser/desktop/issues/12361 | 2 days, 5:21:25 | 2 days, 5:47:20 |
-| Performance difference between appimage and Flatpak | https://github.com/zen-browser/desktop/issues/12357 | 0:01:34 | None |
-| "Close Pinned Tab Shortcut Behavior" ignored for "Places" tab | https://github.com/zen-browser/desktop/issues/12353 | 15 days, 10:51:28 | None |
-| Menu flickers when pressed | https://github.com/zen-browser/desktop/issues/12352 | 9 days, 0:49:56 | None |
-| Closing, Minimizing, and Maximizing Buttons squished | https://github.com/zen-browser/desktop/issues/12351 | 0:09:14 | 0:09:14 |
-| New Tab bug on mac | https://github.com/zen-browser/desktop/issues/12350 | 0:02:33 | 0:02:32 |
-| Redirect notification toast overlaps right sidebar | https://github.com/zen-browser/desktop/issues/12348 | None | 13:39:22 |
-| macOS: close/minimize/maximize buttons are not displayed correctly | https://github.com/zen-browser/desktop/issues/12347 | 0:15:49 | 0:15:49 |
-| After updating to 1.18.6b, minimize, maximize and close buttons are squished in Windows | https://github.com/zen-browser/desktop/issues/12346 | 0:09:07 | 0:09:56 |
-| Layout bug for minimize/maximize/close window buttons on Windows 11 | https://github.com/zen-browser/desktop/issues/12345 | 0:11:27 | 0:11:28 |
-| Disabling windows sync still results in same tabs being displayed throught multiple window sessions when restarting/restoring | https://github.com/zen-browser/desktop/issues/12344 | None | 0:20:21 |
-| Picture-in-picture not working as intended | https://github.com/zen-browser/desktop/issues/12342 | 3:39:41 | 1 day, 2:32:57 |
-| Icons aren't displaying correctly | https://github.com/zen-browser/desktop/issues/12340 | None | 5:45:13 |
-| Workspaces aren't syncing to a new device | https://github.com/zen-browser/desktop/issues/12339 | 1:07:18 | 6:26:52 |
-| All tabs and folders are missing after update to 1.18.5b | https://github.com/zen-browser/desktop/issues/12337 | 8:49:51 | 8:49:51 |
-| macOS profile lost pinned tabs and Essentials after Windows sync – folders remain but are empty | https://github.com/zen-browser/desktop/issues/12336 | 9:29:24 | None |
-| Zen misses some color support | https://github.com/zen-browser/desktop/issues/12335 | 0:45:02 | 0:45:02 |
-| Disabled "sync tabs" loose tabs | https://github.com/zen-browser/desktop/issues/12333 | 4:05:24 | None |
-| MacOs: Intel-based Mac Pro - Zen fails to launch (GPU subprocess / IPC timeouts) | https://github.com/zen-browser/desktop/issues/12331 | None | None |
-| Zen launch error | https://github.com/zen-browser/desktop/issues/12330 | None | 0:39:18 |
-| When I attempted to rename the workspace, the compact mode failed and I was unable to enter the compact mode again. | https://github.com/zen-browser/desktop/issues/12329 | 3:21:05 | 3:21:05 |
-| Cannot properly position or resize Zen with certain window managers | https://github.com/zen-browser/desktop/issues/12327 | None | None |
-| Space resets when closing window (but not quitting) after clearing browser history | https://github.com/zen-browser/desktop/issues/12326 | 0:46:52 | 14:27:39 |
-| New tabs don't change tab title | https://github.com/zen-browser/desktop/issues/12318 | 10:51:08 | None |
-| Weird reopen closed tab behaviour for folders | https://github.com/zen-browser/desktop/issues/12316 | None | None |
-| Per Workspace Essentials No Longer Work. | https://github.com/zen-browser/desktop/issues/12313 | 0:54:50 | 2:25:53 |
-| Are Spaces supposed to sync between different devices? | https://github.com/zen-browser/desktop/issues/12311 | 1:26:09 | 1:26:09 |
-| Open previous windows and tabs settings / continue where you left off being ignored. | https://github.com/zen-browser/desktop/issues/12307 | 12:51:38 | 13:53:11 |
-| local access disappeared after 18.5 | https://github.com/zen-browser/desktop/issues/12305 | 16:24:35 | None |
-| Transparency is weird on macOS | https://github.com/zen-browser/desktop/issues/12303 | 1:16:12 | None |
-| Vertical Sidebar flickering/jittering during interaction | https://github.com/zen-browser/desktop/issues/12299 | 3:23:55 | None |
-| "Sync only pinned tabs in workspaces" breaks "Open previous windows and tabs" | https://github.com/zen-browser/desktop/issues/12297 | 0:05:40 | 10:53:40 |
-| Github Actions Artifacts downloads do not work on Zen | https://github.com/zen-browser/desktop/issues/12296 | None | None |
-| Zen menu bar items take excessive horizontal space compared to other apps | https://github.com/zen-browser/desktop/issues/12294 | None | None |
-| Workspaces lost after upgrade to 1.18.5b (Firefox 147.0.3) (64-bit) on Windows 11 Pro Intel | https://github.com/zen-browser/desktop/issues/12293 | 3:33:29 | 3:33:29 |
-| Kernel panic on macOS Sequoia 15.7.3 when running Zen | https://github.com/zen-browser/desktop/issues/12290 | None | None |
-| Opening a GitHub CodeSpace in the Browser throws a "Oh No, it looks like youre offline!" error tho i have a stable Internet connection, and it worked on older Versions of Zen before. Chrome on the same device/internet works. | https://github.com/zen-browser/desktop/issues/12288 | None | None |
-| Zen does not read privacy.fingerprintingProtection from user.js | https://github.com/zen-browser/desktop/issues/12286 | 1:44:38 | 7:13:24 |
-| Closing a window lead sometimes to window sync to stop working | https://github.com/zen-browser/desktop/issues/12284 | None | None |
-| Pinned tabs reset to incorrect URL (pinned URL changes) | https://github.com/zen-browser/desktop/issues/12281 | 0:00:55 | None |
-| Compact mode non hide stuck | https://github.com/zen-browser/desktop/issues/12279 | 15:23:06 | None |
-| Recently closed windows/undo close window missing | https://github.com/zen-browser/desktop/issues/12278 | 4 days, 8:20:17 | 4 days, 8:20:17 |
-| Opening about: pages causes 'new tab' bug with window sync | https://github.com/zen-browser/desktop/issues/12277 | 9 days, 16:39:47 | None |
-| arm64 Flatpak compositor crash on ChromeOS Crostini (virgl / Mesa 25.x regression) | https://github.com/zen-browser/desktop/issues/12276 | 8 days, 18:31:53 | None |
-| YouTube freezes when switching audio output in fxSound | https://github.com/zen-browser/desktop/issues/12275 | None | None |
-| Button missing: Hamburger Menu > History > Restore Previous Session | https://github.com/zen-browser/desktop/issues/12272 | 0:10:35 | None |
-| Next/Prev Tab Shortcut Conflict | https://github.com/zen-browser/desktop/issues/12267 | 0:03:09 | 0:03:09 |
-| 1.18.5b Release Download Not Found | https://github.com/zen-browser/desktop/issues/12266 | 0:13:04 | 0:13:04 |
-| Viedo streaming websites become unresponsive when multiple instances are open | https://github.com/zen-browser/desktop/issues/12265 | None | None |
-| All workspaces deleted upon v1.18.5b installation | https://github.com/zen-browser/desktop/issues/12261 | 1:07:39 | 3:40:07 |
-| Zen fails to start with sync only pinned tabs | https://github.com/zen-browser/desktop/issues/12260 | 0:04:34 | 0:41:21 |
-| Thunderbird cannot open a new Zen window when clicking a link | https://github.com/zen-browser/desktop/issues/12259 | 14:35:21 | None |
-| zen.urlbar.replace-newtab = False issues with new windows and tab syncing | https://github.com/zen-browser/desktop/issues/12258 | 2 days, 7:24:59 | None |
-| Shortcuts Icon's not working | https://github.com/zen-browser/desktop/issues/12257 | 1 day, 7:22:00 | 15 days, 8:21:20 |
-| ADD A METHOD TO DISABLE UPDATES , IM LITERALLY USING A TASK SCHEDULER TO DELETE YOUR STUPID UPDATES FOLDER AND YOU STILL FIND A WAY | https://github.com/zen-browser/desktop/issues/12256 | 2:34:58 | 0:05:06 |
-| Broken essential tab URL after switching with keyboard shortcuts | https://github.com/zen-browser/desktop/issues/12255 | 0:19:28 | None |
-| Closing glance bug with multiple windows | https://github.com/zen-browser/desktop/issues/12254 | None | None |
-| Dragging tabs into folders shows selected folder highlight at incorrect position in some view modes. | https://github.com/zen-browser/desktop/issues/12252 | 1:31:56 | 3:52:46 |
-| "New split view" in command bar (on a page accessed from an Essential tab) opens a new tab instead | https://github.com/zen-browser/desktop/issues/12251 | 0:10:54 | None |
-| Zen starts as blank widows on macOS Tahoe Version 26.3 (25D122) beta | https://github.com/zen-browser/desktop/issues/12250 | 0:38:21 | 3 days, 23:19:20 |
-| Pined extensions icons no longer visible in compact sidebar since last release | https://github.com/zen-browser/desktop/issues/12249 | 2 days, 20:44:58 | None |
-| Facing Glitches On Start Opens 2 Windows for Same tabs. | https://github.com/zen-browser/desktop/issues/12248 | 1:25:01 | None |
-| Separate windows mirroring | https://github.com/zen-browser/desktop/issues/12247 | 0:12:51 | 0:12:51 |
-| H.264, HEVC, and AAC Not Supported in Kubuntu App Center Version (1.17.14b) | https://github.com/zen-browser/desktop/issues/12245 | 1 day, 12:07:19 | None |
-| Private and blank windows ignore CloseWindowWithLastTab setting | https://github.com/zen-browser/desktop/issues/12242 | 9:22:25 | 2 days, 8:59:22 |
-| Bookmark temporarily removes | https://github.com/zen-browser/desktop/issues/12241 | None | None |
-| Multiple Windows Launch on Startup after Multiple Windows Have Been Closed | https://github.com/zen-browser/desktop/issues/12238 | 16:04:12 | None |
-| Duplicated Toggle Full Screen and View Full Screen for keyboard shortcut | https://github.com/zen-browser/desktop/issues/12237 | 10 days, 20:34:41 | 11 days, 11:58:31 |
-| Container no longer displayed when moving tabs between windows on different spaces | https://github.com/zen-browser/desktop/issues/12235 | 10 days, 13:27:01 | 10 days, 18:33:05 |
-| Multi account container settings reset | https://github.com/zen-browser/desktop/issues/12234 | None | None |
-| Clicking the “Copy” button opens an “Open With” dialog on KDE Plasma Wayland. | https://github.com/zen-browser/desktop/issues/12232 | 13 days, 7:34:57 | 14 days, 19:58:57 |
-| Can't open a new window with clear context | https://github.com/zen-browser/desktop/issues/12229 | None | 0:01:26 |
-| Can't play DRM content in Linux | https://github.com/zen-browser/desktop/issues/12228 | 4:21:30 | 6:06:50 |
-| Missing icons in address bar: padlock (https) and star (to bookmark current page) | https://github.com/zen-browser/desktop/issues/12226 | None | 0:08:28 |
-| Broken extension/browser tools sidebar keybind | https://github.com/zen-browser/desktop/issues/12225 | 5:45:59 | 9 days, 20:16:58 |
-| Sidebar empty after copying profile from Firefox | https://github.com/zen-browser/desktop/issues/12224 | 0:25:56 | 0:25:56 |
-| Lost all my folders with the latest update | https://github.com/zen-browser/desktop/issues/12223 | 0:55:54 | 0:55:54 |
-| History window doesnt follow default system or browser theme | https://github.com/zen-browser/desktop/issues/12222 | None | None |
-| when i have multiple windows and restart zen , all the windows will be the same , have the same tabs | https://github.com/zen-browser/desktop/issues/12221 | 0:35:11 | 0:22:16 |
-| Deleting All Data | https://github.com/zen-browser/desktop/issues/12220 | 0:59:01 | None |
-| Move to Space in Tab Context Menu not available | https://github.com/zen-browser/desktop/issues/12219 | 0:12:00 | None |
-| When opening Zen after closing multiple windows, only one window has workspaces | https://github.com/zen-browser/desktop/issues/12218 | 0:59:47 | None |
-| Forms don't allow to be processed | https://github.com/zen-browser/desktop/issues/12217 | 6:15:33 | 6:15:33 |
-| Cannot drag and drop to create a split view | https://github.com/zen-browser/desktop/issues/12216 | 0:37:06 | 0:37:06 |
-| Glance does not work via keybind+click in Reader VIew | https://github.com/zen-browser/desktop/issues/12214 | None | None |
-| "New Blank Window" is not capitalized in Mac OS menu bar | https://github.com/zen-browser/desktop/issues/12213 | None | 7 days, 4:10:17 |
-| Zen changes tab IDs without sending tabs.onReplaced events | https://github.com/zen-browser/desktop/issues/12212 | 1:12:47 | 1:12:47 |
-| Private window is adopting Blank windows styling | https://github.com/zen-browser/desktop/issues/12211 | None | 0:19:10 |
-| The loading indicator on tabs does not appear when a tab is loading. | https://github.com/zen-browser/desktop/issues/12210 | 1:23:55 | 1:23:55 |
-| Page content cannot scroll fully to top; top area is hidden behind browser UI | https://github.com/zen-browser/desktop/issues/12209 | 13:06:36 | None |
-| TURN OFF WINDOW SYNC | https://github.com/zen-browser/desktop/issues/12206 | 0:47:53 | 1:23:13 |
-| Essentials not working correctly | https://github.com/zen-browser/desktop/issues/12205 | 3:18:34 | 3:27:55 |
-| Tab titles not updating | https://github.com/zen-browser/desktop/issues/12204 | 3:40:45 | 5:54:14 |
-| Folders disappeared after updating to the Zen version 1.18.3b (Firefox 147.0.2) (aarch64) | https://github.com/zen-browser/desktop/issues/12203 | 9:12:45 | 9:12:45 |
-| Some websites don't load | https://github.com/zen-browser/desktop/issues/12202 | 1 day, 10:47:54 | None |
-| Website favicons have the wrong icons | https://github.com/zen-browser/desktop/issues/12201 | 2:36:06 | 0:04:20 |
-| tab indexes are off by 2 | https://github.com/zen-browser/desktop/issues/12199 | None | 3:02:10 |
-| Zen doesn't identify itself in the extensions API | https://github.com/zen-browser/desktop/issues/12198 | 1 day, 21:45:16 | 6 days, 22:02:36 |
-| Part of the screenshot overlay is rendered below glance windows | https://github.com/zen-browser/desktop/issues/12196 | None | 21 days, 5:30:56 |
-| Glance opens without keyboard shortcut in Essential tabs | https://github.com/zen-browser/desktop/issues/12194 | 8:27:58 | 8:27:58 |
-| Context menu extensions multiply | https://github.com/zen-browser/desktop/issues/12192 | None | None |
-| Tab folder not closing properly when a tab is opened | https://github.com/zen-browser/desktop/issues/12190 | None | 10:15:16 |
-| Can't set a theme | https://github.com/zen-browser/desktop/issues/12189 | 1:38:06 | None |
-
-_This report was generated with the [Issue Metrics Action](https://github.com/github/issue-metrics)_
-Search query used to find these items: `repo:zen-browser/desktop is:issue created:2026-02-01..2026-02-28`

locales/en-US/browser/browser/zen-general.ftl

@@ -47,7 +47,6 @@ pictureinpicture-minimize-btn =
 zen-panel-ui-gradient-generator-custom-color = Custom Color
 
 zen-copy-current-url-confirmation = Copied current URL!
-zen-copy-current-url-as-markdown-confirmation = Copied current URL as Markdown!
 
 zen-general-cancel-label =
     .label = Cancel

locales/en-US/browser/browser/zen-live-folders.ftl

@@ -1,101 +0,0 @@
-# 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/.
-
-zen-live-folder-options =
-    .label = Live Folder Options
-
-zen-live-folder-last-fetched =
-    .label = Last fetch: { $time }
-
-zen-live-folder-refresh =
-    .label = Refresh
-
-zen-live-folder-github-option-author-self =
-    .label = Created by Me
-
-zen-live-folder-github-option-assigned-self =
-    .label = Assigned to Me
-
-zen-live-folder-github-option-review-requested =
-    .label = Review Requests
-
-zen-live-folder-type-rss =
-    .label = RSS Feed
-
-zen-live-folder-option-fetch-interval =
-    .label = Fetch Interval
-
-zen-live-folder-fetch-interval-mins =
-    .label = { $mins ->
-      [one] 1 minute
-      *[other] { $mins } minutes
-    }
-
-zen-live-folder-fetch-interval-hours =
-    .label = { $hours ->
-      [one] 1 hour
-      *[other] { $hours } hours
-    }
-
-zen-live-folder-rss-option-time-range =
-    .label = Time Range
-
-zen-live-folder-time-range-hours =
-    .label = { $hours ->
-      [one] Last hour
-      *[other] Last { $hours } hours
-    }
-
-zen-live-folder-time-range-all-time =
-    .label = All time
-
-zen-live-folder-time-range-days =
-    .label = { $days ->
-      [one] Last day
-      *[other] Last { $days } days
-    }
-
-zen-live-folder-rss-option-item-limit =
-    .label = Item Limit
-
-zen-live-folder-rss-option-feed-url =
-    .label = Feed URL
-
-zen-live-folder-rss-prompt-feed-url = Please enter the feed URL
-
-zen-live-folder-rss-option-item-limit-num =
-    .label = { $limit } items
-
-zen-live-folder-failed-fetch =
-    .label = Failed to update
-    .tooltiptext = Failed to update. Try again.
-
-zen-live-folder-github-no-auth =
-    .label = Not signed in to GitHub
-    .tooltiptext = Sign back in to GitHub.
-
-zen-live-folder-github-no-filter =
-    .label = Filter is not set
-    .tooltiptext = No filter set, nothing will be fetched.
-
-zen-live-folder-rss-invalid-url-title = Failed to create the Live Folder
-zen-live-folder-rss-invalid-url-description = The feed URL is invalid. Check the address and try again
-
-zen-live-folder-github-option-repo-filter =
-    .label = Repositories
-
-zen-live-folder-github-option-repo =
-    .label = { $repo }
-
-zen-live-folder-github-pull-requests =
-    .label = Pull Requests
-
-zen-live-folder-github-issues =
-    .label = Issues
-
-zen-live-folder-github-option-repo-list-note =
-    .label = This list is generated based on your currently active pull requests.
-
-zen-live-folders-promotion-title = Live Folder Created!
-zen-live-folders-promotion-description = Latest content from your RSS feeds or GitHub pull requests will appear here automatically.

locales/en-US/browser/browser/zen-split-view.ftl

@@ -16,4 +16,7 @@ zen-split-link =
 
 zen-split-view-modifier-header = Split View
 zen-split-view-modifier-activate-reallocation =
-    .label = Activate reallocation
+    .label = Activate reallocation
+zen-split-view-modifier-enabled-toast = Split view rearrange is ON.
+zen-split-view-modifier-enabled-toast-description = Drag and drop the view to rearrange. Press Esc to exit.
+zen-split-view-modifier-disabled-toast = Split view rearrange is OFF.

locales/en-US/browser/browser/zen-vertical-tabs.ftl

@@ -42,9 +42,4 @@ tabbrowser-reset-pin-button =
         [one] Reset and pin tab
         *[other] Reset and pin { $tabCount } tabs
     }
-
-zen-tab-sublabel =
-    { $tabSubtitle ->
-        [zen-default-pinned] Back to pinned url
-        *[other] { $tabSubtitle }
-    }
+tab-reset-pin-label = Back to pinned url

locales/en-US/browser/browser/zen-workspaces.ftl

@@ -13,9 +13,6 @@ zen-panel-ui-workspaces-create =
 zen-panel-ui-folder-create =
     .label = Create Folder
 
-zen-panel-ui-live-folder-create =
-    .label = Live Folder
-
 zen-panel-ui-new-empty-split =
     .label = New Split
 

locales/update-supported-languages.sh

@@ -1,4 +1,3 @@
-#!/usr/bin/env bash
 LANGS_FILE="./supported-languages"
 
 # Clean up the file

package.json

@@ -21,8 +21,9 @@
     "sync:raw": "surfer update",
     "sync:rc": "python3 scripts/update_ff.py --rc",
     "sync:l10n": "python3 scripts/update_ff.py --just-l10n",
-    "lint": "cd engine && ./mach lint zen",
-    "lint:fix": "npm run lint -- --fix",
+    "pretty": "prettier . --write --cache && autopep8 -r --in-place scripts/ src/ --exclude src/zen/tests/",
+    "lint": "npx eslint src/ && prettier . --check --cache",
+    "lint:fix": "npm run pretty && npx eslint src/ --fix",
     "prepare": "husky",
     "reset-ff": "surfer reset",
     "surfer": "surfer",
@@ -50,14 +51,32 @@
   "homepage": "https://github.com/zen-browser/desktop#readme",
   "devDependencies": {
     "@babel/preset-typescript": "^7.27.0",
-    "@zen-browser/prettier": "^3.9.3",
-    "@zen-browser/surfer": "^1.13.4",
+    "@eslint/js": "^9.39.2",
+    "@eslint/json": "^0.14.0",
+    "@microsoft/eslint-plugin-sdl": "^1.1.0",
+    "@zen-browser/surfer": "^1.13.1",
+    "eslint": "^9.39.2",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-eslint-plugin": "^7.3.0",
+    "eslint-plugin-html": "^8.1.3",
+    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-jest": "^29.12.1",
+    "eslint-plugin-json": "^4.0.1",
+    "eslint-plugin-jsx-a11y": "^6.10.2",
+    "eslint-plugin-lit": "^2.1.1",
+    "eslint-plugin-mozilla": "^4.3.3",
+    "eslint-plugin-no-unsanitized": "4.1.4",
+    "eslint-plugin-promise": "7.2.1",
+    "eslint-plugin-react": "7.37.5",
+    "eslint-plugin-react-hooks": "^5.2.0",
+    "eslint-plugin-spidermonkey-js": "file:tools/eslint-plugin-spidermonkey-js",
     "formal-git": "^1.2.9",
     "globals": "^16.3.0",
     "husky": "^9.1.7",
     "lint-staged": "^15.3.0",
-    "typescript": "^5.9.3"
-  },
-  "notes(private)": "We don't want to publish to npm, so this is marked as private",
-  "private": true
+    "prettier": "^3.4.2",
+    "prettier-plugin-sh": "^0.14.0",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.52.0"
+  }
 }

prefs/firefox/browser.yaml

@@ -73,9 +73,5 @@
 - name: browser.tabs.notes.enabled
   value: false
 
-- name: browser.tabs.dragDrop.dragToPin.enabled
-  value: false
-  locked: true
-
 - name: browser.tabs.dragDrop.moveOverThresholdPercent
   value: 50 # Percentage of tab height to trigger move over on drag-and-drop

prefs/firefox/urlbar.yaml

@@ -32,6 +32,9 @@
 - name: browser.search.suggest.enabled.private
   value: false
 
+- name: browser.search.separatePrivateDefault.ui.enabled
+  value: true
+
 - name: browser.urlbar.quicksuggest.enabled
   value: false
   locked: true
@@ -56,8 +59,3 @@
 - name: browser.urlbar.suggest.topsites
   value: true
   locked: true
-
-# See https://github.com/zen-browser/desktop/issues/7248
-# We've submitted a patch to Firefox at https://bugzilla.mozilla.org/show_bug.cgi?id=2018499
-- name: browser.urlbar.closeOnWindowBlur
-  value: false

prefs/privatefox/privacy.yaml

@@ -63,10 +63,6 @@
   value: false
   locked: true
 
-- name: browser.search.serpEventTelemetryCategorization.enabled
-  value: false
-  locked: true
-
 - name: browser.newtabpage.activity-stream.telemetry
   value: false
   locked: true

prefs/zen/compact-mode.yaml

@@ -17,9 +17,6 @@
 - name: zen.view.compact.toolbar-hide-after-hover.duration
   value: 1000
 
-- name: zen.view.compact.sidebar-keep-hover.duration
-  value: 150
-
 - name: zen.view.compact.animate-sidebar
   value: true
 

prefs/zen/folders.yaml

@@ -6,7 +6,7 @@
   value: true
 
 - name: zen.folders.search.hover-delay
-  value: 500 # ms
+  value: 700 # ms
 
 - name: zen.folders.max-subfolders
   value: 5

prefs/zen/gtk.yaml

@@ -4,9 +4,7 @@
 
 # GTK-specific preferences
 - name: widget.gtk.rounded-bottom-corners.enabled
-  # Disabled for https://github.com/zen-browser/desktop/issues/6302,
-  # also see https://bugzilla.mozilla.org/show_bug.cgi?id=1979083
-  value: false
+  value: true
   condition: "defined(MOZ_WIDGET_GTK)"
 
 - name: zen.widget.linux.transparency

prefs/zen/macos.yaml

@@ -20,10 +20,3 @@
   cpptype: uint32_t
   mirror: always
   type: static
-
-# Enable native popovers on macOS, we've sent this patch to upstream
-# but we enable it by default anyways in case they decide to not use it,
-# or to disable it by default.
-- name: widget.macos.native-popovers
-  value: true
-  condition: "defined(XP_MACOSX)"

prefs/zen/media.yaml

@@ -4,6 +4,7 @@
 
 - name: image.jxl.enabled
   value: true
+  locked: true
 
 - name: svg.context-properties.content.enabled
   value: true

prefs/zen/split-view.yaml

@@ -10,12 +10,3 @@
 
 - name: zen.splitView.rearrange-hover-size
   value: 24
-
-- name: zen.splitView.enable-drag-over-split
-  value: true
-
-- name: zen.splitView.drag-over-split-delayMC
-  value: 1000
-
-- name: zen.splitView.drag-over-split-threshold
-  value: 40

prefs/zen/view.yaml

@@ -56,4 +56,4 @@
   value: true
 
 - name: zen.view.overflow-webext-toolbar
-  value: "@IS_TWILIGHT@"
+  value: true

pyproject.toml

@@ -2,10 +2,8 @@
 # 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/.
 
-[DEFAULT]
-
-["browser_github_live_folder.js"]
-
-["browser_live_folder.js"]
-
-["browser_rss_live_folder.js"]
+[tool.autopep8]
+max_line_length = 120
+recursive = true
+aggressive = 3
+indent_size = 2

requirements.txt

@@ -2,6 +2,7 @@
 # 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/.
 
+autopep8==2.3.1
 click==8.1.8
 mypy-extensions==1.0.0
 packaging==24.2

scripts/download-language-packs.sh

@@ -1,4 +1,3 @@
-#!/usr/bin/env bash
 # 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/.

scripts/fetch-formal-git-components.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 # 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/.

scripts/recalculate-patches.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 # 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/.
@@ -11,10 +11,6 @@ npm run import
 IGNORE_FILES=(
   "shared.nsh"
   "ignorePrefs.json"
-  "moz.configure"
-  "AsyncShutdown.sys.mjs"
-  "Info.plist.in"
-  "firefox.js"
 )
 
 # Recursively find all .patch files in the current directory and its subdirectories

scripts/remove-failed-jobs.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 # 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/.

scripts/update-surfer.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 # 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/.

scripts/update_external_patches.py

@@ -59,15 +59,6 @@ def main():
       output_file = os.path.join(OUTPUT_DIR, "firefox", f"{name}.patch")
       print(f"Processing Phabricator patch: {phab_id} -> {output_file}")
       download_phab_patch(phab_id, output_file)
-      replaces = patch.get("replaces", {})
-      for replace in replaces.keys():
-        value = replaces[replace]
-        with open(output_file, 'r') as f:
-          content = f.read()
-        if replace not in content:
-          die(f"Replace string '{replace}' not found in {output_file}")
-        with open(output_file, 'w') as f:
-          f.write(content.replace(replace, value))
       expected_files.add(output_file)
     elif patch.get("type") == "local":
       print(f"Local patch: {patch.get('path')}")

src/-prettierignore.patch

@@ -1,17 +0,0 @@
-diff --git a/.prettierignore b/.prettierignore
-index cbca8bb4b36cecc44e6b498e9ef15bc4bdc21871..8f3a14e14a2d58875bdd6f04bd31f57e23073148 100644
---- a/.prettierignore
-+++ b/.prettierignore
-@@ -1795,3 +1795,12 @@ tools/ts/test/baselines/
- try_task_config.json
- xpcom/idl-parser/xpidl/fixtures/xpctest.d.json
- **/package-lock.json
-+
-+
-+*.bundle.min.js
-+*.min.js
-+*.min.mjs
-+*.inc
-+*/mochitests/*
-+*.svg
-+

src/-stylelintignore.patch

@@ -1,24 +0,0 @@
-diff --git a/.stylelintignore b/.stylelintignore
-index 185490999507b8a5032977237af50f5e61c71df1..e887fafa90b881e852a287ed8898638c995861ab 100644
---- a/.stylelintignore
-+++ b/.stylelintignore
-@@ -106,3 +106,19 @@ build/pgo/blueprint/**/*.css
- # under our control or we don't want to modify at this point:
- testing/web-platform/mozilla/
- testing/web-platform/tests/
-+
-+*.inc.css
-+
-+zen/tests/mochitests/*
-+
-+# Some CSS files are preprocessed and prettier doesn't handle them well
-+# We also dont want to format the CSS files that are generated by the build
-+zen/tabs/zen-tabs.css
-+zen/common/styles/zen-theme.css
-+zen/compact-mode/zen-compact-mode.css
-+
-+zen/split-view/zen-decks.css
-+zen/workspaces/zen-workspaces.css
-+zen/common/styles/zen-toolbar.css
-+
-+*.inc

src/-stylelintrc-js.patch

@@ -1,25 +0,0 @@
-diff --git a/.stylelintrc.js b/.stylelintrc.js
-index 36719c9e152c34da2aa76fc74d74e58cb9e6b1cc..4226db2e0af4b36923a93dcd0b76e59f8508ba36 100644
---- a/.stylelintrc.js
-+++ b/.stylelintrc.js
-@@ -67,7 +67,7 @@ module.exports = {
-     ],
- 
-     "max-nesting-depth": [
--      3,
-+      6,
-       {
-         ignore: ["blockless-at-rules"],
-       },
-@@ -274,9 +274,9 @@ module.exports = {
-     // Remove this line setting `csscontrols/use-logical` to null after implementing fixes
-     "csstools/use-logical": null,
-     "stylelint-plugin-mozilla/no-base-design-tokens": true,
--    "stylelint-plugin-mozilla/use-design-tokens": true,
-+    "stylelint-plugin-mozilla/use-design-tokens": false,
-     "stylelint-plugin-mozilla/no-non-semantic-token-usage": true,
--    "stylelint-plugin-mozilla/use-size-tokens": true,
-+    "stylelint-plugin-mozilla/use-size-tokens": false,
-   },
- 
-   overrides: [

src/Cargo-lock.patch

@@ -1,5 +1,5 @@
 diff --git a/Cargo.lock b/Cargo.lock
-index abc04e6a8e1e68fa71c6de0375f8e953e6369d8b..7bdfb41e255fc12065de064162e9bf9e15d7ff12 100644
+index 723445447f491058784992e66245e0e0f8e61e19..02816c1df3e20d96ce68f16970b8a6e38080533e 100644
 --- a/Cargo.lock
 +++ b/Cargo.lock
 @@ -4214,8 +4214,6 @@ dependencies = [

src/Cargo-toml.patch

@@ -1,13 +1,13 @@
 diff --git a/Cargo.toml b/Cargo.toml
-index ab9eda43302a6281e59a2738170e77bb0f0b1b90..3389f1c744b56e3a6a4eb3f05b0601bed4538fa1 100644
+index 35e725043bce0b39fea550e8fb2b0ae1ff752e43..abac2042d537fcc1ce26e0e3acbf98fc2975b793 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -240,6 +240,8 @@ moz_asserts = { path = "mozglue/static/rust/moz_asserts" }
+@@ -237,6 +237,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" }
  
 +mime_guess = { path = "third_party/rust/mime_guess" }
 +
- # To-be-published changes.
- unicode-bidi = { git = "https://github.com/servo/unicode-bidi", rev = "ca612daf1c08c53abe07327cb3e6ef6e0a760f0c" }
- nss-gk-api = { git = "https://github.com/beurdouche/nss-gk-api", rev = "e48a946811ffd64abc78de3ee284957d8d1c0d63" }
+ # Patch `unicode-width` 0.1.* to 0.2.
+ unicode-width = { path = "build/rust/unicode-width" }
+ 

src/browser/app/macbuild/Contents/Info-plist-in.patch

@@ -0,0 +1,13 @@
+diff --git a/browser/app/macbuild/Contents/Info.plist.in b/browser/app/macbuild/Contents/Info.plist.in
+index 0c4fb837a24490c66b284abf2bd9299c2e021de0..ea28831b90662b12bdcb137c35b6bb83626c77e7 100644
+--- a/browser/app/macbuild/Contents/Info.plist.in
++++ b/browser/app/macbuild/Contents/Info.plist.in
+@@ -190,8 +190,6 @@
+ 	<string>@MAC_APP_NAME@ @APP_VERSION@</string>
+ 	<key>CFBundleIconFile</key>
+ 	<string>firefox.icns</string>
+-	<key>CFBundleIconName</key>
+-	<string>AppIcon</string>
+ 	<key>CFBundleIdentifier</key>
+ 	<string>@MOZ_MACBUNDLE_ID@</string>
+ 	<key>CFBundleInfoDictionaryVersion</key>

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

@@ -1,18 +1,8 @@
 diff --git a/browser/base/content/browser-box.inc.xhtml b/browser/base/content/browser-box.inc.xhtml
-index 2faed30e09511c381051bc40910a883d1d7bc10d..3b8c89902502aa384473dd6f43be7ec49bad06ac 100644
+index 2faed30e09511c381051bc40910a883d1d7bc10d..6ba2d0d91235ed33e4b4bad281c974b5960beaa2 100644
 --- a/browser/base/content/browser-box.inc.xhtml
 +++ b/browser/base/content/browser-box.inc.xhtml
-@@ -3,6 +3,9 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- <hbox flex="1" id="browser">
-+  <html:div id="zen-browser-background" class="zen-browser-generic-background">
-+    <html:div class="zen-browser-grain" />
-+  </html:div>
-   <box context="sidebar-context-menu" id="sidebar-main" hidden="true">
-     <html:sidebar-main flex="1">
-       <box id="vertical-tabs" slot="tabstrip" customizable="true" contextmenu="toolbar-context-menu"></box>
-@@ -25,7 +28,13 @@
+@@ -25,7 +25,13 @@
      </stack>
    </vbox>
    <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
@@ -26,7 +16,7 @@ index 2faed30e09511c381051bc40910a883d1d7bc10d..3b8c89902502aa384473dd6f43be7ec4
      <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 +43,5 @@
+@@ -34,3 +40,5 @@
      </stack>
    </vbox>
  </hbox>

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 0186e3a6508fc8e40f93619d8b3e5a0c003cbd4a..1f4fa115e591cfbe3e23d4ce880be66277a50a26 100644
+index 288a79e5fb4da24cffcb30fb4b8adc9604b15d26..bf9bd3e666dfb6298dbeec0546cae223a7bc68f0 100644
 --- a/browser/base/content/browser-init.js
 +++ b/browser/base/content/browser-init.js
-@@ -243,6 +243,7 @@ var gBrowserInit = {
+@@ -200,6 +200,7 @@ var gBrowserInit = {
    },
  
    onLoad() {
@@ -10,7 +10,7 @@ index 0186e3a6508fc8e40f93619d8b3e5a0c003cbd4a..1f4fa115e591cfbe3e23d4ce880be662
      gBrowser.addEventListener("DOMUpdateBlockedPopups", e =>
        PopupAndRedirectBlockerObserver.handleEvent(e)
      );
-@@ -433,6 +434,7 @@ var gBrowserInit = {
+@@ -375,6 +376,7 @@ var gBrowserInit = {
  
      this._handleURIToLoad();
  

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

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
-index e2e0526a0ddd617291f1f6c17bcfb807954b481f..c3d2afff6eaa788309d1c1a7fa40f9b8b4f0fffe 100644
+index 16cf3e201358d24c9216f9b06b0ba3b89684d32a..2cfa507bbdc96b8a293b18595d0beae031fe6119 100644
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
 @@ -33,6 +33,7 @@ ChromeUtils.defineESModuleGetters(this, {
@@ -10,7 +10,7 @@ index e2e0526a0ddd617291f1f6c17bcfb807954b481f..c3d2afff6eaa788309d1c1a7fa40f9b8
    DevToolsSocketStatus:
      "resource://devtools/shared/security/DevToolsSocketStatus.sys.mjs",
    DownloadUtils: "resource://gre/modules/DownloadUtils.sys.mjs",
-@@ -814,7 +815,12 @@ function UpdateBackForwardCommands(aWebNavigation) {
+@@ -819,7 +820,12 @@ function UpdateBackForwardCommands(aWebNavigation) {
  
    var backDisabled = backCommand.hasAttribute("disabled");
    var forwardDisabled = forwardCommand.hasAttribute("disabled");
@@ -24,7 +24,7 @@ index e2e0526a0ddd617291f1f6c17bcfb807954b481f..c3d2afff6eaa788309d1c1a7fa40f9b8
      if (backDisabled) {
        backCommand.removeAttribute("disabled");
      } else {
-@@ -2301,6 +2307,8 @@ var XULBrowserWindow = {
+@@ -2305,6 +2311,8 @@ var XULBrowserWindow = {
      AboutReaderParent.updateReaderButton(gBrowser.selectedBrowser);
      TranslationsParent.onLocationChange(gBrowser.selectedBrowser);
  
@@ -33,7 +33,7 @@ index e2e0526a0ddd617291f1f6c17bcfb807954b481f..c3d2afff6eaa788309d1c1a7fa40f9b8
      PictureInPicture.updateUrlbarToggle(gBrowser.selectedBrowser);
  
      if (!gMultiProcessBrowser) {
-@@ -3821,7 +3829,7 @@ function warnAboutClosingWindow() {
+@@ -3818,7 +3826,7 @@ function warnAboutClosingWindow() {
  
    if (!isPBWindow && !toolbar.visible) {
      return gBrowser.warnAboutClosingTabs(
@@ -42,7 +42,7 @@ index e2e0526a0ddd617291f1f6c17bcfb807954b481f..c3d2afff6eaa788309d1c1a7fa40f9b8
        gBrowser.closingTabsEnum.ALL
      );
    }
-@@ -3861,7 +3869,7 @@ function warnAboutClosingWindow() {
+@@ -3858,7 +3866,7 @@ function warnAboutClosingWindow() {
      return (
        isPBWindow ||
        gBrowser.warnAboutClosingTabs(
@@ -51,7 +51,7 @@ index e2e0526a0ddd617291f1f6c17bcfb807954b481f..c3d2afff6eaa788309d1c1a7fa40f9b8
          gBrowser.closingTabsEnum.ALL
        )
      );
-@@ -3886,7 +3894,7 @@ function warnAboutClosingWindow() {
+@@ -3883,7 +3891,7 @@ function warnAboutClosingWindow() {
      AppConstants.platform != "macosx" ||
      isPBWindow ||
      gBrowser.warnAboutClosingTabs(
@@ -60,7 +60,7 @@ index e2e0526a0ddd617291f1f6c17bcfb807954b481f..c3d2afff6eaa788309d1c1a7fa40f9b8
        gBrowser.closingTabsEnum.ALL
      )
    );
-@@ -4809,6 +4817,9 @@ var ConfirmationHint = {
+@@ -4806,6 +4814,9 @@ var ConfirmationHint = {
      MozXULElement.insertFTLIfNeeded("toolkit/branding/brandings.ftl");
      MozXULElement.insertFTLIfNeeded("browser/confirmationHints.ftl");
      document.l10n.setAttributes(this._message, messageId, options.l10nArgs);

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 df768aaa77a6986260da5052ed14c8403d48de6b..a30e3a2784a6215c959d23802b5c2c966f89ca10 100644
+index 139f7c2617f5e4843e0072435818c859def2f6bb..6ac1467b4117e2d76102d6977f13268827b4588f 100644
 --- a/browser/base/content/browser-sets.inc
 +++ b/browser/base/content/browser-sets.inc
-@@ -414,3 +414,4 @@
+@@ -413,3 +413,4 @@
           internal="true"/>
  #endif
    </keyset>

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 50845ebd925955bf9646fc499b9828eccbf266ef..5482a24576ebcd4382409cae01a4c6bcbd88a96c 100644
+index 94a05a510204c027e482fda33deaf3dc0d7471c9..79d37a7c7f29739d3ad2d9f6a3b3b8d638836b10 100644
 --- a/browser/base/content/browser-sets.js
 +++ b/browser/base/content/browser-sets.js
-@@ -270,7 +270,7 @@ document.addEventListener(
+@@ -266,7 +266,7 @@ document.addEventListener(
          }
        });
  
@@ -11,12 +11,3 @@ index 50845ebd925955bf9646fc499b9828eccbf266ef..5482a24576ebcd4382409cae01a4c6bc
        const SIDEBAR_REVAMP_PREF = "sidebar.revamp";
        const SIDEBAR_REVAMP_ENABLED = Services.prefs.getBoolPref(
          SIDEBAR_REVAMP_PREF,
-@@ -308,6 +308,8 @@ document.addEventListener(
-               panel: SidebarController.currentID,
-               opened: SidebarController._state.launcherExpanded,
-             });
-+          } else {
-+            SidebarController.toggle();
-           }
-           break;
-         case "key_gotoHistory":

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

@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js
-index 6d2052e060896bb5e91ba84c15bf14c969340935..6ceef1806e2d88cd7e2ebc867d633e9148f3b298 100644
+index 8369e546866aa313e62f808acb8d51afa8da4f9b..7a4b20dd5922425cebfac542893a52cd68a26449 100644
 --- a/browser/base/content/browser-siteIdentity.js
 +++ b/browser/base/content/browser-siteIdentity.js
-@@ -464,11 +464,6 @@ var gIdentityHandler = {
+@@ -451,11 +451,6 @@ var gIdentityHandler = {
      // avoid a pretty ugly transition. Also hide it even
      // if the update resulted in no site data, to keep the
      // illusion that clicking the button had an effect.
@@ -14,7 +14,7 @@ index 6d2052e060896bb5e91ba84c15bf14c969340935..6ceef1806e2d88cd7e2ebc867d633e91
  
      let baseDomain = SiteDataManager.getBaseDomainFromHost(this._uri.host);
      if (SiteDataManager.promptSiteDataRemoval(window, [baseDomain])) {
-@@ -847,7 +842,7 @@ var gIdentityHandler = {
+@@ -832,7 +827,7 @@ var gIdentityHandler = {
        // This is a secure internal Firefox page.
        this._identityBox.className = "chromeUI";
        let brandBundle = document.getElementById("bundle_brand");
@@ -23,7 +23,7 @@ index 6d2052e060896bb5e91ba84c15bf14c969340935..6ceef1806e2d88cd7e2ebc867d633e91
      } else if (this._pageExtensionPolicy) {
        // This is a WebExtension page.
        this._identityBox.className = "extensionPage";
-@@ -1190,6 +1185,12 @@ var gIdentityHandler = {
+@@ -1161,6 +1156,12 @@ var gIdentityHandler = {
        }
      }
  

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 832d98f911e0bd0e231421332a521bfefea72ef8..a9955256c81b252fe0527ae5857c9283e2518274 100644
+index ac82dcd286b5502d1ba38ed740813db08941eb7b..c26b3f0468ee6acd7716d4e8a24ad8cc84fce186 100644
 --- a/browser/base/content/browser.xhtml
 +++ b/browser/base/content/browser.xhtml
 @@ -19,6 +19,7 @@
@@ -10,7 +10,7 @@ index 832d98f911e0bd0e231421332a521bfefea72ef8..a9955256c81b252fe0527ae5857c9283
          persist="screenX screenY width height sizemode"
          data-l10n-sync="true">
  <head>
-@@ -100,8 +101,10 @@
+@@ -99,8 +100,10 @@
  
    <title data-l10n-id="browser-main-window-default-title"></title>
  
@@ -21,7 +21,7 @@ index 832d98f911e0bd0e231421332a521bfefea72ef8..a9955256c81b252fe0527ae5857c9283
  </head>
  <html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  # All sets except for popupsets (commands, keys, and stringbundles)
-@@ -134,9 +137,11 @@
+@@ -133,9 +136,11 @@
      </vbox>
    </html:template>
  

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 0d73eb17b340001312a885ea10f5d6ad871f14d2..475824a0f9a4bbc15dc9bc7f1d2a09a51e58bc65 100644
+index 79b604c5965ba03762acbf085c9288c73001ec24..d75d5481e5de93c592850e39d4b0b4fd07e12678 100644
 --- a/browser/base/content/main-popupset.inc.xhtml
 +++ b/browser/base/content/main-popupset.inc.xhtml
-@@ -234,6 +234,10 @@
+@@ -226,6 +226,10 @@
             hidden="true"
             tabspecific="true"
             aria-labelledby="editBookmarkPanelTitle">
@@ -13,7 +13,7 @@ index 0d73eb17b340001312a885ea10f5d6ad871f14d2..475824a0f9a4bbc15dc9bc7f1d2a09a5
        <box class="panel-header">
          <html:h1>
            <html:span id="editBookmarkPanelTitle"/>
-@@ -259,6 +263,7 @@
+@@ -251,6 +255,7 @@
                    class="footer-button"/>
          </html:moz-button-group>
        </vbox>
@@ -21,7 +21,7 @@ index 0d73eb17b340001312a885ea10f5d6ad871f14d2..475824a0f9a4bbc15dc9bc7f1d2a09a5
      </panel>
    </html:template>
  
-@@ -678,6 +683,8 @@
+@@ -656,6 +661,8 @@
  
  #include popup-notifications.inc.xhtml
  

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 4d4223c508560136aba220adb18528aac913a188..10d4d9cecbb0e7cec9191d78fb81a57376b37ff1 100644
+index 68c24f730d56f548cf1e286198a04f8363529378..eb9aa5e77cf549062d8d3770f8057ceafe67c317 100644
 --- a/browser/base/content/navigator-toolbox.inc.xhtml
 +++ b/browser/base/content/navigator-toolbox.inc.xhtml
 @@ -2,7 +2,7 @@
@@ -11,21 +11,18 @@ index 4d4223c508560136aba220adb18528aac913a188..10d4d9cecbb0e7cec9191d78fb81a573
    <script src="chrome://browser/content/navigator-toolbox.js" />
  
    <!-- Menu -->
-@@ -18,9 +18,12 @@
+@@ -18,9 +18,8 @@
  #include browser-menubar.inc
      </toolbaritem>
      <spacer flex="1" skipintoolbarset="true" style="order: 1000;"/>
 -#include titlebar-items.inc.xhtml
    </toolbar>
- 
+-
 +<hbox id="titlebar">
-+  <html:div id="zen-toolbar-background" class="zen-toolbar-background zen-browser-generic-background">
-+    <html:div class="zen-browser-grain" />
-+  </html:div>
    <toolbar id="TabsToolbar"
             class="browser-toolbar browser-titlebar"
             fullscreentoolbar="true"
-@@ -62,6 +65,9 @@
+@@ -62,6 +61,9 @@
            <html:sidebar-pins-promo id="drag-to-pin-promo-card"></html:sidebar-pins-promo>
            <arrowscrollbox id="pinned-tabs-container" orient="horizontal" clicktoscroll=""></arrowscrollbox>
            <splitter orient="vertical" id="vertical-pinned-tabs-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
@@ -35,7 +32,7 @@ index 4d4223c508560136aba220adb18528aac913a188..10d4d9cecbb0e7cec9191d78fb81a573
            <hbox class="tab-drop-indicator" hidden="true"/>
            <arrowscrollbox id="tabbrowser-arrowscrollbox" orient="horizontal" flex="1" clicktoscroll="" scrolledtostart="" scrolledtoend="">
              <tab is="tabbrowser-tab" class="tabbrowser-tab" selected="true" visuallyselected="" fadein=""/>
-@@ -81,6 +87,7 @@
+@@ -81,6 +83,7 @@
                                tooltip="dynamic-shortcut-tooltip"
                                data-l10n-id="tabs-toolbar-new-tab"/>
            <html:span id="tabbrowser-tab-a11y-desc" hidden="true"/>
@@ -43,8 +40,8 @@ index 4d4223c508560136aba220adb18528aac913a188..10d4d9cecbb0e7cec9191d78fb81a573
          </tabs>
  
          <toolbarbutton id="new-tab-button"
-@@ -114,9 +121,10 @@
- 
+@@ -106,9 +109,10 @@
+ #include private-browsing-indicator.inc.xhtml
      <toolbarbutton class="content-analysis-indicator toolbarbutton-1 content-analysis-indicator-icon"/>
  
 -#include titlebar-items.inc.xhtml

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..95ae5036b57baeb5237603c0921f1e9252af6919 100644
+index 15469e9d9b91c1eaef2578c9e43b6999edac3392..553402b41bc15f7cd99bf87c54416dc66d7c03e7 100644
 --- a/browser/base/content/navigator-toolbox.js
 +++ b/browser/base/content/navigator-toolbox.js
 @@ -6,7 +6,7 @@
@@ -19,25 +19,15 @@ index 15469e9d9b91c1eaef2578c9e43b6999edac3392..95ae5036b57baeb5237603c0921f1e92
          #picture-in-picture-button,
          #urlbar-zoom-button,
          #star-button-box,
-@@ -209,6 +210,17 @@ document.addEventListener(
+@@ -206,6 +207,7 @@ document.addEventListener(
+         case "vertical-tabs-newtab-button":
+         case "tabs-newtab-button":
+         case "new-tab-button":
++        case "zen-tabs-wrapper":
            gBrowser.handleNewTabMiddleClick(element, event);
            break;
  
-+        case "zen-tabs-wrapper":
-+          if (event.button == 1) {
-+            BrowserCommands.openTab();
-+            // Stop the propagation of the click event, to prevent the event from being
-+            // handled more than once.
-+            // E.g. see https://bugzilla.mozilla.org/show_bug.cgi?id=1657992#c4
-+            event.stopPropagation();
-+            event.preventDefault();
-+          }
-+          break;
-+
-         case "back-button":
-         case "forward-button":
-         case "reload-button":
-@@ -318,6 +330,7 @@ document.addEventListener(
+@@ -318,6 +320,7 @@ document.addEventListener(
          #downloads-button,
          #fxa-toolbar-menu-button,
          #unified-extensions-button,
@@ -45,7 +35,7 @@ index 15469e9d9b91c1eaef2578c9e43b6999edac3392..95ae5036b57baeb5237603c0921f1e92
          #library-button,
          #split-view-button
        `);
-@@ -401,6 +414,16 @@ document.addEventListener(
+@@ -401,6 +404,16 @@ document.addEventListener(
            gUnifiedExtensions.togglePanel(event);
            break;
  

src/browser/base/content/nsContextMenu-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/nsContextMenu.sys.mjs b/browser/base/content/nsContextMenu.sys.mjs
-index 90c8d48fa992ca5ac125fa2998741db79264de4a..a598431671e42b9ede23b0595790564202408a8e 100644
+index d9fbd3a9a78c993c89efa75be9e2ffc975158aba..e64382b32580c2d113774e76e3587002ce0aebad 100644
 --- a/browser/base/content/nsContextMenu.sys.mjs
 +++ b/browser/base/content/nsContextMenu.sys.mjs
 @@ -371,6 +371,9 @@ export class nsContextMenu {

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

@@ -41,13 +41,13 @@
 <script type="text/javascript" src="chrome://browser/content/ZenPreloadedScripts.js"></script>
 
 # Scripts used all over the browser
+<script type="module" src="chrome://browser/content/zen-components/ZenFolder.mjs"></script>
+
 <script type="module" src="chrome://browser/content/zen-components/ZenMediaController.mjs"></script>
 <script type="module" src="chrome://browser/content/zen-components/ZenWorkspaceCreation.mjs"></script>
 <script type="module" src="chrome://browser/content/zen-components/ZenGlanceManager.mjs"></script>
 <script type="module" src="chrome://browser/content/zen-components/ZenPinnedTabManager.mjs"></script>
 <script type="module" src="chrome://browser/content/zen-components/ZenViewSplitter.mjs"></script>
-<script type="module" src="chrome://browser/content/zen-components/ZenFolder.mjs"></script>
-<script type="module" src="chrome://browser/content/zen-components/ZenFolders.mjs"></script>s
+<script type="module" src="chrome://browser/content/zen-components/ZenFolders.mjs"></script>
 <script type="module" src="chrome://browser/content/zen-components/ZenDownloadAnimation.mjs"></script>
 <script type="module" src="chrome://browser/content/zen-components/ZenEmojiPicker.mjs"></script>
-<script type="module" src="chrome://browser/content/zen-components/ZenLiveFoldersUI.mjs"></script>

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

@@ -18,4 +18,3 @@
 #include ../../../zen/images/jar.inc.mn
 #include ../../../zen/vendor/jar.inc.mn
 #include ../../../zen/fonts/jar.inc.mn
-#include ../../../zen/live-folders/jar.inc.mn

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

@@ -63,6 +63,4 @@
   <command id="cmd_zenCloseUnpinnedTabs" />
 
   <command id="cmd_zenNewNavigatorUnsynced" />
-
-  <command id="cmd_zenNewLiveFolder" />
 </commandset>

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

@@ -9,5 +9,4 @@
 <link rel="localization" href="browser/zen-menubar.ftl"/>
 <link rel="localization" href="browser/zen-vertical-tabs.ftl"/>
 <link rel="localization" href="browser/zen-folders.ftl"/>
-<link rel="localization" href="browser/zen-live-folders.ftl"/>
 </linkset>

src/browser/base/content/zen-panels/folders-search.inc

@@ -2,12 +2,7 @@
 # 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/.
 
-<panel id="zen-folder-tabs-popup"
-    nonnativepopover="true"
-    type="arrow"
-    orient="vertical"
-    side="left"
-    consumeoutsideclicks="never">
+<panel id="zen-folder-tabs-popup" type="arrow" orient="vertical">
   <hbox class="tabs-list-header" flex="1">
     <image class="zen-folder-tabs-list-search-icon" src="chrome://global/skin/icons/search-glass.svg"/>
     <html:input id="zen-folder-tabs-list-search" 

src/browser/base/content/zen-panels/gradient-generator.inc

@@ -2,14 +2,7 @@
 # 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/.
 
-<panel flip="side" type="arrow"
-    opupalign="center" 
-    orient="vertical" 
-    id="PanelUI-zen-gradient-generator" 
-    position="bottomright topright" 
-    mainview="true" 
-    hidepopovertail="true"
-    side="left">
+<panel flip="side" type="arrow" popupalign="center" orient="vertical" id="PanelUI-zen-gradient-generator" position="bottomright topright" mainview="true" side="left">
   <panelmultiview id="PanelUI-zen-gradient-generator-multiview" mainViewId="PanelUI-zen-gradient-generator-view">
     <panelview id="PanelUI-zen-gradient-generator-view" class="PanelUI-subView zen-theme-picker" role="document" mainview-with-header="true" has-custom-header="true">
       <hbox class="zen-theme-picker-gradient">

src/browser/base/content/zen-panels/popups.inc

@@ -3,23 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 <menupopup id="zenCreateNewPopup">
-  <menu data-l10n-id="zen-panel-ui-live-folder-create" id="zen-panel-ui-live-folder-create">
-    <menupopup>
-      <menuitem
-        data-l10n-id="zen-live-folder-github-pull-requests"
-        command="cmd_zenNewLiveFolder"
-        image="chrome://browser/skin/zen-icons/selectable/logo-github.svg" />
-      <menuitem
-        data-l10n-id="zen-live-folder-github-issues"
-        command="cmd_zenNewLiveFolder"
-        image="chrome://browser/skin/zen-icons/selectable/logo-github.svg" />
-      <menuitem
-        data-l10n-id="zen-live-folder-type-rss"
-        command="cmd_zenNewLiveFolder"
-        image="chrome://browser/skin/zen-icons/selectable/logo-rss.svg"/>
-    </menupopup>
-  </menu>
-  <menuseparator/>
   <menuitem data-l10n-id="zen-panel-ui-workspaces-create" command="cmd_zenOpenWorkspaceCreation" image="chrome://browser/skin/zen-icons/duplicate-tab.svg" />
   <menuitem data-l10n-id="zen-panel-ui-folder-create" command="cmd_zenOpenFolderCreation" image="chrome://browser/skin/zen-icons/folder.svg" />
   <menuseparator/>
@@ -52,12 +35,6 @@
 </menupopup>
 
 <menupopup id="zenFolderActions">
-  <menu id="context_zenLiveFolderOptions"
-    data-l10n-id="zen-live-folder-options"
-    hidden="true">
-    <menupopup />
-  </menu>
-  <menuseparator id="live-folder-separator" hidden="true"/>
   <menuitem id="context_zenFolderRename" data-l10n-id="zen-folders-panel-rename-folder"/>
   <menuitem id="context_zenFolderChangeIcon" data-l10n-id="tab-context-zen-edit-icon"/>
   <menuseparator />

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

@@ -1,41 +0,0 @@
-diff --git a/browser/components/BrowserContentHandler.sys.mjs b/browser/components/BrowserContentHandler.sys.mjs
-index 2152327b42c884456785ef065422e3ca6cc8c50b..932150495d23c0a63987abf14b3dc8a12eb42d6c 100644
---- a/browser/components/BrowserContentHandler.sys.mjs
-+++ b/browser/components/BrowserContentHandler.sys.mjs
-@@ -603,6 +603,28 @@ nsBrowserContentHandler.prototype = {
-       }
-     }
- 
-+    try {
-+      let blankWindowParam = cmdLine.handleFlagWithParam("blank-window", false);
-+      if (blankWindowParam !== null) {
-+        let { uri, principal } = resolveURIInternal(cmdLine, blankWindowParam);
-+        if (shouldLoadURI(uri)) {
-+          let win = openBrowserWindow(cmdLine, principal, uri.spec);
-+          win._zenStartupSyncFlag = 'unsynced';
-+          cmdLine.preventDefault = true;
-+        }
-+      }
-+    } catch (e) {
-+      if (e.result != Cr.NS_ERROR_INVALID_ARG) {
-+        throw e;
-+      }
-+      if (cmdLine.handleFlag("blank-window", false)) {
-+        let win = openBrowserWindow(cmdLine, null, null);
-+        win._zenStartupSyncFlag = 'unsynced';
-+        cmdLine.preventDefault = true;
-+      }
-+    }
-+
-+
-     var searchParam = cmdLine.handleFlagWithParam("search", false);
-     if (searchParam) {
-       doSearch(searchParam, cmdLine);
-@@ -672,6 +694,7 @@ nsBrowserContentHandler.prototype = {
-       "  --new-window <url> Open <url> in a new window.\n" +
-       "  --new-tab <url>    Open <url> in a new tab.\n" +
-       "  --private-window [<url>] Open <url> in a new private window.\n";
-+    info += "  --blank-window [<url>]  Open the new blank window.\n";
-     if (AppConstants.platform == "win") {
-       info += "  --preferences      Open Options dialog.\n";
-     } else {

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 33a0f6b7e5cfe087388483fefa55b927e3e3f4a3..65135c6904b5e9523f77689dfc572aefe11b0961 100644
+index 8acc1e5a97f769dc76d30ca0534f28b0a4511ab5..bd54169f976d3abe7d122b0efc0fa0d0626179eb 100644
 --- a/browser/components/BrowserGlue.sys.mjs
 +++ b/browser/components/BrowserGlue.sys.mjs
 @@ -8,6 +8,7 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
@@ -10,7 +10,7 @@ index 33a0f6b7e5cfe087388483fefa55b927e3e3f4a3..65135c6904b5e9523f77689dfc572aef
    AboutHomeStartupCache: "resource:///modules/AboutHomeStartupCache.sys.mjs",
    AWToolbarButton: "resource:///modules/aboutwelcome/AWToolbarUtils.sys.mjs",
    ASRouter: "resource:///modules/asrouter/ASRouter.sys.mjs",
-@@ -1455,7 +1456,7 @@ BrowserGlue.prototype = {
+@@ -1452,7 +1453,7 @@ BrowserGlue.prototype = {
        windowcount++;
        let tabbrowser = win.gBrowser;
        if (tabbrowser) {
@@ -19,7 +19,7 @@ index 33a0f6b7e5cfe087388483fefa55b927e3e3f4a3..65135c6904b5e9523f77689dfc572aef
        }
      }
  
-@@ -1620,6 +1621,8 @@ BrowserGlue.prototype = {
+@@ -1617,6 +1618,8 @@ BrowserGlue.prototype = {
      } else if (profileDataVersion < APP_DATA_VERSION) {
        lazy.ProfileDataUpgrader.upgrade(profileDataVersion, APP_DATA_VERSION);
      }

src/browser/components/aboutwelcome/content/aboutwelcome-css.patch

@@ -1,40 +0,0 @@
-diff --git a/browser/components/aboutwelcome/content/aboutwelcome.css b/browser/components/aboutwelcome/content/aboutwelcome.css
-index 0e1985aa519d66b047c5d40977bb12099d966b18..76b59891b4c4464b38d6973858f13fff0285737d 100644
---- a/browser/components/aboutwelcome/content/aboutwelcome.css
-+++ b/browser/components/aboutwelcome/content/aboutwelcome.css
-@@ -329,6 +329,11 @@ panel#feature-callout {
-   --panel-shadow-margin: 6px;
-   --panel-arrow-space: calc(var(--panel-shadow-margin) + var(--arrow-visible-height) - 1.5px);
-   --panel-margin-offset: calc(-1 * (var(--panel-shadow-margin) + var(--arrow-corner-distance) + (var(--arrow-width) / 2)));
-+
-+  @media -moz-pref("widget.macos.native-popovers") and (-moz-platform: macos) {
-+    --panel-shadow-margin: 0;
-+    --panel-arrow-space: 0;
-+  }
- }
- 
- panel#feature-callout::part(content) {
-@@ -512,6 +517,12 @@ div#feature-callout.hidden {
-   width: 25em;
-   gap: 16px;
-   background: var(--fc-background);
-+
-+  @media -moz-pref("widget.macos.native-popovers") and (-moz-platform: macos) {
-+    --fc-background: transparent;
-+    box-shadow: none;
-+    border-width: 0;
-+  }
- }
- #feature-callout .screen[pos=callout] .section-main .main-content .main-content-inner {
-   gap: 12px;
-@@ -818,6 +829,10 @@ panel#feature-callout::part(content) {
-   overflow: visible;
-   transform: rotate(45deg);
-   transform-style: preserve-3d;
-+
-+  @media -moz-pref("widget.macos.native-popovers") and (-moz-platform: macos) {
-+    display: none;
-+  }
- }
- #feature-callout:not([arrow-position]) .arrow-box, #feature-callout[hide-arrow] .arrow-box {
-   display: none;

src/browser/components/controlcenter/content/identityPanel-inc-xhtml.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/controlcenter/content/identityPanel.inc.xhtml b/browser/components/controlcenter/content/identityPanel.inc.xhtml
-index d7f214f471f70de3805e0f5b3b2d77f49a06c4f1..555b55089368e1782cf0266415fb3040b269d3a5 100644
+index 8e23aad8ca0bb686a669b11e1d78b7906f5f38d0..cf4873cc6165b5f77091c056d7e275e0f3d36769 100644
 --- a/browser/components/controlcenter/content/identityPanel.inc.xhtml
 +++ b/browser/components/controlcenter/content/identityPanel.inc.xhtml
 @@ -28,7 +28,7 @@

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 1c696a11d831ea25b4b01689e9b23bda8a754900..fed5576c05aeffd87022565580ce085cb81fe70c 100644
+index d016811caa6c1ecc947fd705f6e1b27e3b5a12a5..89f2a9ec9ebd80e744ed0118e1b3c164151cf2b8 100644
 --- a/browser/components/customizableui/content/panelUI.js
 +++ b/browser/components/customizableui/content/panelUI.js
-@@ -627,10 +627,12 @@ const PanelUI = {
+@@ -619,10 +619,12 @@ const PanelUI = {
      if (hasKids && !this.navbar.hasAttribute("nonemptyoverflow")) {
        this.navbar.setAttribute("nonemptyoverflow", "true");
        this.overflowPanel.setAttribute("hasfixeditems", "true");
@@ -15,7 +15,7 @@ index 1c696a11d831ea25b4b01689e9b23bda8a754900..fed5576c05aeffd87022565580ce085c
      }
    },
  
-@@ -978,7 +980,7 @@ const PanelUI = {
+@@ -970,7 +972,7 @@ const PanelUI = {
          el.removeAttribute("data-lazy-l10n-id");
        });
  

src/browser/components/extensions/parent/ext-tabs-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/extensions/parent/ext-tabs.js b/browser/components/extensions/parent/ext-tabs.js
-index 7e32fc3f3c325b7317533acf5142bb912556fdbe..04bbe6bece881a05d2eadf81411bd4df2b745017 100644
+index bff93996b42aa1f88f1bfcbd813c3af4a5806f13..1252727b4811248e138cf7a38f8d1fd422576d28 100644
 --- a/browser/components/extensions/parent/ext-tabs.js
 +++ b/browser/components/extensions/parent/ext-tabs.js
 @@ -501,6 +501,7 @@ this.tabs = class extends ExtensionAPIPersistent {

src/browser/components/preferences/config/aiFeatures-mjs.patch

@@ -1,57 +0,0 @@
-diff --git a/browser/components/preferences/config/aiFeatures.mjs b/browser/components/preferences/config/aiFeatures.mjs
-index f00c1e20a8ca06108fc41c97badd234167430aee..f7d553cc10492f9447c7b0f801f36b2d66b95d43 100644
---- a/browser/components/preferences/config/aiFeatures.mjs
-+++ b/browser/components/preferences/config/aiFeatures.mjs
-@@ -634,52 +634,6 @@ SettingGroupManager.registerGroups({
-                   },
-                 ],
-               },
--              {
--                control: "moz-box-item",
--                items: [
--                  {
--                    id: "aiControlPdfjsAltTextSelect",
--                    l10nId: "preferences-ai-controls-pdfjs-control",
--                    control: "moz-select",
--                    controlAttrs: {
--                      inputlayout: "inline-end",
--                    },
--                    supportPage: "pdf-alt-text",
--                    options: [...AI_CONTROL_OPTIONS],
--                  },
--                ],
--              },
--              {
--                control: "moz-box-item",
--                items: [
--                  {
--                    id: "aiControlSmartTabGroupsSelect",
--                    l10nId:
--                      "preferences-ai-controls-tab-group-suggestions-control",
--                    control: "moz-select",
--                    controlAttrs: {
--                      inputlayout: "inline-end",
--                    },
--                    supportPage: "how-use-ai-enhanced-tab-groups",
--                    options: [...AI_CONTROL_OPTIONS],
--                  },
--                ],
--              },
--              {
--                control: "moz-box-item",
--                items: [
--                  {
--                    id: "aiControlLinkPreviewKeyPointsSelect",
--                    l10nId: "preferences-ai-controls-key-points-control",
--                    control: "moz-select",
--                    controlAttrs: {
--                      inputlayout: "inline-end",
--                    },
--                    supportPage: "use-link-previews-firefox",
--                    options: [...AI_CONTROL_OPTIONS],
--                  },
--                ],
--              },
-             ],
-           },
-         ],

src/browser/components/preferences/jar-mn.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn
-index f06aaedc681cac4dc26d8e168d47991098477424..db2e81338793f99d9f034555abb1f6ef28bb1ae9 100644
+index 5e53352fdbd25d2aed40d0117c3ad7072b9acf8c..0f400864ba7cc850d212ddeeefb71a06376e845f 100644
 --- a/browser/components/preferences/jar.mn
 +++ b/browser/components/preferences/jar.mn
-@@ -46,3 +46,5 @@ browser.jar:
+@@ -42,3 +42,5 @@ browser.jar:
     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)

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 171021979f4783251db7f74d52a922d4bd244f08..cdc91ac91905956a82dfa3ed229146622d1d3d80 100644
+index d218a04e0ab44e6a55e368566c97df95e939565b..59f038e59fe1a8554a8b112c5ac33e700b71c79c 100644
 --- a/browser/components/preferences/main.inc.xhtml
 +++ b/browser/components/preferences/main.inc.xhtml
-@@ -49,7 +49,8 @@
+@@ -48,7 +48,8 @@
  <!-- Browser layout -->
  <groupbox data-category="paneGeneral"
            data-subcategory="layout"
@@ -12,7 +12,7 @@ index 171021979f4783251db7f74d52a922d4bd244f08..cdc91ac91905956a82dfa3ed22914662
    <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"/>
-@@ -210,6 +211,7 @@
+@@ -253,6 +254,7 @@
                languages-customize-add.label,
              " />
    </hbox>

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 3720de145e6aa3fa2fb13f8480155d9472edaa8b..f04808d58b29611f4058d9fc52ab8bc20a34825a 100644
+index 6f99cbf973d414ffd4036d17740abe963629db37..520dcce0adb06c5ebfee8c76f72f7d7b40e106da 100644
 --- a/browser/components/preferences/main.js
 +++ b/browser/components/preferences/main.js
-@@ -2190,6 +2190,11 @@ SettingGroupManager.registerGroups({
+@@ -1729,6 +1729,11 @@ SettingGroupManager.registerGroups({
          id: "browserRestoreSession",
          l10nId: "startup-restore-windows-and-tabs",
        },
@@ -14,7 +14,7 @@ index 3720de145e6aa3fa2fb13f8480155d9472edaa8b..f04808d58b29611f4058d9fc52ab8bc2
        {
          id: "windowsLaunchOnLogin",
          l10nId: "windows-launch-on-login",
-@@ -4606,7 +4611,7 @@ function getBundleForLocales(newLocales) {
+@@ -3133,7 +3138,7 @@ function getBundleForLocales(newLocales) {
      ])
    );
    return new Localization(

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 7a279d4655523156ff259c9f6bcb2a0def9d1749..de71cec7693d1fe3bf34017ab76027b83631830a 100644
+index 7d6835b8636f771943b8081b7d56f579812026c2..97227eec4baeffd39b23ed6194ce7fa108c3b862 100644
 --- a/browser/components/preferences/preferences.js
 +++ b/browser/components/preferences/preferences.js
-@@ -121,6 +121,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () {
+@@ -124,6 +124,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () {
        styleSheets: [
          "chrome://browser/skin/preferences/dialog.css",
          "chrome://browser/skin/preferences/preferences.css",
@@ -10,7 +10,7 @@ index 7a279d4655523156ff259c9f6bcb2a0def9d1749..de71cec7693d1fe3bf34017ab76027b8
        ],
        resizeCallback: async ({ title, frame }) => {
          // Search within main document and highlight matched keyword.
-@@ -350,6 +351,10 @@ function init_all() {
+@@ -344,6 +345,10 @@ function init_all() {
    register_module("paneSearch", gSearchPane);
    register_module("panePrivacy", gPrivacyPane);
    register_module("paneContainers", gContainersPane);

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

@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
-index 0dd43c76f947e593a9be5edae936f1af17f9b627..df026b3e164da92536adef72ee0388386cb9708b 100644
+index a1aec823d6266d69ff02aa8523d2da999a0871b9..559f2ea12e53dd19f24e7953db4388456b97f02c 100644
 --- a/browser/components/preferences/preferences.xhtml
 +++ b/browser/components/preferences/preferences.xhtml
-@@ -42,6 +42,8 @@
+@@ -46,6 +46,8 @@
    <link rel="stylesheet" href="chrome://browser/content/preferences/widgets/setting-pane.css" />
    <link rel="stylesheet" href="chrome://browser/content/preferences/widgets/setting-control.css" />
  
@@ -11,7 +11,7 @@ index 0dd43c76f947e593a9be5edae936f1af17f9b627..df026b3e164da92536adef72ee038838
    <link rel="localization" href="branding/brand.ftl"/>
    <link rel="localization" href="browser/browser.ftl"/>
      <!-- Used by fontbuilder.js -->
-@@ -111,6 +113,11 @@
+@@ -115,6 +117,11 @@
    <hbox flex="1">
  
      <vbox class="navigation">
@@ -23,7 +23,7 @@ index 0dd43c76f947e593a9be5edae936f1af17f9b627..df026b3e164da92536adef72ee038838
        <!-- category list -->
        <richlistbox id="categories" data-l10n-id="category-list" data-l10n-attrs="aria-label">
          <richlistitem id="category-general"
-@@ -123,6 +130,50 @@
+@@ -127,6 +134,50 @@
            <label class="category-name" flex="1" data-l10n-id="pane-general-title"></label>
          </richlistitem>
  
@@ -74,7 +74,7 @@ index 0dd43c76f947e593a9be5edae936f1af17f9b627..df026b3e164da92536adef72ee038838
          <richlistitem id="category-home"
                        class="category"
                        value="paneHome"
-@@ -248,11 +299,6 @@
+@@ -242,11 +293,6 @@
                  <html:a href="about:policies" target="_blank" data-l10n-id="managed-notice"/>
                </hbox>
              </hbox>
@@ -86,7 +86,7 @@ index 0dd43c76f947e593a9be5edae936f1af17f9b627..df026b3e164da92536adef72ee038838
            </hbox>
          </hbox>
          <vbox id="mainPrefPane">
-@@ -265,6 +311,10 @@
+@@ -260,6 +306,10 @@
  #include sync.inc.xhtml
  #include experimental.inc.xhtml
  #include moreFromMozilla.inc.xhtml

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

@@ -1,5 +1,5 @@
 diff --git a/browser/components/preferences/sync.inc.xhtml b/browser/components/preferences/sync.inc.xhtml
-index 86053cbf35ef1b004185ee54e9d7b9f2e2b8d550..a8fe2db034ffe99e01fd0f92d629151df7f708a8 100644
+index 4ecdbdb129577165ed0df619577327f7610e138f..761a4d4f26a21ba555b7af180e8a6030615db500 100644
 --- a/browser/components/preferences/sync.inc.xhtml
 +++ b/browser/components/preferences/sync.inc.xhtml
 @@ -223,6 +223,10 @@

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

@@ -818,13 +818,6 @@ const zenMissingKeyboardShortcutL10n = {
   key_accessibility: "zen-devtools-toggle-accessibility-shortcut",
 };
 
-var zenIgnoreKeyboardShortcutIDs = [
-  "key_enterFullScreen_old",
-  "key_enterFullScreen_compat",
-  "key_exitFullScreen_old",
-  "key_exitFullScreen_compat",
-];
-
 var zenIgnoreKeyboardShortcutL10n = [
   "zen-full-zoom-reduce-shortcut-alt-b",
   "zen-full-zoom-reduce-shortcut-alt-a",
@@ -895,11 +888,7 @@ var gZenCKSSettings = {
 
       const labelValue = zenMissingKeyboardShortcutL10n[keyID] ?? l10nID;
 
-      if (
-        zenIgnoreKeyboardShortcutIDs.includes(keyID) ||
-        zenIgnoreKeyboardShortcutL10n.includes(labelValue) ||
-        shortcut.shouldBeEmpty
-      ) {
+      if (zenIgnoreKeyboardShortcutL10n.includes(labelValue) || shortcut.shouldBeEmpty) {
         continue;
       }
 

src/browser/components/screenshots/overlay/overlay-css.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/screenshots/overlay/overlay.css b/browser/components/screenshots/overlay/overlay.css
-index 94d87522bfaaf59b9138ec5ca960be0a0ea31339..ab3fa41cefdfc1d93edeb8a2d626bd9b1e07344b 100644
+index 43a5d2109ad107ce1c79eef7cb8635bc1fa813f7..c1e5648d0e71826119bda1bc18c5d16886bab8fd 100644
 --- a/browser/components/screenshots/overlay/overlay.css
 +++ b/browser/components/screenshots/overlay/overlay.css
-@@ -200,6 +200,9 @@
+@@ -196,6 +196,9 @@
    pointer-events: none;
    position: absolute;
    z-index: var(--screenshots-high-layer);
@@ -12,11 +12,11 @@ index 94d87522bfaaf59b9138ec5ca960be0a0ea31339..ab3fa41cefdfc1d93edeb8a2d626bd9b
  }
  
  #top-background {
-@@ -218,7 +221,7 @@
+@@ -214,7 +217,7 @@
  }
  
  .bghighlight {
--  background-color: var(--background-color-overlay);
+-  background-color: rgba(0, 0, 0, 0.7);
 +  background-color: rgba(0, 0, 0, 0.5);
    position: absolute;
    overflow: clip;

src/browser/components/search/SearchUIUtils-sys-mjs.patch

@@ -1,12 +1,13 @@
 diff --git a/browser/components/search/SearchUIUtils.sys.mjs b/browser/components/search/SearchUIUtils.sys.mjs
-index 22680c91da251adc21bb46debc73b3dbf6cdf08c..80d465e698c9900a6495d3f17ca2e66a25ff4021 100644
+index 65daa1402a52e252360386e60471f726c1387bb3..be8f588316a8a4d7f33a324bf11f9e1f19def32d 100644
 --- a/browser/components/search/SearchUIUtils.sys.mjs
 +++ b/browser/components/search/SearchUIUtils.sys.mjs
-@@ -445,6 +445,7 @@ export var SearchUIUtils = {
+@@ -444,7 +444,7 @@ export var SearchUIUtils = {
+         triggeringSearchEngine: engine.name,
        },
      });
- 
+-
 +    window.gZenGlanceManager?.onSearchSelectCommand(where);
-     lazy.BrowserSearchTelemetry.recordSearch(
-       window.gBrowser.selectedBrowser,
-       engine,
+     return { engine, url: submission.uri };
+   },
+ 

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..70d7b5c7d69d3700475d663b595052264c67d351 100644
+index 86600ffb5178599ab23270a964064ca657a3283f..97975af7822a157eafe02ec8bbebdf1a6b564ccb 100644
 --- a/browser/components/sessionstore/SessionStartup.sys.mjs
 +++ b/browser/components/sessionstore/SessionStartup.sys.mjs
 @@ -40,6 +40,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
@@ -51,13 +51,3 @@ index 86600ffb5178599ab23270a964064ca657a3283f..70d7b5c7d69d3700475d663b59505226
      }
  
      return this._resumeSessionEnabled;
-@@ -354,8 +354,7 @@ export var SessionStartup = {
-    */
-   willRestore() {
-     return (
--      this.sessionType == this.RECOVER_SESSION ||
--      this.sessionType == this.RESUME_SESSION
-+      true
-     );
-   },
- 

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 f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf06644d92 100644
+index 2a055f0c5f34f0a2667f659185120c07d38f4e41..2061ef7ac60371a563b4e4cd77ceab586f767a5e 100644
 --- a/browser/components/sessionstore/SessionStore.sys.mjs
 +++ b/browser/components/sessionstore/SessionStore.sys.mjs
 @@ -127,6 +127,9 @@ const TAB_EVENTS = [
@@ -12,7 +12,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
  ];
  
  const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-@@ -198,6 +201,8 @@ ChromeUtils.defineESModuleGetters(lazy, {
+@@ -196,6 +199,8 @@ ChromeUtils.defineESModuleGetters(lazy, {
    TabStateCache: "resource:///modules/sessionstore/TabStateCache.sys.mjs",
    TabStateFlusher: "resource:///modules/sessionstore/TabStateFlusher.sys.mjs",
    setTimeout: "resource://gre/modules/Timer.sys.mjs",
@@ -21,7 +21,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
  });
  
  ChromeUtils.defineLazyGetter(lazy, "blankURI", () => {
-@@ -1263,10 +1268,7 @@ var SessionStoreInternal = {
+@@ -1261,10 +1266,7 @@ var SessionStoreInternal = {
     */
    get willAutoRestore() {
      return (
@@ -33,7 +33,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
      );
    },
  
-@@ -1940,6 +1942,9 @@ var SessionStoreInternal = {
+@@ -1934,6 +1936,9 @@ var SessionStoreInternal = {
        case "TabPinned":
        case "TabUnpinned":
        case "SwapDocShells":
@@ -43,7 +43,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
          this.saveStateDelayed(win);
          break;
        case "TabGroupCreate":
-@@ -2050,6 +2055,10 @@ var SessionStoreInternal = {
+@@ -2044,6 +2049,10 @@ var SessionStoreInternal = {
        this._windows[aWindow.__SSi].isTaskbarTab = true;
      }
  
@@ -51,10 +51,10 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
 +      this._windows[aWindow.__SSi].isZenUnsynced = true;
 +    }
 +
-     if (lazy.AIWindow.isAIWindowActiveAndEnabled(aWindow)) {
-       this._windows[aWindow.__SSi].isAIWindow = true;
-     }
-@@ -2086,7 +2095,7 @@ var SessionStoreInternal = {
+     let tabbrowser = aWindow.gBrowser;
+ 
+     // add tab change listeners to all already existing tabs
+@@ -2076,7 +2085,7 @@ var SessionStoreInternal = {
      let isTaskbarTab = this._windows[aWindow.__SSi].isTaskbarTab;
      // A regular window is not a private window, taskbar tab window, or popup window
      let isRegularWindow =
@@ -63,16 +63,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
  
      // perform additional initialization when the first window is loading
      if (lazy.RunState.isStopped) {
-@@ -2098,7 +2107,7 @@ var SessionStoreInternal = {
-         // to disk to NOW() to enforce a full interval before the next write.
-         lazy.SessionSaver.updateLastSaveTime();
- 
--        if (isPrivateWindow || isTaskbarTab) {
-+        if (isPrivateWindow || isTaskbarTab || aWindow.document.documentElement.hasAttribute("zen-unsynced-window")) {
-           this._log.debug(
-             "initializeWindow, the window is private or a web app. Saving SessionStartup.state for possibly restoring later"
-           );
-@@ -2141,6 +2150,7 @@ var SessionStoreInternal = {
+@@ -2131,6 +2140,7 @@ var SessionStoreInternal = {
            null,
            "sessionstore-one-or-no-tab-restored"
          );
@@ -80,7 +71,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
          this._deferredAllWindowsRestored.resolve();
        }
        // this window was opened by _openWindowWithState
-@@ -2190,7 +2200,6 @@ var SessionStoreInternal = {
+@@ -2175,7 +2185,6 @@ var SessionStoreInternal = {
        if (closedWindowState) {
          let newWindowState;
          if (
@@ -88,7 +79,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
            !lazy.SessionStartup.willRestore()
          ) {
            // We want to split the window up into pinned tabs and unpinned tabs.
-@@ -2226,6 +2235,7 @@ var SessionStoreInternal = {
+@@ -2211,6 +2220,7 @@ var SessionStoreInternal = {
          }
  
          if (newWindowState) {
@@ -96,7 +87,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
            // Ensure that the window state isn't hidden
            this._restoreCount = 1;
            let state = { windows: [newWindowState] };
-@@ -2254,6 +2264,15 @@ var SessionStoreInternal = {
+@@ -2239,6 +2249,15 @@ var SessionStoreInternal = {
        });
        this._shouldRestoreLastSession = false;
      }
@@ -112,7 +103,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
  
      if (this._restoreLastWindow && aWindow.toolbar.visible) {
        // always reset (if not a popup window)
-@@ -2404,7 +2423,7 @@ var SessionStoreInternal = {
+@@ -2383,7 +2402,7 @@ var SessionStoreInternal = {
  
      var tabbrowser = aWindow.gBrowser;
  
@@ -121,7 +112,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
  
      TAB_EVENTS.forEach(function (aEvent) {
        tabbrowser.tabContainer.removeEventListener(aEvent, this, true);
-@@ -2455,7 +2474,7 @@ var SessionStoreInternal = {
+@@ -2434,7 +2453,7 @@ var SessionStoreInternal = {
  
        let isLastRegularWindow =
          Object.values(this._windows).filter(
@@ -130,7 +121,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
          ).length == 1;
        this._log.debug(
          `onClose, closing window isLastRegularWindow? ${isLastRegularWindow}`
-@@ -2512,8 +2531,8 @@ var SessionStoreInternal = {
+@@ -2491,8 +2510,8 @@ 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.
@@ -141,7 +132,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
        }
  
        completionPromise = lazy.TabStateFlusher.flushWindow(aWindow).then(() => {
-@@ -2533,8 +2552,9 @@ var SessionStoreInternal = {
+@@ -2512,8 +2531,9 @@ var SessionStoreInternal = {
  
          // Save non-private windows if they have at
          // least one saveable tab or are the last window.
@@ -153,7 +144,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
  
            if (!isLastWindow && winData.closedId > -1) {
              this._addClosedAction(
-@@ -2610,7 +2630,7 @@ var SessionStoreInternal = {
+@@ -2589,7 +2609,7 @@ var SessionStoreInternal = {
     *        to call this method again asynchronously (for example, after
     *        a window flush).
     */
@@ -162,7 +153,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
      // Make sure SessionStore is still running, and make sure that we
      // haven't chosen to forget this window.
      if (
-@@ -2627,6 +2647,7 @@ var SessionStoreInternal = {
+@@ -2606,6 +2626,7 @@ var SessionStoreInternal = {
        // _closedWindows from a previous call to this function.
        let winIndex = this._closedWindows.indexOf(winData);
        let alreadyStored = winIndex != -1;
@@ -170,7 +161,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
        // If sidebar command is truthy, i.e. sidebar is open, store sidebar settings
        let shouldStore = hasSaveableTabs || isLastWindow;
  
-@@ -3429,7 +3450,7 @@ var SessionStoreInternal = {
+@@ -3408,7 +3429,7 @@ var SessionStoreInternal = {
      if (!isPrivateWindow && tabState.isPrivate) {
        return;
      }
@@ -179,7 +170,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
        return;
      }
  
-@@ -4150,6 +4171,12 @@ var SessionStoreInternal = {
+@@ -4129,6 +4150,12 @@ var SessionStoreInternal = {
          Math.min(tabState.index, tabState.entries.length)
        );
        tabState.pinned = false;
@@ -192,7 +183,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
  
        if (inBackground === false) {
          aWindow.gBrowser.selectedTab = newTab;
-@@ -4586,6 +4613,8 @@ var SessionStoreInternal = {
+@@ -4565,6 +4592,8 @@ var SessionStoreInternal = {
        // Append the tab if we're opening into a different window,
        tabIndex: aSource == aTargetWindow ? pos : Infinity,
        pinned: state.pinned,
@@ -201,19 +192,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
        userContextId: state.userContextId,
        skipLoad: true,
        preferredRemoteType,
-@@ -5087,9 +5116,10 @@ var SessionStoreInternal = {
-       if (activePageData.title && activePageData.title != activePageData.url) {
-         win.gBrowser.setInitialTabTitle(tab, activePageData.title, {
-           isContentTitle: true,
-+          _zenChangeLabelFlag: true,
-         });
-       } else {
--        win.gBrowser.setInitialTabTitle(tab, activePageData.url);
-+        win.gBrowser.setInitialTabTitle(tab, activePageData.url, { _zenChangeLabelFlag: true });
-       }
-     }
- 
-@@ -5446,7 +5476,7 @@ var SessionStoreInternal = {
+@@ -5414,7 +5443,7 @@ var SessionStoreInternal = {
  
      for (let i = tabbrowser.pinnedTabCount; i < tabbrowser.tabs.length; i++) {
        let tab = tabbrowser.tabs[i];
@@ -222,7 +201,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
          removableTabs.push(tab);
        }
      }
-@@ -5559,7 +5589,7 @@ var SessionStoreInternal = {
+@@ -5525,7 +5554,7 @@ var SessionStoreInternal = {
  
      // collect the data for all windows
      for (ix in this._windows) {
@@ -231,7 +210,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
          // window data is still in _statesToRestore
          continue;
        }
-@@ -5702,11 +5732,12 @@ var SessionStoreInternal = {
+@@ -5668,11 +5697,12 @@ var SessionStoreInternal = {
      }
  
      let tabbrowser = aWindow.gBrowser;
@@ -245,7 +224,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
      // update the internal state data for this window
      for (let tab of tabs) {
        if (tab == aWindow.FirefoxViewHandler.tab) {
-@@ -5717,6 +5748,9 @@ var SessionStoreInternal = {
+@@ -5683,6 +5713,9 @@ var SessionStoreInternal = {
        tabsData.push(tabData);
      }
  
@@ -255,7 +234,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
      // update tab group state for this window
      winData.groups = [];
      for (let tabGroup of aWindow.gBrowser.tabGroups) {
-@@ -5729,7 +5763,7 @@ var SessionStoreInternal = {
+@@ -5695,7 +5728,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) {
@@ -264,7 +243,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
        winData.title = tabbrowser.tabs[0].label;
      }
      winData.selected = selectedIndex;
-@@ -5844,8 +5878,8 @@ var SessionStoreInternal = {
+@@ -5810,8 +5843,8 @@ var SessionStoreInternal = {
      // selectTab represents.
      let selectTab = 0;
      if (overwriteTabs) {
@@ -275,7 +254,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
        selectTab = Math.min(selectTab, winData.tabs.length);
      }
  
-@@ -5867,6 +5901,7 @@ var SessionStoreInternal = {
+@@ -5833,6 +5866,7 @@ var SessionStoreInternal = {
      if (overwriteTabs) {
        for (let i = tabbrowser.browsers.length - 1; i >= 0; i--) {
          if (!tabbrowser.tabs[i].selected) {
@@ -283,7 +262,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
            tabbrowser.removeTab(tabbrowser.tabs[i]);
          }
        }
-@@ -5900,6 +5935,12 @@ var SessionStoreInternal = {
+@@ -5866,6 +5900,12 @@ var SessionStoreInternal = {
          savedTabGroup => !openTabGroupIdsInWindow.has(savedTabGroup.id)
        );
      }
@@ -296,7 +275,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
  
      // Move the originally open tabs to the end.
      if (initialTabs) {
-@@ -6453,6 +6494,25 @@ var SessionStoreInternal = {
+@@ -6419,6 +6459,25 @@ var SessionStoreInternal = {
  
      // Most of tabData has been restored, now continue with restoring
      // attributes that may trigger external events.
@@ -322,7 +301,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
  
      if (tabData.pinned) {
        tabbrowser.pinTab(tab);
-@@ -6601,6 +6661,9 @@ var SessionStoreInternal = {
+@@ -6567,6 +6626,9 @@ var SessionStoreInternal = {
          aWindow.gURLBar.readOnly = false;
        }
      }
@@ -332,7 +311,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
  
      let promiseParts = Promise.withResolvers();
      aWindow.setTimeout(() => {
-@@ -7389,7 +7452,7 @@ var SessionStoreInternal = {
+@@ -7343,7 +7405,7 @@ var SessionStoreInternal = {
  
        let groupsToSave = new Map();
        for (let tIndex = 0; tIndex < window.tabs.length; ) {
@@ -341,7 +320,7 @@ index f066bc7a9cca1788080d088141030c225a733931..accb078ebbc23f9a823ae6c277f1e1bf
            // Adjust window.selected
            if (tIndex + 1 < window.selected) {
              window.selected -= 1;
-@@ -7404,7 +7467,7 @@ var SessionStoreInternal = {
+@@ -7358,7 +7420,7 @@ var SessionStoreInternal = {
            );
            // We don't want to increment tIndex here.
            continue;

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

@@ -1,8 +1,8 @@
 diff --git a/browser/components/sessionstore/TabState.sys.mjs b/browser/components/sessionstore/TabState.sys.mjs
-index 82721356d191055bec0d4b0ca49e481221988801..e01904a6ea73e068c236adecbac6a97adedb2bd3 100644
+index 82721356d191055bec0d4b0ca49e481221988801..68437e6f9fa54fc75ca9e24d738e8afcd0ea22f8 100644
 --- a/browser/components/sessionstore/TabState.sys.mjs
 +++ b/browser/components/sessionstore/TabState.sys.mjs
-@@ -85,7 +85,25 @@ class _TabState {
+@@ -85,7 +85,24 @@ class _TabState {
        tabData.groupId = tab.group.id;
      }
  
@@ -19,7 +19,6 @@ index 82721356d191055bec0d4b0ca49e481221988801..e01904a6ea73e068c236adecbac6a97a
 +    tabData.zenIsGlance = tab.hasAttribute("zen-glance-tab");
 +    tabData._zenPinnedInitialState = tab._zenPinnedInitialState;
 +    tabData._zenIsActiveTab = tab._zenContentsVisible;
-+    tabData.zenLiveFolderItemId = tab.getAttribute("zen-live-folder-item-id");
 +
      tabData.searchMode = tab.ownerGlobal.gURLBar.getSearchMode(browser, true);
 +    if (tabData.searchMode?.source === tab.ownerGlobal.UrlbarUtils.RESULT_SOURCE.ZEN_ACTIONS) {

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

@@ -1,8 +1,8 @@
 diff --git a/browser/components/sidebar/browser-sidebar.js b/browser/components/sidebar/browser-sidebar.js
-index 86a74b2abfe9b49d71ce61fefc636b865bef83a9..7c18fcf15d127d79febb03ca15f0193dd6263604 100644
+index bd6db85732e6e99ca51ce9c4c1a7d469199cf8cb..6c7859c1014baf4e343714ef797cf558d065e189 100644
 --- a/browser/components/sidebar/browser-sidebar.js
 +++ b/browser/components/sidebar/browser-sidebar.js
-@@ -799,7 +799,7 @@ var SidebarController = {
+@@ -793,7 +793,7 @@ var SidebarController = {
    setPosition() {
      // First reset all ordinals to match DOM ordering.
      let contentArea = document.getElementById("tabbrowser-tabbox");

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..53c838b3bc322cadee4ef9b411d02fc0af8c35e5 100644
+index aefccef39f0b81176a5710a794e8a5e2650d6507..e073c65790df6d55e827a4f4596199f4f1a99a57 100644
 --- a/browser/components/tabbrowser/TabUnloader.sys.mjs
 +++ b/browser/components/tabbrowser/TabUnloader.sys.mjs
 @@ -52,7 +52,7 @@ let CRITERIA_WEIGHT = 1;
@@ -11,12 +11,3 @@ index aefccef39f0b81176a5710a794e8a5e2650d6507..53c838b3bc322cadee4ef9b411d02fc0
        return weight;
      }
  
-@@ -106,7 +106,7 @@ let DefaultTabUnloaderMethods = {
- 
-   *iterateTabs() {
-     for (let win of Services.wm.getEnumerator("navigator:browser")) {
--      for (let tab of win.gBrowser.tabs) {
-+      for (let tab of win.gZenWorkspaces.allStoredTabs) {
-         yield { tab, gBrowser: win.gBrowser };
-       }
-     }

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

@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/browser-ctrlTab.js b/browser/components/tabbrowser/content/browser-ctrlTab.js
-index b435917892ac77fb433ea709f2524db2f2347a1d..fcbfeb92f3ae4effbfd3333514ed4d412e3063c6 100644
+index 3330dc133c120e7fbeecd2a36c71f9dfba60b3fb..0243cdfe67e5eb3f68fc7cde66bb3809e79bd6c3 100644
 --- a/browser/components/tabbrowser/content/browser-ctrlTab.js
 +++ b/browser/components/tabbrowser/content/browser-ctrlTab.js
 @@ -252,7 +252,8 @@ var ctrlTab = {

src/browser/components/tabbrowser/content/drag-and-drop-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/drag-and-drop.js b/browser/components/tabbrowser/content/drag-and-drop.js
-index 730190d845f5312736f437cdc654c1693241ce56..d0404c46955fa16103a6f83e410f4f8ad7e78655 100644
+index 57800333445ec7850742145527e04ae8d504b0bb..a13875436a72f89178455a09c8665b9a1ef240b5 100644
 --- a/browser/components/tabbrowser/content/drag-and-drop.js
 +++ b/browser/components/tabbrowser/content/drag-and-drop.js
 @@ -35,6 +35,9 @@
@@ -12,7 +12,7 @@ index 730190d845f5312736f437cdc654c1693241ce56..d0404c46955fa16103a6f83e410f4f8a
      if (isTab(element) || isSplitViewWrapper(element)) {
        return element;
      }
-@@ -118,6 +121,9 @@
+@@ -115,6 +118,9 @@
        }
  
        let draggedTab = event.dataTransfer.mozGetDataAt(TAB_DROP_TYPE, 0);
@@ -22,18 +22,18 @@ index 730190d845f5312736f437cdc654c1693241ce56..d0404c46955fa16103a6f83e410f4f8a
        if (
          (dropEffect == "move" || dropEffect == "copy") &&
          document == draggedTab.ownerDocument &&
-@@ -136,10 +142,6 @@
+@@ -133,10 +139,6 @@
  
            // Pinned tabs in expanded vertical mode are on a grid format and require
            // different logic to drag and drop.
--          if (this._tabbrowserTabs.isContainerVerticalPinnedGrid(draggedTab)) {
+-          if (this._isContainerVerticalPinnedGrid(draggedTab)) {
 -            this._animateExpandedPinnedTabMove(event);
 -            return;
 -          }
            this._animateTabMove(event);
            return;
          }
-@@ -272,6 +274,10 @@
+@@ -269,6 +271,10 @@
  
        this._tabDropIndicator.hidden = true;
        event.stopPropagation();
@@ -44,7 +44,7 @@ index 730190d845f5312736f437cdc654c1693241ce56..d0404c46955fa16103a6f83e410f4f8a
        if (draggedTab && dropEffect == "copy") {
          let duplicatedDraggedTab;
          let duplicatedTabs = [];
-@@ -297,8 +303,9 @@
+@@ -294,8 +300,9 @@
          let translateOffsetY = oldTranslateY % tabHeight;
          let newTranslateX = oldTranslateX - translateOffsetX;
          let newTranslateY = oldTranslateY - translateOffsetY;
@@ -54,9 +54,9 @@ index 730190d845f5312736f437cdc654c1693241ce56..d0404c46955fa16103a6f83e410f4f8a
 +        let numPinned = gBrowser._numVisiblePinTabsWithoutCollapsed;
 +        let essential = draggedTab.hasAttribute("zen-essential");
  
-         if (this._tabbrowserTabs.isContainerVerticalPinnedGrid(draggedTab)) {
+         if (this._isContainerVerticalPinnedGrid(draggedTab)) {
            // Update both translate axis for pinned vertical expanded tabs
-@@ -314,9 +321,12 @@
+@@ -311,9 +318,12 @@
            }
          } else {
            let tabs = this._tabbrowserTabs.dragAndDropElements.slice(
@@ -71,7 +71,7 @@ index 730190d845f5312736f437cdc654c1693241ce56..d0404c46955fa16103a6f83e410f4f8a
            let size = this._tabbrowserTabs.verticalMode ? "height" : "width";
            let screenAxis = this._tabbrowserTabs.verticalMode
              ? "screenY"
-@@ -368,11 +378,13 @@
+@@ -365,11 +375,13 @@
            this._dragToPinPromoCard,
          ];
          let shouldPin =
@@ -85,7 +85,7 @@ index 730190d845f5312736f437cdc654c1693241ce56..d0404c46955fa16103a6f83e410f4f8a
            isTab(draggedTab) &&
            draggedTab.pinned &&
            this._tabbrowserTabs.arrowScrollbox.contains(event.target);
-@@ -436,6 +448,7 @@
+@@ -432,6 +444,7 @@
            }
          }
  
@@ -93,7 +93,7 @@ index 730190d845f5312736f437cdc654c1693241ce56..d0404c46955fa16103a6f83e410f4f8a
          if (shouldTranslate) {
            let translationPromises = [];
            for (let item of movingTabs) {
-@@ -447,7 +460,7 @@
+@@ -443,7 +456,7 @@
                  item.removeAttribute("tabdrop-samewindow");
                  resolve();
                };
@@ -102,7 +102,7 @@ index 730190d845f5312736f437cdc654c1693241ce56..d0404c46955fa16103a6f83e410f4f8a
                  postTransitionCleanup();
                } else {
                  let onTransitionEnd = transitionendEvent => {
-@@ -521,7 +534,7 @@
+@@ -513,7 +526,7 @@
            if (tab.selected) {
              selectedTab = tab;
              indexForSelectedTab = newIndex;
@@ -111,7 +111,7 @@ index 730190d845f5312736f437cdc654c1693241ce56..d0404c46955fa16103a6f83e410f4f8a
              const newTab = gBrowser.adoptTab(tab, {
                elementIndex: newIndex,
                selectTab: tab == draggedTab,
-@@ -531,7 +544,7 @@
+@@ -523,7 +536,7 @@
              }
            }
          }
@@ -120,7 +120,7 @@ index 730190d845f5312736f437cdc654c1693241ce56..d0404c46955fa16103a6f83e410f4f8a
            const newTab = gBrowser.adoptTab(selectedTab, {
              elementIndex: indexForSelectedTab,
              selectTab: selectedTab == draggedTab,
-@@ -542,10 +555,6 @@
+@@ -534,10 +547,6 @@
          }
  
          // Restore tab selection
@@ -131,7 +131,7 @@ index 730190d845f5312736f437cdc654c1693241ce56..d0404c46955fa16103a6f83e410f4f8a
        } else {
          // Pass true to disallow dropping javascript: or data: urls
          let links;
-@@ -592,6 +601,7 @@
+@@ -584,6 +593,7 @@
  
            let nextItem = this._tabbrowserTabs.dragAndDropElements[newIndex];
            let tabGroup = isTab(nextItem) && nextItem.group;
@@ -139,7 +139,7 @@ index 730190d845f5312736f437cdc654c1693241ce56..d0404c46955fa16103a6f83e410f4f8a
            gBrowser.loadTabs(urls, {
              inBackground,
              replace,
-@@ -629,7 +639,16 @@
+@@ -621,7 +631,16 @@
          this._expandGroupOnDrop(draggedTab);
        }
        this._resetTabsAfterDrop(draggedTab.ownerDocument);
@@ -157,15 +157,11 @@ index 730190d845f5312736f437cdc654c1693241ce56..d0404c46955fa16103a6f83e410f4f8a
        if (
          dt.mozUserCancelled ||
          dt.dropEffect != "none" ||
-@@ -833,11 +852,10 @@
+@@ -825,7 +844,10 @@
      _getDragTarget(event, { ignoreSides = false } = {}) {
        let { target } = event;
        while (target) {
--        if (
--          isTab(target) ||
--          isTabGroupLabel(target) ||
--          isSplitViewWrapper(target)
--        ) {
+-        if (isTab(target) || isTabGroupLabel(target)) {
 +        if (isTab(target) || isTabGroupLabel(target) || target?.classList?.contains("tab-group-label-container")) {
 +          if (target.classList?.contains("tab-group-label-container")) {
 +            target = target.querySelector(".tab-group-label");
@@ -173,7 +169,7 @@ index 730190d845f5312736f437cdc654c1693241ce56..d0404c46955fa16103a6f83e410f4f8a
            break;
          }
          target = target.parentNode;
-@@ -854,6 +872,9 @@
+@@ -842,14 +864,17 @@
            return null;
          }
        }
@@ -183,7 +179,17 @@ index 730190d845f5312736f437cdc654c1693241ce56..d0404c46955fa16103a6f83e410f4f8a
        return target;
      }
  
-@@ -883,7 +904,8 @@
+     _isContainerVerticalPinnedGrid(tab) {
+       return (
+         this._tabbrowserTabs.verticalMode &&
+-        tab.pinned &&
+-        this._tabbrowserTabs.hasAttribute("expanded") &&
++        tab.hasAttribute("zen-essential") &&
++        (this._tabbrowserTabs.hasAttribute("expanded") || document.documentElement.hasAttribute("zen-sidebar-expanded")) &&
+         !this._tabbrowserTabs.expandOnHover
+       );
+     }
+@@ -880,7 +905,8 @@
          isTabGroupLabel(draggedTab) &&
          draggedTab._dragData?.expandGroupOnDrop
        ) {
@@ -193,7 +199,7 @@ index 730190d845f5312736f437cdc654c1693241ce56..d0404c46955fa16103a6f83e410f4f8a
        }
      }
  
-@@ -1061,7 +1083,6 @@
+@@ -1058,7 +1084,6 @@
          // using updateDragImage. On Linux, we can use a panel.
          if (platform == "win" || platform == "macosx") {
            captureListener = function () {
@@ -201,7 +207,7 @@ index 730190d845f5312736f437cdc654c1693241ce56..d0404c46955fa16103a6f83e410f4f8a
            };
          } else {
            // Create a panel to use it in setDragImage
-@@ -1099,7 +1120,6 @@
+@@ -1096,7 +1121,6 @@
          );
          dragImageOffset = dragImageOffset * scale;
        }
@@ -209,7 +215,7 @@ index 730190d845f5312736f437cdc654c1693241ce56..d0404c46955fa16103a6f83e410f4f8a
  
        // _dragData.offsetX/Y give the coordinates that the mouse should be
        // positioned relative to the corner of the new window created upon
-@@ -1118,7 +1138,7 @@
+@@ -1115,7 +1139,7 @@
        let dropEffect = this.getDropEffectForTabDrag(event);
        let isMovingInTabStrip = !fromTabList && dropEffect == "move";
        let collapseTabGroupDuringDrag =
@@ -218,7 +224,7 @@ index 730190d845f5312736f437cdc654c1693241ce56..d0404c46955fa16103a6f83e410f4f8a
  
        tab._dragData = {
          offsetX: this._tabbrowserTabs.verticalMode
-@@ -1128,7 +1148,7 @@
+@@ -1125,7 +1149,7 @@
            ? event.screenY - window.screenY - tabOffset
            : event.screenY - window.screenY,
          scrollPos:
@@ -227,7 +233,7 @@ index 730190d845f5312736f437cdc654c1693241ce56..d0404c46955fa16103a6f83e410f4f8a
              ? this._tabbrowserTabs.pinnedTabsContainer.scrollPosition
              : this._tabbrowserTabs.arrowScrollbox.scrollPosition,
          screenX: event.screenX,
-@@ -1155,6 +1175,7 @@
+@@ -1152,6 +1176,7 @@
  
            if (collapseTabGroupDuringDrag) {
              tab.group.collapsed = true;
@@ -235,7 +241,7 @@ index 730190d845f5312736f437cdc654c1693241ce56..d0404c46955fa16103a6f83e410f4f8a
            }
          }
        }
-@@ -1179,6 +1200,7 @@
+@@ -1176,6 +1201,7 @@
        if (tabStripItemElement.hasAttribute("dragtarget")) {
          return;
        }
@@ -243,7 +249,7 @@ index 730190d845f5312736f437cdc654c1693241ce56..d0404c46955fa16103a6f83e410f4f8a
        let isPinned = tab.pinned;
        let numPinned = gBrowser.pinnedTabCount;
        let dragAndDropElements = this._tabbrowserTabs.dragAndDropElements;
-@@ -1604,7 +1626,6 @@
+@@ -1601,7 +1627,6 @@
  
        for (let item of this._tabbrowserTabs.dragAndDropElements) {
          item = elementToMove(item);
@@ -251,7 +257,7 @@ index 730190d845f5312736f437cdc654c1693241ce56..d0404c46955fa16103a6f83e410f4f8a
          item.removeAttribute("multiselected-move-together");
          delete item._moveTogetherSelectedTabsData;
        }
-@@ -2432,7 +2453,6 @@
+@@ -2429,7 +2454,6 @@
        for (let item of this._tabbrowserTabs.dragAndDropElements) {
          this._resetGroupTarget(item);
          item = elementToMove(item);
@@ -259,7 +265,7 @@ index 730190d845f5312736f437cdc654c1693241ce56..d0404c46955fa16103a6f83e410f4f8a
        }
        this._tabbrowserTabs.removeAttribute("movingtab-group");
        this._tabbrowserTabs.removeAttribute("movingtab-ungroup");
-@@ -2463,17 +2483,14 @@
+@@ -2460,17 +2484,14 @@
          tab.style.left = "";
          tab.style.top = "";
          tab.style.maxWidth = "";

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 836bee14d2b63604688ebe477a5d915a5e99b305..7e105a1ae07657b0a0e664a8e3d9d2eb894fa1d4 100644
+index 6528da245d922e2ccdb59cbf8106055bc34d1e74..b5d5ac633c06d7d9c909ec9456a5f3c165a6b925 100644
 --- a/browser/components/tabbrowser/content/tab.js
 +++ b/browser/components/tabbrowser/content/tab.js
 @@ -21,6 +21,7 @@
@@ -14,7 +14,7 @@ index 836bee14d2b63604688ebe477a5d915a5e99b305..7e105a1ae07657b0a0e664a8e3d9d2eb
              <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="zen-tab-sublabel" data-l10n-id="zen-tab-sublabel" data-l10n-args='{"tabSubtitle": "zen-default-pinned"}' role="presentation"/>
++            <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"/>
@@ -65,11 +65,11 @@ index 836bee14d2b63604688ebe477a5d915a5e99b305..7e105a1ae07657b0a0e664a8e3d9d2eb
 +        return false;
 +      }
 +      // Selected tabs are always visible
-+      if (this.selected || this.multiselected) return true;
++      if (this.selected || this.multiselected || this.hasAttribute("folder-active")) return true;
 +      // Recursively check all parent groups
 +      let currentParent = this.group;
 +      while (currentParent) {
-+        if (currentParent.collapsed && !currentParent.activeTabs?.includes(this)) {
++        if (currentParent.collapsed) {
 +          return false;
 +        }
 +        currentParent = currentParent.group;

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 d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498dd65b1fba 100644
+index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..c7c7e6dd8cacf5d2d13c48ad9bed8195d677420f 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -405,6 +405,7 @@
+@@ -398,6 +398,7 @@
       * @type {MozBrowser[]}
       */
      get splitViewBrowsers() {
@@ -10,7 +10,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        const browsers = [];
        if (this.#activeSplitView) {
          for (const tab of this.#activeSplitView.tabs) {
-@@ -469,15 +470,66 @@
+@@ -462,15 +463,66 @@
        return this.tabContainer.visibleTabs;
      }
  
@@ -79,7 +79,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
      set selectedTab(val) {
        if (
          gSharedTabWarning.willShowSharedTabWarning(val) ||
-@@ -553,6 +605,10 @@
+@@ -546,6 +598,10 @@
          userContextId = parseInt(tabArgument.getAttribute("usercontextid"), 10);
        }
  
@@ -90,7 +90,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        if (tabArgument && tabArgument.linkedBrowser) {
          remoteType = tabArgument.linkedBrowser.remoteType;
          initialBrowsingContextGroupId =
-@@ -645,6 +701,8 @@
+@@ -625,6 +681,8 @@
        this.tabpanels.appendChild(panel);
  
        let tab = this.tabs[0];
@@ -99,7 +99,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        tab.linkedPanel = uniqueId;
        this._selectedTab = tab;
        this._selectedBrowser = browser;
-@@ -932,13 +990,18 @@
+@@ -912,13 +970,18 @@
        }
  
        this.showTab(aTab);
@@ -119,7 +119,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
  
        aTab.setAttribute("pinned", "true");
        this._updateTabBarForPinnedTabs();
-@@ -951,11 +1014,19 @@
+@@ -931,11 +994,19 @@
        }
  
        this.#handleTabMove(aTab, () => {
@@ -140,7 +140,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        });
  
        aTab.style.marginInlineStart = "";
-@@ -1132,6 +1203,9 @@
+@@ -1112,6 +1183,9 @@
  
        let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
  
@@ -150,7 +150,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        if (
          aIconURL &&
          !LOCAL_PROTOCOLS.some(protocol => aIconURL.startsWith(protocol))
-@@ -1141,6 +1215,9 @@
+@@ -1121,6 +1195,9 @@
          );
          return;
        }
@@ -160,7 +160,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
  
        let browser = this.getBrowserForTab(aTab);
        browser.mIconURL = aIconURL;
-@@ -1422,7 +1499,6 @@
+@@ -1393,7 +1470,6 @@
  
        // Preview mode should not reset the owner
        if (!this._previewMode && !oldTab.selected) {
@@ -168,7 +168,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        }
  
        let lastRelatedTab = this._lastRelatedTabMap.get(oldTab);
-@@ -1513,6 +1589,7 @@
+@@ -1484,6 +1560,7 @@
        if (!this._previewMode) {
          newTab.recordTimeFromUnloadToReload();
          newTab.updateLastAccessed();
@@ -176,7 +176,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
          oldTab.updateLastAccessed();
          // if this is the foreground window, update the last-seen timestamps.
          if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -1665,6 +1742,9 @@
+@@ -1636,6 +1713,9 @@
        }
  
        let activeEl = document.activeElement;
@@ -186,13 +186,11 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        // If focus is on the old tab, move it to the new tab.
        if (activeEl == oldTab) {
          newTab.focus();
-@@ -1987,7 +2067,12 @@
-       return this._setTabLabel(aTab, aLabel);
+@@ -1959,6 +2039,11 @@
      }
  
--    _setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
-+    _setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL, _zenChangeLabelFlag } = {}) {
-+      if (!aTab._zenContentsVisible && !aTab._zenChangeLabelFlag && !aTab._labelIsInitialTitle && !gZenWorkspaces.privateWindowOrDisabled && !_zenChangeLabelFlag) {
+     _setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
++      if (!aTab._zenContentsVisible && !aTab._zenChangeLabelFlag && !aTab._labelIsInitialTitle && !gZenWorkspaces.privateWindowOrDisabled) {
 +        return false;
 +      }
 +      aLabel = (typeof aTab.zenStaticLabel === "string" && aTab.zenStaticLabel) ? aTab.zenStaticLabel : aLabel;
@@ -200,7 +198,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        if (!aLabel || aLabel.includes("about:reader?")) {
          return false;
        }
-@@ -2096,7 +2181,7 @@
+@@ -2067,7 +2152,7 @@
          newIndex = this.selectedTab._tPos + 1;
        }
  
@@ -209,7 +207,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
          if (this.isTabGroupLabel(targetTab)) {
            throw new Error(
              "Replacing a tab group label with a tab is not supported"
-@@ -2371,6 +2456,7 @@
+@@ -2342,6 +2427,7 @@
        uriIsAboutBlank,
        userContextId,
        skipLoad,
@@ -217,17 +215,17 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
      } = {}) {
        let b = document.createXULElement("browser");
        // Use the JSM global to create the permanentKey, so that if the
-@@ -2444,8 +2530,7 @@
+@@ -2415,8 +2501,7 @@
          // we use a different attribute name for this?
          b.setAttribute("name", name);
        }
 -
--      if (AIWindow.isAIWindowActive(window) || this._allowTransparentBrowser) {
+-      if (this._allowTransparentBrowser) {
 +      if (this._allowTransparentBrowser || _forZenEmptyTab) {
          b.setAttribute("transparent", "true");
        }
  
-@@ -2610,7 +2695,7 @@
+@@ -2581,7 +2666,7 @@
  
        let panel = this.getPanel(browser);
        let uniqueId = this._generateUniquePanelID();
@@ -236,7 +234,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        aTab.linkedPanel = uniqueId;
  
        // Inject the <browser> into the DOM if necessary.
-@@ -2670,8 +2755,8 @@
+@@ -2640,8 +2725,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) {
@@ -247,7 +245,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        } else {
          aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
        }
-@@ -2858,7 +2943,6 @@
+@@ -2828,7 +2913,6 @@
              this.selectedTab = this.addTrustedTab(BROWSER_NEW_TAB_URL, {
                tabIndex: tab._tPos + 1,
                userContextId: tab.userContextId,
@@ -255,7 +253,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
                focusUrlBar: true,
              });
              resolve(this.selectedBrowser);
-@@ -2968,6 +3052,9 @@
+@@ -2938,6 +3022,9 @@
          schemelessInput,
          hasValidUserGestureActivation = false,
          textDirectiveUserActivation = false,
@@ -265,7 +263,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        } = {}
      ) {
        // all callers of addTab that pass a params object need to pass
-@@ -2978,10 +3065,17 @@
+@@ -2948,10 +3035,17 @@
          );
        }
  
@@ -283,7 +281,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        // If we're opening a foreground tab, set the owner by default.
        ownerTab ??= inBackground ? null : this.selectedTab;
  
-@@ -2989,6 +3083,7 @@
+@@ -2959,6 +3053,7 @@
        if (this.selectedTab.owner) {
          this.selectedTab.owner = null;
        }
@@ -291,7 +289,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
  
        // Find the tab that opened this one, if any. This is used for
        // determining positioning, and inherited attributes such as the
-@@ -3041,6 +3136,22 @@
+@@ -3011,6 +3106,22 @@
            noInitialLabel,
            skipBackgroundNotify,
          });
@@ -314,7 +312,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
          if (insertTab) {
            // Insert the tab into the tab container in the correct position.
            this.#insertTabAtIndex(t, {
-@@ -3049,6 +3160,7 @@
+@@ -3019,6 +3130,7 @@
              ownerTab,
              openerTab,
              pinned,
@@ -322,7 +320,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
              bulkOrderedOpen,
              tabGroup: tabGroup ?? openerTab?.group,
            });
-@@ -3067,6 +3179,7 @@
+@@ -3037,6 +3149,7 @@
            openWindowInfo,
            skipLoad,
            triggeringRemoteType,
@@ -330,7 +328,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
          }));
  
          if (focusUrlBar) {
-@@ -3191,6 +3304,12 @@
+@@ -3161,6 +3274,12 @@
          }
        }
  
@@ -343,7 +341,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        // Additionally send pinned tab events
        if (pinned) {
          this.#notifyPinnedStatus(t);
-@@ -3426,6 +3545,7 @@
+@@ -3375,6 +3494,7 @@
          isAdoptingGroup = false,
          isUserTriggered = false,
          telemetryUserCreateSource = "unknown",
@@ -351,7 +349,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        } = {}
      ) {
        if (
-@@ -3436,9 +3556,6 @@
+@@ -3385,9 +3505,6 @@
              !this.isSplitViewWrapper(tabOrSplitView)
          )
        ) {
@@ -361,7 +359,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        }
  
        if (!color) {
-@@ -3459,9 +3576,14 @@
+@@ -3408,9 +3525,14 @@
          label,
          isAdoptingGroup
        );
@@ -378,7 +376,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        );
        group.addTabs(tabsAndSplitViews);
  
-@@ -3582,7 +3704,7 @@
+@@ -3531,7 +3653,7 @@
        }
  
        this.#handleTabMove(tab, () =>
@@ -387,7 +385,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        );
      }
  
-@@ -3666,6 +3788,7 @@
+@@ -3599,6 +3721,7 @@
          color: group.color,
          insertBefore: newTabs[0],
          isAdoptingGroup: true,
@@ -395,7 +393,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        });
      }
  
-@@ -3856,6 +3979,7 @@
+@@ -3746,6 +3869,7 @@
          openWindowInfo,
          skipLoad,
          triggeringRemoteType,
@@ -403,7 +401,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        }
      ) {
        // If we don't have a preferred remote type (or it is `NOT_REMOTE`), and
-@@ -3925,6 +4049,7 @@
+@@ -3815,6 +3939,7 @@
            openWindowInfo,
            name,
            skipLoad,
@@ -411,19 +409,16 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
          });
        }
  
-@@ -4120,9 +4245,9 @@
-         }
- 
+@@ -4003,7 +4128,7 @@
          // Add a new tab if needed.
--        if (!tab) {
-+        if (!tab || tab?._markedForReplacement) {
+         if (!tab) {
            let createLazyBrowser =
 -            restoreTabsLazily && !select && !tabData.pinned;
 +            restoreTabsLazily && !(tabData.pinned && !Services.prefs.getBoolPref("browser.sessionstore.restore_pinned_tabs_on_demand"));
  
            let url = "about:blank";
            if (tabData.entries?.length) {
-@@ -4159,8 +4284,10 @@
+@@ -4040,8 +4165,10 @@
              insertTab: false,
              skipLoad: true,
              preferredRemoteType,
@@ -435,17 +430,17 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
            if (select) {
              tabToSelect = tab;
            }
-@@ -4172,7 +4299,8 @@
+@@ -4053,7 +4180,8 @@
            this.pinTab(tab);
            // Then ensure all the tab open/pinning information is sent.
            this._fireTabOpen(tab, {});
 -        } else if (tabData.groupId) {
 +        }
-+        if (tabData.groupId && tabGroupWorkingData.get(tabData.groupId)) {
++        if (tabData.groupId) {
            let { groupId } = tabData;
            const tabGroup = tabGroupWorkingData.get(groupId);
            // if a tab refers to a tab group we don't know, skip any group
-@@ -4186,7 +4314,10 @@
+@@ -4067,7 +4195,10 @@
                  tabGroup.stateData.id,
                  tabGroup.stateData.color,
                  tabGroup.stateData.collapsed,
@@ -457,7 +452,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
                );
                tabsFragment.appendChild(tabGroup.node);
              }
-@@ -4231,9 +4362,23 @@
+@@ -4112,9 +4243,23 @@
        // to remove the old selected tab.
        if (tabToSelect) {
          let leftoverTab = this.selectedTab;
@@ -473,15 +468,15 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
 +            gZenWorkspaces._initialTab._shouldRemove = true;
 +          }
 +        }
-       }
++      }
 +      else {
 +        gZenWorkspaces._tabToRemoveForEmpty = this.selectedTab;
-+      }
+       }
 +      this._hasAlreadyInitializedZenSessionStore = true;
  
        if (tabs.length > 1 || !tabs[0].selected) {
          this._updateTabsAfterInsert();
-@@ -4424,11 +4569,14 @@
+@@ -4305,11 +4450,14 @@
        if (ownerTab) {
          tab.owner = ownerTab;
        }
@@ -497,7 +492,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -4440,7 +4588,7 @@
+@@ -4321,7 +4469,7 @@
            let lastRelatedTab =
              openerTab && this._lastRelatedTabMap.get(openerTab);
            let previousTab = lastRelatedTab || openerTab || this.selectedTab;
@@ -506,7 +501,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
              tabGroup = previousTab.group;
            }
            if (
-@@ -4456,7 +4604,7 @@
+@@ -4337,7 +4485,7 @@
                  previousTab.splitview
                ) + 1;
            } else if (previousTab.visible) {
@@ -515,7 +510,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
            } else if (previousTab == FirefoxViewHandler.tab) {
              elementIndex = 0;
            }
-@@ -4484,14 +4632,14 @@
+@@ -4365,14 +4513,14 @@
        }
        // Ensure index is within bounds.
        if (tab.pinned) {
@@ -534,7 +529,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
  
        if (pinned && !itemAfter?.pinned) {
          itemAfter = null;
-@@ -4504,7 +4652,7 @@
+@@ -4385,7 +4533,7 @@
  
        this.tabContainer._invalidateCachedTabs();
  
@@ -543,7 +538,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
          if (
            (this.isTab(itemAfter) && itemAfter.group == tabGroup) ||
            this.isSplitViewWrapper(itemAfter)
-@@ -4535,7 +4683,11 @@
+@@ -4416,7 +4564,11 @@
          const tabContainer = pinned
            ? this.tabContainer.pinnedTabsContainer
            : this.tabContainer;
@@ -555,7 +550,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        }
  
        if (tab.group?.collapsed) {
-@@ -4550,6 +4702,7 @@
+@@ -4431,6 +4583,7 @@
        if (pinned) {
          this._updateTabBarForPinnedTabs();
        }
@@ -563,7 +558,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
  
        TabBarVisibility.update();
      }
-@@ -5102,6 +5255,7 @@
+@@ -4983,6 +5136,7 @@
          telemetrySource,
        } = {}
      ) {
@@ -571,7 +566,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        // When 'closeWindowWithLastTab' pref is enabled, closing all tabs
        // can be considered equivalent to closing the window.
        if (
-@@ -5191,6 +5345,7 @@
+@@ -5072,6 +5226,7 @@
          if (lastToClose) {
            this.removeTab(lastToClose, aParams);
          }
@@ -579,7 +574,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        } catch (e) {
          console.error(e);
        }
-@@ -5229,6 +5384,12 @@
+@@ -5110,6 +5265,12 @@
          aTab._closeTimeNoAnimTimerId = Glean.browserTabclose.timeNoAnim.start();
        }
  
@@ -592,7 +587,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -5243,6 +5404,9 @@
+@@ -5124,6 +5285,9 @@
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
        let isLastTab = this.#isLastTabInWindow(aTab);
@@ -602,13 +597,13 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -5291,7 +5455,13 @@
+@@ -5172,7 +5336,13 @@
          // We're not animating, so we can cancel the animation stopwatch.
          Glean.browserTabclose.timeAnim.cancel(aTab._closeTimeAnimTimerId);
          aTab._closeTimeAnimTimerId = null;
 -        this._endRemoveTab(aTab);
 +        if (animate && !gReduceMotion && !(gZenUIManager.testingEnabled && !gZenUIManager.profilingEnabled)) {
-+          gZenVerticalTabsManager.animateItemClose(aTab, (animate && !gReduceMotion)).then(() => {
++          gZenVerticalTabsManager.animateTabClose(aTab, (animate && !gReduceMotion)).then(() => {
 +            this._endRemoveTab(aTab);
 +          });
 +        } else {
@@ -617,7 +612,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
          return;
        }
  
-@@ -5425,7 +5595,7 @@
+@@ -5306,7 +5476,7 @@
            closeWindowWithLastTab != null
              ? closeWindowWithLastTab
              : !window.toolbar.visible ||
@@ -626,7 +621,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5449,6 +5619,7 @@
+@@ -5330,6 +5500,7 @@
  
          newTab = true;
        }
@@ -634,7 +629,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        aTab._endRemoveArgs = [closeWindow, newTab];
  
        // swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -5489,13 +5660,7 @@
+@@ -5370,13 +5541,7 @@
        aTab._mouseleave();
  
        if (newTab) {
@@ -649,7 +644,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        } else {
          TabBarVisibility.update();
        }
-@@ -5628,6 +5793,7 @@
+@@ -5509,6 +5674,7 @@
          this.tabs[i]._tPos = i;
        }
  
@@ -657,7 +652,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        if (!this._windowIsClosing) {
          // update tab close buttons state
          this.tabContainer._updateCloseButtons();
-@@ -5851,6 +6017,7 @@
+@@ -5732,6 +5898,7 @@
        }
  
        let excludeTabs = new Set(aExcludeTabs);
@@ -665,7 +660,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
  
        // If this tab has a successor, it should be selectable, since
        // hiding or closing a tab removes that tab as a successor.
-@@ -5863,15 +6030,22 @@
+@@ -5744,15 +5911,22 @@
          !excludeTabs.has(aTab.owner) &&
          Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
        ) {
@@ -690,7 +685,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        let tab = this.tabContainer.findNextTab(aTab, {
          direction: 1,
          filter: _tab => remainingTabs.includes(_tab),
-@@ -5885,7 +6059,7 @@
+@@ -5766,7 +5940,7 @@
        }
  
        if (tab) {
@@ -699,7 +694,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        }
  
        // If no qualifying visible tab was found, see if there is a tab in
-@@ -5906,7 +6080,7 @@
+@@ -5787,7 +5961,7 @@
          });
        }
  
@@ -708,7 +703,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
      }
  
      _blurTab(aTab) {
-@@ -5917,7 +6091,7 @@
+@@ -5798,7 +5972,7 @@
       * @returns {boolean}
       *   False if swapping isn't permitted, true otherwise.
       */
@@ -717,7 +712,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        // Do not allow transfering a private tab to a non-private window
        // and vice versa.
        if (
-@@ -5971,6 +6145,7 @@
+@@ -5852,6 +6026,7 @@
        // fire the beforeunload event in the process.  Close the other
        // window if this was its last tab.
        if (
@@ -725,7 +720,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
          !remoteBrowser._beginRemoveTab(aOtherTab, {
            adoptedByTab: aOurTab,
            closeWindowWithLastTab: true,
-@@ -5982,7 +6157,7 @@
+@@ -5863,7 +6038,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.
@@ -734,7 +729,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        if (closeWindow) {
          let win = aOtherTab.ownerGlobal;
          win.windowUtils.suppressAnimation(true);
-@@ -6110,11 +6285,13 @@
+@@ -5987,11 +6162,13 @@
        }
  
        // Finish tearing down the tab that's going away.
@@ -748,7 +743,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
  
        this.setTabTitle(aOurTab);
  
-@@ -6316,10 +6493,10 @@
+@@ -6193,10 +6370,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -761,7 +756,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -6377,7 +6554,8 @@
+@@ -6254,7 +6431,8 @@
       *
       * @param {MozTabbrowserTab|MozTabbrowserTabGroup|MozTabbrowserTabGroup.labelElement} aTab
       */
@@ -771,7 +766,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        if (this.tabs.length == 1) {
          return null;
        }
-@@ -6401,12 +6579,14 @@
+@@ -6278,12 +6456,14 @@
        }
  
        // tell a new window to take the "dropped" tab
@@ -787,7 +782,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
      }
  
      /**
-@@ -6511,7 +6691,7 @@
+@@ -6388,7 +6568,7 @@
       *   `true` if element is a `<tab-group>`
       */
      isTabGroup(element) {
@@ -796,7 +791,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
      }
  
      /**
-@@ -6596,8 +6776,8 @@
+@@ -6473,8 +6653,8 @@
        }
  
        // Don't allow mixing pinned and unpinned tabs.
@@ -807,7 +802,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        } else {
          tabIndex = Math.max(tabIndex, this.pinnedTabCount);
        }
-@@ -6623,10 +6803,16 @@
+@@ -6500,10 +6680,16 @@
        this.#handleTabMove(
          element,
          () => {
@@ -826,7 +821,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
            if (neighbor && this.isTab(element) && tabIndex > element._tPos) {
              neighbor.after(element);
            } else {
-@@ -6684,23 +6870,31 @@
+@@ -6561,23 +6747,31 @@
      #moveTabNextTo(element, targetElement, moveBefore = false, metricsContext) {
        if (this.isTabGroupLabel(targetElement)) {
          targetElement = targetElement.group;
@@ -864,7 +859,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        } 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
-@@ -6713,14 +6907,38 @@
+@@ -6590,14 +6784,38 @@
          //    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.
@@ -904,7 +899,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
          element.pinned
            ? this.tabContainer.pinnedTabsContainer
            : this.tabContainer;
-@@ -6729,11 +6947,15 @@
+@@ -6606,11 +6824,15 @@
          element,
          () => {
            if (moveBefore) {
@@ -921,7 +916,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
            }
          },
          metricsContext
-@@ -6799,10 +7021,10 @@
+@@ -6676,10 +6898,10 @@
       * @param {TabMetricsContext} [metricsContext]
       */
      moveTabToExistingGroup(aTab, aGroup, metricsContext) {
@@ -934,7 +929,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
          return;
        }
        if (aTab.group && aTab.group.id === aGroup.id) {
-@@ -6874,6 +7096,7 @@
+@@ -6751,6 +6973,7 @@
  
        let state = {
          tabIndex: tab._tPos,
@@ -942,7 +937,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        };
        if (tab.visible) {
          state.elementIndex = tab.elementIndex;
-@@ -6903,7 +7126,7 @@
+@@ -6777,7 +7000,7 @@
        let changedTabGroup =
          previousTabState.tabGroupId != currentTabState.tabGroupId;
  
@@ -951,7 +946,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
          tab.dispatchEvent(
            new CustomEvent("TabMove", {
              bubbles: true,
-@@ -6942,6 +7165,10 @@
+@@ -6818,6 +7041,10 @@
  
        moveActionCallback();
  
@@ -962,21 +957,16 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        // Clear tabs cache after moving nodes because the order of tabs may have
        // changed.
        this.tabContainer._invalidateCachedTabs();
-@@ -6992,7 +7219,22 @@
-      * @returns {object}
+@@ -6869,6 +7096,18 @@
       *    The new tab in the current window, null if the tab couldn't be adopted.
       */
--    adoptTab(aTab, { elementIndex, tabIndex, selectTab = false } = {}) {
-+    adoptTab(aTab, { elementIndex, tabIndex, selectTab = false, spaceId = null } = {}) {
+     adoptTab(aTab, { elementIndex, tabIndex, selectTab = false } = {}) {
 +      if (window.gZenWorkspaces.currentWindowIsSyncing && aTab.ownerGlobal.gZenWorkspaces?.currentWindowIsSyncing) {
 +        const tabId = aTab.id;
 +        const thisTab = window.gZenWindowSync.getItemFromWindow(window, tabId);
 +        if (thisTab) {
 +          // Just move the tab to the index
 +          this.moveTabTo(thisTab, { elementIndex, tabIndex });
-+          if (spaceId) {
-+            thisTab.setAttribute("zen-workspace-id", spaceId);
-+          }
 +          if (selectTab) {
 +            this.selectedTab = thisTab;
 +          }
@@ -986,16 +976,16 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
        // Swap the dropped tab with a new one we create and then close
        // it in the other window (making it seem to have moved between
        // windows). We also ensure that the tab we create to swap into has
-@@ -7035,6 +7277,8 @@
+@@ -6910,6 +7149,8 @@
+         params.userContextId = aTab.getAttribute("usercontextid");
        }
-       params.skipLoad = true;
        let newTab = this.addWebTab("about:blank", params);
 +      newTab._zenContentsVisible = true;
 +      newTab.zenStaticLabel = aTab.zenStaticLabel;
+       let newBrowser = this.getBrowserForTab(newTab);
  
        aTab.container.tabDragAndDrop.finishAnimateTabMove();
- 
-@@ -7837,7 +8081,7 @@
+@@ -7718,7 +7959,7 @@
              // preventDefault(). It will still raise the window if appropriate.
              break;
            }
@@ -1004,7 +994,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
            window.focus();
            aEvent.preventDefault();
            break;
-@@ -7854,7 +8098,6 @@
+@@ -7735,7 +7976,6 @@
          }
          case "TabGroupCollapse":
            aEvent.target.tabs.forEach(tab => {
@@ -1012,7 +1002,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
            });
            break;
          case "TabGroupCreateByUser":
-@@ -8014,7 +8257,9 @@
+@@ -7895,7 +8135,9 @@
  
          let filter = this._tabFilters.get(tab);
          if (filter) {
@@ -1022,7 +1012,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
  
            let listener = this._tabListeners.get(tab);
            if (listener) {
-@@ -8817,6 +9062,7 @@
+@@ -8698,6 +8940,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -1030,7 +1020,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
            }
-@@ -8897,6 +9143,7 @@
+@@ -8778,6 +9021,7 @@
          // known defaults. Note we use the original URL since about:newtab
          // redirects to a prerendered page.
          const shouldRemoveFavicon =
@@ -1038,21 +1028,7 @@ index d7765e0adb37216d35f2125abf96025cbb150bab..d787c39f68ea4507b2cb902df325498d
            !this.mBrowser.mIconURL &&
            !ignoreBlank &&
            !(originalLocation.spec in FAVICON_DEFAULTS);
-@@ -9071,13 +9318,6 @@
-             this.mBrowser.originalURI = aRequest.originalURI;
-           }
- 
--          if (!gBrowser._allowTransparentBrowser) {
--            this.mBrowser.toggleAttribute(
--              "transparent",
--              AIWindow.isAIWindowActive(window) &&
--                AIWindow.isAIWindowContentPage(aLocation)
--            );
--          }
-         }
- 
-         let userContextId = this.mBrowser.getAttribute("usercontextid") || 0;
-@@ -9941,7 +10181,7 @@ var TabContextMenu = {
+@@ -9803,7 +10047,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !this.multiselected;

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 ebcc072abca51ba9936d0e6d97bbd329427c0231..2b0980a745e2339d3220bb701092f4f621876985 100644
+index 9abf115062e7c86196d7cb6b8ac82a9bb63b5a65..9a38d7dc10403c1ee721b6abf33d525a4aa1f821 100644
 --- a/browser/components/tabbrowser/content/tabgroup.js
 +++ b/browser/components/tabbrowser/content/tabgroup.js
 @@ -14,11 +14,11 @@
@@ -100,17 +100,7 @@ index ebcc072abca51ba9936d0e6d97bbd329427c0231..2b0980a745e2339d3220bb701092f4f6
  
      resetDefaultGroupName = () => {
        this.#defaultGroupName = "";
-@@ -166,7 +189,9 @@
-             this.dispatchEvent(
-               new CustomEvent("TabGroupRemoved", { bubbles: true })
-             );
-+          gZenVerticalTabsManager.animateItemClose(this).then(() => {
-             this.remove();
-+          });
-             Services.obs.notifyObservers(
-               this,
-               "browser-tabgroup-removed-from-dom"
-@@ -211,7 +236,10 @@
+@@ -211,7 +234,10 @@
            }
          });
        }
@@ -122,7 +112,7 @@ index ebcc072abca51ba9936d0e6d97bbd329427c0231..2b0980a745e2339d3220bb701092f4f6
      }
  
      get color() {
-@@ -305,6 +333,9 @@
+@@ -305,6 +331,9 @@
      }
  
      set collapsed(val) {
@@ -132,7 +122,7 @@ index ebcc072abca51ba9936d0e6d97bbd329427c0231..2b0980a745e2339d3220bb701092f4f6
        if (!!val == this.collapsed) {
          return;
        }
-@@ -391,7 +422,6 @@
+@@ -391,7 +420,6 @@
            tabGroupName,
          })
          .then(result => {
@@ -140,7 +130,7 @@ index ebcc072abca51ba9936d0e6d97bbd329427c0231..2b0980a745e2339d3220bb701092f4f6
          });
      }
  
-@@ -466,13 +496,65 @@
+@@ -466,13 +494,65 @@
       * @returns {MozTabbrowserTab[]}
       */
      get tabs() {
@@ -155,8 +145,9 @@ index ebcc072abca51ba9936d0e6d97bbd329427c0231..2b0980a745e2339d3220bb701092f4f6
 +        tabsCollect.push(item);
 +        if (gBrowser.isTabGroup(item)) {
 +          tabsCollect.push(...item.tabs);
-+        }
-+      }
+         }
+       }
+-      return childrenArray.filter(node => node.matches("tab"));
 +      return tabsCollect.filter(node => node.matches("tab"));
 +    }
 +
@@ -182,9 +173,8 @@ index ebcc072abca51ba9936d0e6d97bbd329427c0231..2b0980a745e2339d3220bb701092f4f6
 +            result.push(labelContainer);
 +          }
 +          result.push(...item.childGroupsAndTabs);
-         }
-       }
--      return childrenArray.filter(node => node.matches("tab"));
++        }
++      }
 +      return result;
 +    }
 +
@@ -211,7 +201,7 @@ index ebcc072abca51ba9936d0e6d97bbd329427c0231..2b0980a745e2339d3220bb701092f4f6
      }
  
      /**
-@@ -569,7 +651,6 @@
+@@ -560,7 +640,6 @@
            );
          } else {
            if (tabOrSplitView.pinned) {
@@ -219,7 +209,7 @@ index ebcc072abca51ba9936d0e6d97bbd329427c0231..2b0980a745e2339d3220bb701092f4f6
            }
            let tabToMove =
              this.ownerGlobal === tabOrSplitView.ownerGlobal
-@@ -634,7 +715,7 @@
+@@ -625,7 +704,7 @@
       */
      on_click(event) {
        let isToggleElement =
@@ -228,7 +218,7 @@ index ebcc072abca51ba9936d0e6d97bbd329427c0231..2b0980a745e2339d3220bb701092f4f6
          event.target === this.#overflowCountLabel;
        if (isToggleElement && event.button === 0) {
          event.preventDefault();
-@@ -705,5 +786,6 @@
+@@ -696,5 +775,6 @@
      }
    }